From 032e3cf8dd613649676e0597022d531e56a636dd Mon Sep 17 00:00:00 2001 From: VC Date: Sat, 19 Nov 2022 17:33:50 +0100 Subject: [PATCH 1/2] fix: lang is not the default one anymore --- src/lib.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index ba9d965..39cd028 100644 --- a/src/lib.rs +++ b/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,7 +56,6 @@ 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)? @@ -78,6 +76,7 @@ pub async fn run(config: Config) { for tweet in &feed { info!("Treating Tweet {} inside feed", tweet.id); + let lconn = task_conn.lock().await; // initiate the toot_reply_id var and retrieve the corresponding toot_id let toot_reply_id: Option = tweet.in_reply_to_user_id.and_then(|_| { @@ -106,12 +105,20 @@ 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); + status_builder.visibility(elefren::status_builder::Visibility::Private); let status = status_builder.build()?; From 2c77a0e5fcc37a1418fb38dc12036aa8422a0658 Mon Sep 17 00:00:00 2001 From: VC Date: Sat, 19 Nov 2022 17:34:09 +0100 Subject: [PATCH 2/2] 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 66254c0..93c871e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2103,7 +2103,7 @@ dependencies = [ [[package]] name = "scootaloo" -version = "0.9.3" +version = "0.9.4" dependencies = [ "chrono", "clap", diff --git a/Cargo.toml b/Cargo.toml index 9830145..a5cc008 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scootaloo" -version = "0.9.3" +version = "0.9.4" authors = ["VC "] edition = "2021"