From 7f79ffb2b0a490bc26721b9e55aaccb4eaecec8d Mon Sep 17 00:00:00 2001 From: dracarys18 Date: Sun, 10 Apr 2022 12:31:10 +0530 Subject: [PATCH] Heroku setup --- Procfile | 2 +- requirements.txt | 5 ----- runtime.txt | 1 - rust-toolchain | 1 + src/stream/stream_impl.rs | 6 ++---- 5 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 requirements.txt delete mode 100644 runtime.txt create mode 100644 rust-toolchain diff --git a/Procfile b/Procfile index eb131d6..095a953 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -worker: python3 main.py +worker: ./target/release/tweet_bot diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 0bc26c1..0000000 --- a/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -python-telegram-bot -python-dotenv -tweepy==3.10.0 - - diff --git a/runtime.txt b/runtime.txt deleted file mode 100644 index 9bff0e0..0000000 --- a/runtime.txt +++ /dev/null @@ -1 +0,0 @@ -python-3.9.6 diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 0000000..870bbe4 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +stable \ No newline at end of file diff --git a/src/stream/stream_impl.rs b/src/stream/stream_impl.rs index 996eadf..46b36fa 100644 --- a/src/stream/stream_impl.rs +++ b/src/stream/stream_impl.rs @@ -1,6 +1,6 @@ use crate::config::Config; use crate::error::TweetResult; -use crate::utils::{get_media_urls, get_tweet_url, get_url_entity, tweet_has_media}; +use crate::utils::{get_tweet_url, tweet_has_media}; use egg_mode::stream::{filter, StreamMessage}; use futures::TryStreamExt; use teloxide::prelude2::*; @@ -12,15 +12,13 @@ pub async fn stream_tweets(config: &Config, to_follow: Vec) -> TweetResult< let bot = config.bot(); let stream = filter().follow(&to_follow).start(token); stream - .try_for_each_concurrent(None, |t| async move { + .try_for_each(|t| async move { if let StreamMessage::Tweet(tweet) = t { let tweeter = tweet.user.as_ref().expect("Invalid User"); let name = &tweeter.name; let _user_id = tweeter.id; let tweet_url = get_tweet_url(&tweet).await.unwrap_or_default(); let text = escape(&tweet.text); - let urls = get_url_entity(&tweet).await.unwrap_or_default(); - let media = get_media_urls(&tweet).await; let message = format!("{}\nVia |{}|", text, tweet_url, name); //Don't send retweeted tweets and only send if the reply is from the current user (in case of threads) if matches!(tweet.retweeted, Some(false))