[Twitter] Support multiple accounts

Author: SpriteOvO

src/config/mod.rs

@@ -308,8 +308,8 @@ lagrange = { remote_http = { host = "localhost", port = 8000 } }
 [platform.Telegram]
 token = "ttt"
 
-[platform.Twitter]
-auth = { cookies = "a=b;c=d;ct0=blah" }
+[platform.Twitter.account.MyTwitter]
+cookies = "a=b;c=d;ct0=blah"
 
 [platform.bilibili]
 playback = { bililive_recorder = { listen_webhook = { host = "127.0.0.1", port = 8888 }, working_directory = "/brec/" } }
@@ -324,11 +324,11 @@ interval = '30s'
 notify = ["meow"]
 
 [[subscription.meow]]
-platform = { name = "Twitter", username = "meowww" }
+platform = { name = "Twitter", username = "meowww", as = "MyTwitter" }
 notify = ["meow", "woof"]
 
 [[subscription.meow]]
-platform = { name = "Twitter", username = "meowww2" }
+platform = { name = "Twitter", username = "meowww2", as = "MyTwitter" }
 notify = ["meow", "woof", { ref = "woof", id = 123 }]
             "#,
             |c| {
@@ -365,7 +365,7 @@ notify = ["meow", "woof", { ref = "woof", id = 123 }]
                             experimental: Default::default()
                         })),
                         twitter: Accessor::new(Some(twitter::ConfigGlobal {
-                            auth: twitter::ConfigCookies::with_raw("a=b;c=d;ct0=blah")
+                            account: HashMap::from_iter([("MyTwitter".into(), Accessor::new(twitter::ConfigCookies::with_raw("a=b;c=d;ct0=blah")))])
                         })),
                         bilibili: Accessor::new(Some(bilibili::ConfigGlobal {
                             playback: Accessor::new(Some(bilibili::source::playback::ConfigGlobal {
@@ -420,7 +420,8 @@ notify = ["meow", "woof", { ref = "woof", id = 123 }]
                             SubscriptionRaw {
                                 platform: Accessor::new(SourceConfig::Twitter(
                                     Accessor::new(twitter::source::ConfigParams {
-                                        username: "meowww".into()
+                                        username: "meowww".into(),
+                                        actor: "MyTwitter".into()
                                     })
                                 )),
                                 interval: None,
@@ -432,7 +433,8 @@ notify = ["meow", "woof", { ref = "woof", id = 123 }]
                             SubscriptionRaw {
                                 platform: Accessor::new(SourceConfig::Twitter(
                                     Accessor::new(twitter::source::ConfigParams {
-                                        username: "meowww2".into()
+                                        username: "meowww2".into(),
+                                        actor: "MyTwitter".into()
                                     })
                                 )),
                                 interval: None,

src/platform/qq/notify/mod.rs

@@ -23,7 +23,8 @@ pub struct ConfigParams {
     pub chat: ConfigChat,
     #[serde(default)]
     pub mention_all: bool,
-    pub from: String,
+    #[serde(rename = "as")]
+    pub actor: String,
 }
 
 impl Validator for ConfigParams {
@@ -34,8 +35,8 @@ impl Validator for ConfigParams {
             .as_ref()
             .ok_or_else(|| anyhow!("QQ in global is missing"))?
             .account
-            .get(&self.from)
-            .ok_or_else(|| anyhow!("QQ account '{}' is not configured", self.from))?;
+            .get(&self.actor)
+            .ok_or_else(|| anyhow!("QQ account '{}' is not configured", self.actor))?;
         ensure!(
             !self.mention_all || matches!(self.chat, ConfigChat::GroupId(_)),
             "mention_all can only be enabled for group chat"
@@ -46,7 +47,7 @@ impl Validator for ConfigParams {
 
 impl fmt::Display for ConfigParams {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "QQ:{},as={}", self.chat, self.from)?;
+        write!(f, "QQ:{},as={}", self.chat, self.actor)?;
         Ok(())
     }
 }
@@ -58,7 +59,8 @@ pub struct ConfigOverride {
     #[serde(flatten)]
     pub chat: Option<ConfigChat>,
     pub mention_all: Option<bool>,
-    pub from: Option<String>,
+    #[serde(rename = "as")]
+    pub actor: Option<String>,
 }
 
 impl Overridable for ConfigParams {
@@ -75,7 +77,7 @@ impl Overridable for ConfigParams {
             },
             chat: new.chat.unwrap_or(self.chat),
             mention_all: new.mention_all.unwrap_or(self.mention_all),
-            from: new.from.unwrap_or(self.from),
+            actor: new.actor.unwrap_or(self.actor),
         }
     }
 }
@@ -109,7 +111,7 @@ impl Notifier {
                 .as_ref()
                 .unwrap()
                 .account
-                .get(&params.from)
+                .get(&params.actor)
                 .unwrap()
                 .lagrange,
         );

src/platform/twitter/mod.rs

@@ -1,21 +1,30 @@
 mod request;
 pub(crate) mod source;
 
+use std::collections::HashMap;
+
+use request::TwitterCookies;
 use serde::Deserialize;
 
-use crate::{config::Validator, secret_enum};
+use crate::{
+    config::{Accessor, AsSecretRef, Validator},
+    secret_enum,
+};
 
 // Global
 //
 
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 pub struct ConfigGlobal {
-    pub auth: ConfigCookies,
+    pub account: HashMap<String, Accessor<ConfigCookies>>,
 }
 
 impl Validator for ConfigGlobal {
     fn validate(&self) -> anyhow::Result<()> {
-        self.auth.validate()?;
+        for account in self.account.values() {
+            account.validate()?;
+            TwitterCookies::new(account.as_secret_ref().get_str()?)?;
+        }
         Ok(())
     }
 }

src/platform/twitter/source/mod.rs

@@ -6,7 +6,7 @@ use std::{
     sync::Mutex as StdMutex,
 };
 
-use anyhow::{anyhow, bail};
+use anyhow::anyhow;
 use chrono::DateTime;
 use once_cell::sync::Lazy;
 use serde::Deserialize;
@@ -27,17 +27,21 @@ use crate::{
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 pub struct ConfigParams {
     pub username: String,
+    #[serde(rename = "as")]
+    pub actor: String,
 }
 
 impl Validator for ConfigParams {
     fn validate(&self) -> anyhow::Result<()> {
-        match &*Config::global().platform().twitter {
-            Some(global_twitter) => {
-                TwitterCookies::new(global_twitter.auth.as_secret_ref().get_str()?)?;
-                Ok(())
-            }
-            None => bail!("cookies in global are missing"),
-        }
+        let _account = Config::global()
+            .platform()
+            .twitter
+            .as_ref()
+            .ok_or_else(|| anyhow!("Twitter in global is missing"))?
+            .account
+            .get(&self.actor)
+            .ok_or_else(|| anyhow!("Twitter account '{}' is not configured", self.actor))?;
+        Ok(())
     }
 }
 
@@ -357,7 +361,9 @@ impl Fetcher {
             .twitter
             .as_ref()
             .unwrap()
-            .auth
+            .account
+            .get(&params.actor)
+            .unwrap()
             .as_secret_ref()
             .get_str()
             .unwrap();