Neshura/aob-lemmy-bot
Neshura/aob-lemmy-bot
1
0
Fork 0
Code Issues 9 Pull requests Projects 1 Releases 63 Packages Wiki Activity Actions

Bugfix due to bad deduplication
All checks were successful
Run Tests on Code / run-tests (push) Successful in 13s
Details

Browse source
This commit is contained in:
Neshura 2024-05-06 21:16:53 +02:00
parent 34b3bb45c5
commit 45bfca8cc5
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C
1 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/lemmy.rs
View file

@ -89,24 +89,15 @@ pub(crate) async fn login(config: &Config) -> Result<Lemmy, ()> {
impl Lemmy { impl Lemmy {
pub(crate) async fn post(&self, post: CreatePost) -> Result<PostId, ()> { pub(crate) async fn post(&self, post: CreatePost) -> Result<PostId, ()> {
let response = self.fetch_data_json("/api/v3/post", &post).await?; let response: String = self.post_data_json("/api/v3/post", &post).await?;
let json_data: PostView = self.parse_json(&response).await?; let json_data: PostView = self.parse_json(&response).await?;
Ok(json_data.post.id) Ok(json_data.post.id)
} }
async fn feature(&self, params: FeaturePost) -> Result<PostView, ()> { async fn feature(&self, params: FeaturePost) -> Result<PostView, ()> {
let response = self.fetch_data_json("/api/v3/post/feature", &params).await?; let response: String = self.post_data_json("/api/v3/post/feature", &params).await?;
let json_data: PostView = self.parse_json(&response).await?;
let json_data = match serde_json::from_str::<HashMap<&str, PostView>>(&response) {
Ok(mut data) => data.remove("post_view").expect("Element should be present"),
Err(e) => {
let err_msg = format!("{e}");
error!(err_msg);
return Err(());
}
};
Ok(json_data) Ok(json_data)
} }
@ -136,8 +127,7 @@ impl Lemmy {
..Default::default() ..Default::default()
}; };
let response = self.fetch_data_query("/api/v3/post/list", &list_params).await?; let response: String = self.get_data_query("/api/v3/post/list", &list_params).await?;
let json_data: GetPostsResponse = self.parse_json(&response).await?; let json_data: GetPostsResponse = self.parse_json(&response).await?;
Ok(json_data Ok(json_data
@ -154,8 +144,7 @@ impl Lemmy {
..Default::default() ..Default::default()
}; };
let response = self.fetch_data_query("/api/v3/post/list", &list_params).await?; let response: String = self.get_data_query("/api/v3/post/list", &list_params).await?;
let json_data: GetPostsResponse = self.parse_json(&response).await?; let json_data: GetPostsResponse = self.parse_json(&response).await?;
Ok(json_data Ok(json_data
@ -172,8 +161,7 @@ impl Lemmy {
..Default::default() ..Default::default()
}; };
let response = self.fetch_data_query("/api/v3/community/list", &list_params).await?; let response: String = self.get_data_query("/api/v3/community/list", &list_params).await?;
let json_data: ListCommunitiesResponse = self.parse_json(&response).await?; let json_data: ListCommunitiesResponse = self.parse_json(&response).await?;
let mut communities: HashMap<String, CommunityId> = HashMap::new(); let mut communities: HashMap<String, CommunityId> = HashMap::new();
@ -185,9 +173,9 @@ impl Lemmy {
Ok(communities) Ok(communities)
} }
async fn fetch_data_json<T: Serialize>(&self, route: &str, json: &T ) -> Result<String,()> { async fn post_data_json<T: Serialize>(&self, route: &str, json: &T ) -> Result<String,()> {
let res = HTTP_CLIENT let res = HTTP_CLIENT
.post(format!("{}{route}", self.instance)) .post(format!("{}{route}", &self.instance))
.bearer_auth(&self.jwt_token.to_string()) .bearer_auth(&self.jwt_token.to_string())
.json(&json) .json(&json)
.send() .send()
@ -195,11 +183,11 @@ impl Lemmy {
self.extract_data(res).await self.extract_data(res).await
} }
async fn fetch_data_query<T: Serialize>(&self, route: &str, json: &T ) -> Result<String,()> { async fn get_data_query<T: Serialize>(&self, route: &str, param: &T ) -> Result<String,()> {
let res = HTTP_CLIENT let res = HTTP_CLIENT
.post(format!("{}{route}", self.instance)) .get(format!("{}{route}", &self.instance))
.bearer_auth(&self.jwt_token.to_string()) .bearer_auth(&self.jwt_token.to_string())
.query(&json) .query(&param)
.send() .send()
.await; .await;
self.extract_data(res).await self.extract_data(res).await