From 83a133bb862d3bb7c8dc114bdeadeb9264d44fdc Mon Sep 17 00:00:00 2001 From: VC Date: Sun, 20 Nov 2022 21:02:41 +0100 Subject: [PATCH 1/5] feat: add mastodon_screen_name to config struct --- src/config.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config.rs b/src/config.rs index 69d9219..b8aaaa0 100644 --- a/src/config.rs +++ b/src/config.rs @@ -22,6 +22,7 @@ pub struct TwitterConfig { #[derive(Debug, Deserialize)] pub struct MastodonConfig { pub twitter_screen_name: String, + pub mastodon_screen_name: Option, pub twitter_page_size: Option, pub base: String, pub client_id: String, From 1e9c768a74fa6b678c2941c17fa661071c5ccee8 Mon Sep 17 00:00:00 2001 From: VC Date: Sun, 20 Nov 2022 21:03:01 +0100 Subject: [PATCH 2/5] test: add tests for mastodon_screen_name in config struct --- tests/config.rs | 23 +++++++++++++++++++ tests/good_test_mastodon_screen_name.toml | 28 +++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 tests/good_test_mastodon_screen_name.toml diff --git a/tests/config.rs b/tests/config.rs index ce35afc..81a63d9 100644 --- a/tests/config.rs +++ b/tests/config.rs @@ -52,6 +52,29 @@ fn test_parse_good_toml_rate_limit() { assert_eq!(parse_good_toml.scootaloo.rate_limit, Some(69 as usize)); } +#[test] +fn test_parse_good_toml_mastodon_screen_name() { + let parse_good_toml = parse_toml("tests/good_test_mastodon_screen_name.toml"); + + assert_eq!( + parse_good_toml + .mastodon + .get("0") + .unwrap() + .mastodon_screen_name, + Some("tarace".to_string()) + ); + + assert_eq!( + parse_good_toml + .mastodon + .get("1") + .unwrap() + .mastodon_screen_name, + None + ); +} + #[test] fn test_parse_good_toml() { let parse_good_toml = parse_toml("tests/good_test.toml"); diff --git a/tests/good_test_mastodon_screen_name.toml b/tests/good_test_mastodon_screen_name.toml new file mode 100644 index 0000000..f0cb95f --- /dev/null +++ b/tests/good_test_mastodon_screen_name.toml @@ -0,0 +1,28 @@ +[scootaloo] + +db_path="/var/random/scootaloo.sqlite" +cache_path="/tmp/scootaloo" + +[twitter] +consumer_key="rand consumer key" +consumer_secret="secret" +access_key="rand access key" +access_secret="super secret" + +[mastodon] +[mastodon.0] +twitter_screen_name="tamerelol" +mastodon_screen_name="tarace" +base = "https://m.nintendojo.fr" +client_id = "rand client id" +client_secret = "secret" +redirect = "urn:ietf:wg:oauth:2.0:oob" +token = "super secret" + +[mastodon.1] +twitter_screen_name="tamerelol" +base = "https://m.nintendojo.fr" +client_id = "rand client id" +client_secret = "secret" +redirect = "urn:ietf:wg:oauth:2.0:oob" +token = "super secret" From 18e8b9d30673c36840b700e637899349afb70196 Mon Sep 17 00:00:00 2001 From: VC Date: Sun, 20 Nov 2022 22:00:55 +0100 Subject: [PATCH 3/5] feat: add scootaloo_mentions hash from config file to be inserted into mentions --- src/lib.rs | 21 +++++++++++++++++++-- src/mastodon.rs | 27 +++++++++++++++++++++------ 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index cd4f0b4..412f379 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,7 +23,7 @@ use elefren::{prelude::*, status_builder::StatusBuilder, Language}; use futures::StreamExt; use log::info; use rusqlite::Connection; -use std::sync::Arc; +use std::{collections::HashMap, sync::Arc}; use tokio::{spawn, sync::Mutex}; const DEFAULT_RATE_LIMIT: usize = 4; @@ -42,6 +42,22 @@ pub async fn run(config: Config) { }), )); + let scootaloo_mentions: HashMap = config + .mastodon + .values() + .filter(|s| s.mastodon_screen_name.is_some()) + .map(|s| { + ( + format!("@{}", s.twitter_screen_name), + format!( + "{}@{}", + s.mastodon_screen_name.as_ref().unwrap(), + s.base.split('/').last().unwrap() + ), + ) + }) + .collect(); + let mut stream = futures::stream::iter(config.mastodon.into_values()) .map(|mastodon_config| { // calculate Twitter page size @@ -51,6 +67,7 @@ pub async fn run(config: Config) { // create temporary value for each task let scootaloo_cache_path = config.scootaloo.cache_path.clone(); + let scootaloo_mentions = scootaloo_mentions.clone(); let token = get_oauth2_token(&config.twitter); let task_conn = conn.clone(); @@ -91,7 +108,7 @@ pub async fn run(config: Config) { drop(lconn); // build basic status by just yielding text and dereferencing contained urls - let mut status_text = build_basic_status(tweet); + let mut status_text = build_basic_status(tweet, &scootaloo_mentions); // building associative media list let (media_url, status_medias) = diff --git a/src/mastodon.rs b/src/mastodon.rs index 5434f40..7bd7d0a 100644 --- a/src/mastodon.rs +++ b/src/mastodon.rs @@ -48,14 +48,18 @@ pub fn get_mastodon_token(masto: &MastodonConfig) -> Mastodon { } /// Builds toot text from tweet -pub fn build_basic_status(tweet: &Tweet) -> String { +pub fn build_basic_status(tweet: &Tweet, mentions: &HashMap) -> String { let mut toot = tweet.text.to_owned(); for decoded_url in decode_urls(&tweet.entities.urls) { toot = toot.replace(&decoded_url.0, &decoded_url.1); } - for decoded_mention in twitter_mentions(&tweet.entities.user_mentions) { + for decoded_mention in twitter_mentions(&tweet.entities.user_mentions) + .into_iter() + .chain(mentions.to_owned()) + .collect::>() + { toot = toot.replace(&decoded_mention.0, &decoded_mention.1); } @@ -192,7 +196,13 @@ mod tests { range: (80, 95), name: "Nintendo France".to_string(), screen_name: "NintendoFrance".to_string(), - } + }, + MentionEntity { + id: 999999999, + range: (80, 95), + name: "Willy Wonka".to_string(), + screen_name: "WillyWonka".to_string(), + }, ], media: None, }, @@ -213,7 +223,7 @@ mod tests { retweeted: None, retweeted_status: None, source: None, - text: "Mother 1 & 2 sur le NES/SNES online !\nDispo maintenant. cc @NintendoFrance https://t.co/zXw0FfX2Nt".to_string(), + text: "Mother 1 & 2 sur le NES/SNES online !\nDispo maintenant. cc @NintendoFrance @WillyWonka https://t.co/zXw0FfX2Nt".to_string(), truncated: false, user: None, withheld_copyright: false, @@ -221,8 +231,13 @@ mod tests { withheld_scope: None, }; - let t_out = build_basic_status(&t); + let s: HashMap = HashMap::from([( + "@WillyWonka".to_string(), + "@WillyWonka@chocolatefactory.org".to_string(), + )]); - assert_eq!(&t_out, "Mother 1 & 2 sur le NES/SNES online !\nDispo maintenant. cc @NintendoFrance@twitter.com https://www.youtube.com/watch?v=w5TrSaoYmZ8"); + let t_out = build_basic_status(&t, &s); + + assert_eq!(&t_out, "Mother 1 & 2 sur le NES/SNES online !\nDispo maintenant. cc @NintendoFrance@twitter.com @WillyWonka@chocolatefactory.org https://www.youtube.com/watch?v=w5TrSaoYmZ8"); } } From 87a7574d42d58e94123802a23fd0bd77b5cde495 Mon Sep 17 00:00:00 2001 From: VC Date: Mon, 21 Nov 2022 10:03:03 +0100 Subject: [PATCH 4/5] feat: add mastodon_screen_name automatically/revise necessary permissions --- src/mastodon.rs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/mastodon.rs b/src/mastodon.rs index 7bd7d0a..84d4dea 100644 --- a/src/mastodon.rs +++ b/src/mastodon.rs @@ -4,7 +4,7 @@ use egg_mode::{ entities::{MentionEntity, UrlEntity}, tweet::Tweet, }; -use elefren::{apps::App, prelude::*, scopes::Scopes}; +use elefren::{apps::App, prelude::*, scopes::Read, scopes::Scopes, scopes::Write}; use html_escape::decode_html_entities; use std::{borrow::Cow, collections::HashMap, io::stdin}; @@ -74,7 +74,12 @@ pub fn register(host: &str, screen_name: &str) { builder .client_name(Cow::from(env!("CARGO_PKG_NAME").to_string())) .redirect_uris(Cow::from("urn:ietf:wg:oauth:2.0:oob".to_string())) - .scopes(Scopes::write_all()) + .scopes( + Scopes::write(Write::Accounts) + .and(Scopes::write(Write::Media)) + .and(Scopes::write(Write::Statuses)) + .and(Scopes::read(Read::Accounts)), + ) .website(Cow::from( "https://framagit.org/veretcle/scootaloo".to_string(), )); @@ -103,13 +108,19 @@ pub fn register(host: &str, screen_name: &str) { let toml = toml::to_string(&*mastodon).unwrap(); + let current_account = mastodon + .verify_credentials() + .expect("Unable to access account information!"); + println!( "Please insert the following block at the end of your configuration file: [mastodon.{}] twitter_screen_name = \"{}\" +mastodon_screen_name = \"{}\" {}", screen_name.to_lowercase(), screen_name, + current_account.username, toml ); } From 91e3cd04a0fb1b69ac35078d71da62f0465554a0 Mon Sep 17 00:00:00 2001 From: VC Date: Mon, 21 Nov 2022 10:18:32 +0100 Subject: [PATCH 5/5] chore: bump version --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 93c871e..144b465 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2103,7 +2103,7 @@ dependencies = [ [[package]] name = "scootaloo" -version = "0.9.4" +version = "0.10.0" dependencies = [ "chrono", "clap", diff --git a/Cargo.toml b/Cargo.toml index a5cc008..8886b4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scootaloo" -version = "0.9.4" +version = "0.10.0" authors = ["VC "] edition = "2021"