diff --git a/Cargo.lock b/Cargo.lock index 07245d6..734bb74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,7 +52,7 @@ dependencies = [ [[package]] name = "aob-lemmy-bot" -version = "3.2.1" +version = "3.3.1" dependencies = [ "async-trait", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 43f3599..e97bea1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Neshura"] name = "aob-lemmy-bot" -version = "3.2.1" +version = "3.3.1" edition = "2021" description = "Bot for automatically posting new chapters of 'Ascendance of a Bookworm' released by J-Novel Club" license = "GPL-3.0-or-later" diff --git a/src/bot.rs b/src/bot.rs index ba0e8b9..3e0bde8 100644 --- a/src/bot.rs +++ b/src/bot.rs @@ -81,7 +81,10 @@ impl Bot { loop { let mut lemmy = match Lemmy::new(&self.shared_config).await { Ok(data) => data, - Err(_) => continue, + Err(_) => { + sleep(Duration::seconds(10).to_std().unwrap()).await; + continue; + }, }; lemmy.get_communities().await; diff --git a/src/lemmy.rs b/src/lemmy.rs index 6afe1e5..9dc45ec 100644 --- a/src/lemmy.rs +++ b/src/lemmy.rs @@ -23,6 +23,15 @@ macro_rules! debug { }; } +macro_rules! info { + ($msg:tt) => { + match connected_to_journal() { + true => log::info!("[INFO] {}", $msg), + false => println!("[INFO] {}", $msg), + } + }; +} + macro_rules! error { ($msg:tt) => { match connected_to_journal() { @@ -218,7 +227,7 @@ impl Lemmy { }; let response = match HTTP_CLIENT - .post(read_config.instance.to_owned() + "/api/v3/user/login") + .post(read_config.instance.to_owned() + "/api/alpha/user/login") .json(&login_params) .send() .await @@ -259,12 +268,12 @@ impl Lemmy { } pub(crate) async fn logout(&self) { - let _ = self.post_data_json("/api/v3/user/logout", &"").await; + let _ = self.post_data_json("/api/alpha/user/logout", &"").await; } pub(crate) async fn post(&self, post: CreatePost) -> Option<PostId> { - let response: String = match self.post_data_json("/api/v3/post", &post).await { + let response: String = match self.post_data_json("/api/alpha/post", &post).await { Some(data) => data, None => return None, }; @@ -277,7 +286,7 @@ impl Lemmy { } async fn feature(&self, params: FeaturePost) -> Option<PostView> { - let response: String = match self.post_data_json("/api/v3/post/feature", ¶ms).await { + let response: String = match self.post_data_json("/api/alpha/post/feature", ¶ms).await { Some(data) => data, None => return None, }; @@ -314,7 +323,7 @@ impl Lemmy { ..Default::default() }; - let response: String = match self.get_data_query("/api/v3/post/list", &list_params).await { + let response: String = match self.get_data_query("/api/alpha/post/list", &list_params).await { Some(data) => data, None => return None, }; @@ -337,7 +346,7 @@ impl Lemmy { ..Default::default() }; - let response: String = match self.get_data_query("/api/v3/post/list", &list_params).await { + let response: String = match self.get_data_query("/api/alpha/post/list", &list_params).await { Some(data) => data, None => return None, }; @@ -360,7 +369,7 @@ impl Lemmy { ..Default::default() }; - let response: String = match self.get_data_query("/api/v3/community/list", &list_params).await { + let response: String = match self.get_data_query("/api/alpha/community/list", &list_params).await { Some(data) => data, None => return, }; @@ -395,26 +404,35 @@ impl Lemmy { page_cursor: None, }; - let response: String = match self.get_data_query("/api/v3/post/list", &get_params).await { + let response: String = match self.get_data_query("/api/alpha/post/list", &get_params).await { Some(data) => data, - None => return None, + None => { + error!("Unable to query post list"); + return None + }, }; let json_data: GetPostsResponse = match self.parse_json(&response).await { Some(data) => data, - None => return None, + None => { + error!("Unable to parse post data"); + return None + }, }; - if json_data.posts[0].post.name == post.name { - Some(json_data.posts[0].post.id) - } else { - None + for api_post in json_data.posts { + if api_post.post.name == post.name { + return Some(api_post.post.id); + } } + let msg = format!("Unable to find post {}", post.name); + info!(msg); + None } async fn post_data_json<T: Serialize>(&self, route: &str, json: &T ) -> Option<String> { let res = HTTP_CLIENT .post(format!("{}{route}", &self.instance)) - .bearer_auth(&self.jwt_token.to_string()) + .bearer_auth(self.jwt_token.to_string()) .json(&json) .send() .await; @@ -424,7 +442,7 @@ impl Lemmy { async fn get_data_query<T: Serialize>(&self, route: &str, param: &T ) -> Option<String> { let res = HTTP_CLIENT .get(format!("{}{route}", &self.instance)) - .bearer_auth(&self.jwt_token.to_string()) + .bearer_auth(self.jwt_token.to_string()) .query(¶m) .send() .await;