Merge branch 'master' into 'noasync'

# Conflicts:
#   .gitlab-ci.yml
#   Cargo.lock
#   Cargo.toml
#   src/lib.rs

src/lib.rs

@@ -6,6 +6,7 @@ use std::{
     fmt,
     fs::{read_to_string, write},
     error::Error,
+    sync::{Arc, Mutex},
 };
 
 // toml
@@ -52,7 +53,7 @@ use log::{info, warn, error, debug};
 /*
  * Those functions are related to the Twitter side of things
  */
-/// Read last tweet id from a file
+/// Reads last tweet id from a file
 fn read_state(s: &str) -> Option<u64> {
     let state = read_to_string(s);
 
@@ -69,7 +70,7 @@ fn write_state(f: &str, s: u64) -> Result<(), std::io::Error> {
     write(f, format!("{}", s))
 }
 
-/// Gets twitter oauth2 token
+/// Gets Twitter oauth2 token
 fn get_oauth2_token(config: &Config) -> Token {
     let con_token = KeyPair::new(String::from(&config.twitter.consumer_key), String::from(&config.twitter.consumer_secret));
     let access_token = KeyPair::new(String::from(&config.twitter.access_key), String::from(&config.twitter.access_secret));
@@ -80,12 +81,13 @@ fn get_oauth2_token(config: &Config) -> Token {
     }
 }
 
-/// Gets twitter user timeline
+/// Gets Twitter user timeline
 async fn get_user_timeline(config: &Config, token: Token, lid: Option<u64>) -> Result<Vec<Tweet>, Box<dyn Error>> {
     // fix the page size to 200 as it is the maximum Twitter authorizes
-    let (_timeline, feed) = user_timeline(UserID::from(String::from(&config.twitter.username)), true, false, &token)
+    let (_, feed) = user_timeline(UserID::from(String::from(&config.twitter.username)), true, false, &token)
                 .with_page_size(200)
-                .older(lid).await?;
+                .older(lid)
+                .await?;
 
     Ok(feed.to_vec())
 }
@@ -206,6 +208,15 @@ async fn cache_media(u: &str, t: &str) -> Result<String, Box<dyn Error>> {
     Ok(dest_filepath)
 }
 
+/**********
+ * This is the struct that holds the Mastodon Media ID and the Twitter Media URL at the same Time
+**********/
+#[derive(Debug)]
+struct ScootalooSpawnResponse {
+    mastodon_media_id: String,
+    twitter_media_url: String,
+}
+
 /**********
  * local error handler
 **********/
@@ -324,10 +335,12 @@ pub async fn run(config: Config) {
     let token = get_oauth2_token(&config);
 
     // get Mastodon instance
-    let mastodon = get_mastodon_token(&config.mastodon);
+    let mastodon = Arc::new(Mutex::new(get_mastodon_token(&config.mastodon)));
 
     // get user timeline feed (Vec<tweet>)
-    let mut feed = get_user_timeline(&config, token, last_tweet_id).await.unwrap_or_else(|e|
+    let mut feed = get_user_timeline(&config, token, last_tweet_id)
+        .await
+        .unwrap_or_else(|e|
         panic!("Something went wrong when trying to retrieve {}’s timeline: {}", &config.twitter.username, e)
     );
 
@@ -341,6 +354,7 @@ pub async fn run(config: Config) {
     feed.reverse();
 
     for tweet in &feed {
+        debug!("Treating Tweet {} inside feed", tweet.id);
         // determine if the tweet is part of a thread (response to self) or a standard response
         debug!("Treating Tweet {} inside feed", tweet.id);
         if let Some(r) =  &tweet.in_reply_to_screen_name {
@@ -364,6 +378,8 @@ pub async fn run(config: Config) {
 
         // reupload the attachments if any
         if let Some(m) = &tweet.extended_entities {
+            let (tx, mut rx) = mpsc::channel(4);
+
             for media in &m.media {
                 let local_tweet_media_path = match get_tweet_media(&media, &config.scootaloo.cache_path).await {
                     Ok(m) => m,
@@ -390,6 +406,7 @@ pub async fn run(config: Config) {
                 status_text = status_text.replace(&media.url, "");
             }
         }
+        // finished reuploading attachments, now let’s do the toot baby!
 
         debug!("Building corresponding Mastodon status");
         let status = StatusBuilder::new()
@@ -399,7 +416,8 @@ pub async fn run(config: Config) {
             .expect(&format!("Cannot build status with text {}", &status_text));
 
         // publish status
-        mastodon.new_status(status).unwrap();
+        // again unwrap is safe here as we are in the main thread
+        mastodon.lock().unwrap().new_status(status).unwrap();
         // this will panic if it cannot publish the status, which is a good thing, it allows the
         // last_tweet gathered not to be written