Add poast.org as nitter backup

lib/rss-client/Cargo.toml

@@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 quick-xml = { version = "0.31.0", features = [ "serialize" ] }
-reqwest = { version = "0.12.2", default-features = false }
+reqwest = { version = "0.12.2", features = [ "http2" ], default-features = false }
 serde = { version = "1.0.197", features = ["derive"] }
 thiserror = "1.0.58"
 tokio = { version = "1.37.0", features = [ "rt" ] }

lib/rss-client/src/lib.rs

@@ -6,6 +6,8 @@ pub use self::model::{
 };
 use std::time::Duration;
 
+const USER_AGENT_STR: &str = concat!(env!("CARGO_CRATE_NAME"), "/", env!("CARGO_PKG_VERSION"));
+
 /// Library error type
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
@@ -34,6 +36,7 @@ impl Client {
     pub fn new() -> Self {
         Self {
             client: reqwest::Client::builder()
+                .user_agent(USER_AGENT_STR)
                 .connect_timeout(Duration::from_secs(10))
                 .build()
                 .expect("failed to build client"),

src/commands/random_tweet.rs

@@ -5,6 +5,7 @@ use rand::{
     prelude::SliceRandom,
     rngs::OsRng,
 };
+use rss_client::RssFeed;
 use serenity::{
     client::Context,
     framework::standard::{
@@ -19,7 +20,7 @@ use std::{
     time::Duration,
 };
 
-async fn retry<FN, T, E, FU>(mut func: FN, max_tries: u64) -> Result<T, E>
+async fn retry<FN, T, E, FU>(mut func: FN, max_tries: u32) -> Result<T, E>
 where
     FN: FnMut() -> FU,
     FU: Future<Output = Result<T, E>>,
@@ -36,7 +37,7 @@ where
                 warn!("{error}");
 
                 num_try += 1;
-                tokio::time::sleep(Duration::from_secs(num_try)).await;
+                tokio::time::sleep(Duration::from_secs(2_u64.pow(num_try))).await;
             }
             Err(error) => {
                 break Err(error);
@@ -45,14 +46,27 @@ where
     }
 }
 
+async fn get_nitter_feed(
+    client: &rss_client::Client,
+    host: &str,
+    user: &str,
+) -> anyhow::Result<RssFeed> {
+    let url = format!("{host}/{user}/media/rss");
+    retry(|| client.get_feed(&url), 3)
+        .await
+        .with_context(|| format!("failed to get nitter rss feed for \"{user}\" from \"{host}\""))
+}
+
 pub async fn get_random_tweet_url(
     client: &rss_client::Client,
     user: &str,
 ) -> anyhow::Result<Option<String>> {
-    let url = format!("https://nitter.privacydev.net/{user}/media/rss");
-    let feed = retry(|| client.get_feed(&url), 3)
-        .await
-        .with_context(|| format!("failed to get nitter rss feed for \"{user}\""))?;
+    let feed_result = get_nitter_feed(client, "https://nitter.privacydev.net", user).await;
+
+    let feed = match feed_result {
+        Ok(feed) => feed,
+        Err(_error) => get_nitter_feed(client, "https://nitter.poast.org", user).await?,
+    };
 
     let entries: Vec<_> = feed
         .channel