Merge branch 'fix_lang' into 'master'

fix: visibility

See merge request veretcle/scootaloo!33

Cargo.lock

@@ -2103,7 +2103,7 @@ dependencies = [
 
 [[package]]
 name = "scootaloo"
-version = "0.9.1"
+version = "0.9.4"
 dependencies = [
  "chrono",
  "clap",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scootaloo"
-version = "0.9.1"
+version = "0.9.4"
 authors = ["VC <veretcle+framagit@mateu.be>"]
 edition = "2021"
 

src/lib.rs

@@ -19,14 +19,13 @@ mod state;
 pub use state::{init_db, migrate_db};
 use state::{read_state, write_state, TweetToToot};
 
-use elefren::{prelude::*, status_builder::StatusBuilder};
+use elefren::{prelude::*, status_builder::StatusBuilder, Language};
+use futures::StreamExt;
 use log::info;
 use rusqlite::Connection;
 use std::sync::Arc;
 use tokio::{spawn, sync::Mutex};
 
-use futures::StreamExt;
-
 const DEFAULT_RATE_LIMIT: usize = 4;
 const DEFAULT_PAGE_SIZE: i32 = 200;
 
@@ -57,15 +56,14 @@ pub async fn run(config: Config) {
 
             spawn(async move {
                 info!("Starting treating {}", &mastodon_config.twitter_screen_name);
-
                 // retrieve the last tweet ID for the username
                 let lconn = task_conn.lock().await;
                 let last_tweet_id = read_state(&lconn, &mastodon_config.twitter_screen_name, None)?
                     .map(|r| r.tweet_id);
                 drop(lconn);
 
-                // get user timeline feed (Vec<tweet>)
+                // get reversed, curated user timeline
-                let mut feed = get_user_timeline(
+                let feed = get_user_timeline(
                     &mastodon_config.twitter_screen_name,
                     &token,
                     last_tweet_id,
@@ -73,41 +71,24 @@ pub async fn run(config: Config) {
                 )
                 .await?;
 
-                // empty feed -> exiting
-                if feed.is_empty() {
-                    info!("Nothing to retrieve since last time, exiting…");
-                    return Ok(());
-                }
-
                 // get Mastodon instance
                 let mastodon = get_mastodon_token(&mastodon_config);
 
-                // order needs to be chronological
-                feed.reverse();
-
                 for tweet in &feed {
                     info!("Treating Tweet {} inside feed", tweet.id);
-                    // initiate the toot_reply_id var
+
-                    let mut toot_reply_id: Option<String> = None;
-                    // determine if the tweet is part of a thread (response to self) or a standard response
-                    if let Some(r) = &tweet.in_reply_to_screen_name {
-                        if r.to_lowercase() != mastodon_config.twitter_screen_name.to_lowercase() {
-                            // we are responding not threading
-                            info!("Tweet is a direct response, skipping");
-                            continue;
-                        }
-                        info!("Tweet is a thread");
-                        // get the corresponding toot id
                     let lconn = task_conn.lock().await;
-                        toot_reply_id = read_state(
+                    // initiate the toot_reply_id var and retrieve the corresponding toot_id
+                    let toot_reply_id: Option<String> = tweet.in_reply_to_user_id.and_then(|_| {
+                        read_state(
                             &lconn,
                             &mastodon_config.twitter_screen_name,
                             tweet.in_reply_to_status_id,
                         )
                         .unwrap_or(None)
-                        .map(|s| s.toot_id);
+                        .map(|s| s.toot_id)
+                    });
                     drop(lconn);
-                    };
 
                     // build basic status by just yielding text and dereferencing contained urls
                     let mut status_text = build_basic_status(tweet);
@@ -124,10 +105,18 @@ pub async fn run(config: Config) {
 
                     status_builder.status(&status_text).media_ids(status_medias);
 
+                    // theard if necessary
                     if let Some(i) = toot_reply_id {
                         status_builder.in_reply_to(&i);
                     }
 
+                    // language if any
+                    if let Some(l) = &tweet.lang {
+                        if let Some(r) = Language::from_639_1(l) {
+                            status_builder.language(r);
+                        }
+                    }
+
                     // can be activated for test purposes
                     // status_builder.visibility(elefren::status_builder::Visibility::Private);
 

src/main.rs

@@ -15,10 +15,7 @@ fn main() {
                 .short('c')
                 .long("config")
                 .value_name("CONFIG_FILE")
-                .help(&format!(
+                .help("TOML config file for scootaloo")
-                    "TOML config file for scootaloo (default {})",
-                    DEFAULT_CONFIG_PATH
-                ))
                 .num_args(1)
                 .default_value(DEFAULT_CONFIG_PATH)
                 .display_order(1),
@@ -28,7 +25,7 @@ fn main() {
                 .short('l')
                 .long("loglevel")
                 .value_name("LOGLEVEL")
-                .help("Log level. Valid values are: Off, Warn, Error, Info, Debug")
+                .help("Log level")
                 .num_args(1)
                 .value_parser(["Off", "Warn", "Error", "Info", "Debug"])
                 .display_order(2),

src/twitter.rs

@@ -27,7 +27,7 @@ pub fn get_oauth2_token(config: &TwitterConfig) -> Token {
     }
 }
 
-/// Gets Twitter user timeline
+/// Gets Twitter user timeline, eliminate responses to others and reverse it
 pub async fn get_user_timeline(
     screen_name: &str,
     token: &Token,
@@ -40,7 +40,18 @@ pub async fn get_user_timeline(
         .older(lid)
         .await?;
 
-    Ok(feed.to_vec())
+    let mut feed: Vec<Tweet> = feed
+        .iter()
+        .cloned()
+        .filter(|t| match &t.in_reply_to_screen_name {
+            Some(r) => r.to_lowercase() == screen_name.to_lowercase(),
+            None => true,
+        })
+        .collect();
+
+    feed.reverse();
+
+    Ok(feed)
 }
 
 /// Retrieves a single media from a tweet and store it in a temporary file