Overhaul Error handling (Option instead of Result<T, ()> + Logging changes
All checks were successful
Run Tests on Code / run-tests (push) Successful in 15s
All checks were successful
Run Tests on Code / run-tests (push) Successful in 15s
This commit is contained in:
parent
5d708bdb82
commit
b6f5c38e4a
5 changed files with 146 additions and 96 deletions
15
src/bot.rs
15
src/bot.rs
|
@ -7,6 +7,15 @@ use notify::{Event, EventKind, event::{AccessKind, AccessMode}, RecursiveMode, W
|
||||||
use tokio::time::sleep;
|
use tokio::time::sleep;
|
||||||
use systemd_journal_logger::connected_to_journal;
|
use systemd_journal_logger::connected_to_journal;
|
||||||
|
|
||||||
|
macro_rules! debug {
|
||||||
|
($msg:tt) => {
|
||||||
|
match connected_to_journal() {
|
||||||
|
true => log::debug!("[DEBUG] {}", $msg),
|
||||||
|
false => println!("[DEBUG] {}", $msg),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
macro_rules! info {
|
macro_rules! info {
|
||||||
($msg:tt) => {
|
($msg:tt) => {
|
||||||
match connected_to_journal() {
|
match connected_to_journal() {
|
||||||
|
@ -77,6 +86,8 @@ impl Bot {
|
||||||
|
|
||||||
lemmy.get_communities().await;
|
lemmy.get_communities().await;
|
||||||
|
|
||||||
|
self.history = SeriesHistory::load_history();
|
||||||
|
|
||||||
let start: DateTime<Utc> = Utc::now();
|
let start: DateTime<Utc> = Utc::now();
|
||||||
while Utc::now() - start <= Duration::minutes(60) {
|
while Utc::now() - start <= Duration::minutes(60) {
|
||||||
self.run_start_time = Utc::now();
|
self.run_start_time = Utc::now();
|
||||||
|
@ -84,10 +95,14 @@ impl Bot {
|
||||||
let read_copy = self.shared_config.read().expect("Read Lock Failed").clone();
|
let read_copy = self.shared_config.read().expect("Read Lock Failed").clone();
|
||||||
for series in read_copy.series {
|
for series in read_copy.series {
|
||||||
series.update(&mut self.history, &lemmy, &self.shared_config).await;
|
series.update(&mut self.history, &lemmy, &self.shared_config).await;
|
||||||
|
debug!("Done Updating Series");
|
||||||
self.wait(1, Wait::Absolute).await;
|
self.wait(1, Wait::Absolute).await;
|
||||||
}
|
}
|
||||||
|
debug!("Awaiting Timeout");
|
||||||
self.wait(30, Wait::Buffer).await;
|
self.wait(30, Wait::Buffer).await;
|
||||||
|
debug!("Pinging Server");
|
||||||
self.ping_status().await;
|
self.ping_status().await;
|
||||||
|
debug!("Awaiting Timeout 2");
|
||||||
self.wait(30, Wait::Absolute).await;
|
self.wait(30, Wait::Absolute).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,15 @@ use systemd_journal_logger::connected_to_journal;
|
||||||
use crate::fetchers::{FetcherTrait, Fetcher};
|
use crate::fetchers::{FetcherTrait, Fetcher};
|
||||||
use crate::fetchers::jnovel::{JNovelFetcher};
|
use crate::fetchers::jnovel::{JNovelFetcher};
|
||||||
|
|
||||||
|
macro_rules! debug {
|
||||||
|
($msg:tt) => {
|
||||||
|
match connected_to_journal() {
|
||||||
|
true => log::debug!("[DEBUG] {}", $msg),
|
||||||
|
false => println!("[DEBUG] {}", $msg),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
macro_rules! info {
|
macro_rules! info {
|
||||||
($msg:tt) => {
|
($msg:tt) => {
|
||||||
match connected_to_journal() {
|
match connected_to_journal() {
|
||||||
|
@ -168,8 +177,8 @@ impl SeriesConfig {
|
||||||
info!(info);
|
info!(info);
|
||||||
|
|
||||||
let post_id = match lemmy.post(post_data).await {
|
let post_id = match lemmy.post(post_data).await {
|
||||||
Ok(data) => data,
|
Some(data) => data,
|
||||||
Err(_) => {
|
None=> {
|
||||||
error!("Error posting chapter");
|
error!("Error posting chapter");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -188,31 +197,18 @@ impl SeriesConfig {
|
||||||
post_info.get_post_config(self).name.as_str()
|
post_info.get_post_config(self).name.as_str()
|
||||||
);
|
);
|
||||||
info!(info);
|
info!(info);
|
||||||
let pinned_posts = match lemmy.get_community_pinned(lemmy.get_community_id(&post_info.get_post_config(self).name)).await {
|
let pinned_posts = lemmy.get_community_pinned(lemmy.get_community_id(&post_info.get_post_config(self).name)).await.unwrap_or_else(|| {
|
||||||
Ok(data) => data,
|
|
||||||
Err(_) => {
|
|
||||||
error!("Pinning of Post to community failed");
|
error!("Pinning of Post to community failed");
|
||||||
continue;
|
vec![]
|
||||||
}
|
});
|
||||||
};
|
|
||||||
if !pinned_posts.is_empty() {
|
if !pinned_posts.is_empty() {
|
||||||
let community_pinned_post = &pinned_posts[0];
|
let community_pinned_post = &pinned_posts[0];
|
||||||
match lemmy
|
if lemmy.unpin(community_pinned_post.post.id, PostFeatureType::Community).await.is_none() {
|
||||||
.unpin(community_pinned_post.post.id, PostFeatureType::Community)
|
|
||||||
.await {
|
|
||||||
Ok(_) => {}
|
|
||||||
Err(_) => {
|
|
||||||
error!("Error un-pinning post");
|
error!("Error un-pinning post");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
if lemmy.pin(post_id, PostFeatureType::Community).await.is_none() {
|
||||||
match lemmy.pin(post_id, PostFeatureType::Community).await {
|
|
||||||
Ok(_) => {}
|
|
||||||
Err(_) => {
|
|
||||||
error!("Error pinning post");
|
error!("Error pinning post");
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else if read_config
|
} else if read_config
|
||||||
.protected_communities
|
.protected_communities
|
||||||
|
@ -229,10 +225,10 @@ impl SeriesConfig {
|
||||||
let info = format!("Pinning '{}' to Instance", post_info.get_info().title);
|
let info = format!("Pinning '{}' to Instance", post_info.get_info().title);
|
||||||
info!(info);
|
info!(info);
|
||||||
let pinned_posts = match lemmy.get_local_pinned().await {
|
let pinned_posts = match lemmy.get_local_pinned().await {
|
||||||
Ok(data) => {data}
|
Some(data) => {data}
|
||||||
Err(_) => {
|
None => {
|
||||||
error!("Error fetching pinned posts");
|
error!("Error fetching pinned posts");
|
||||||
return;
|
vec![]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -245,25 +241,16 @@ impl SeriesConfig {
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
let community_pinned_post = &pinned_post;
|
let community_pinned_post = &pinned_post;
|
||||||
match lemmy
|
if lemmy.unpin(community_pinned_post.post.id, PostFeatureType::Local).await.is_none() {
|
||||||
.unpin(community_pinned_post.post.id, PostFeatureType::Local)
|
|
||||||
.await {
|
|
||||||
Ok(_) => {}
|
|
||||||
Err(_) => {
|
|
||||||
error!("Error pinning post");
|
error!("Error pinning post");
|
||||||
return;
|
continue;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
match lemmy.pin(post_id, PostFeatureType::Local).await {
|
if lemmy.pin(post_id, PostFeatureType::Local).await.is_none() {
|
||||||
Ok(_) => {}
|
|
||||||
Err(_) => {
|
|
||||||
error!("Error pinning post");
|
error!("Error pinning post");
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -283,6 +270,7 @@ impl SeriesConfig {
|
||||||
series_history.set_part(post_info.get_part_info().unwrap_or(PartInfo::NoParts).as_string().as_str(), part_history);
|
series_history.set_part(post_info.get_part_info().unwrap_or(PartInfo::NoParts).as_string().as_str(), part_history);
|
||||||
history
|
history
|
||||||
.set_series(self.slug.as_str(), series_history);
|
.set_series(self.slug.as_str(), series_history);
|
||||||
|
debug!("Saving History");
|
||||||
history.save_history();
|
history.save_history();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -224,7 +224,7 @@ impl FetcherTrait for JNovelFetcher {
|
||||||
.or_insert(new_post_info);
|
.or_insert(new_post_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(prepub_info) = get_latest_prepub(&volume.slug).await? {
|
if let Some(prepub_info) = get_latest_prepub(&volume.slug).await {
|
||||||
let prepub_post_info = PostInfo {
|
let prepub_post_info = PostInfo {
|
||||||
post_type: Some(PostType::Chapter),
|
post_type: Some(PostType::Chapter),
|
||||||
part: Some(new_part_info),
|
part: Some(new_part_info),
|
||||||
|
@ -252,7 +252,7 @@ impl FetcherTrait for JNovelFetcher {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async fn get_latest_prepub(volume_slug: &str) -> Result<Option<PostInfoInner>, ()> {
|
async fn get_latest_prepub(volume_slug: &str) -> Option<PostInfoInner> {
|
||||||
let response = match HTTP_CLIENT
|
let response = match HTTP_CLIENT
|
||||||
.get(api_url!() + "/volumes/" + volume_slug + "/parts?format=json")
|
.get(api_url!() + "/volumes/" + volume_slug + "/parts?format=json")
|
||||||
.send()
|
.send()
|
||||||
|
@ -263,13 +263,13 @@ async fn get_latest_prepub(volume_slug: &str) -> Result<Option<PostInfoInner>, (
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let err_msg = format!("While getting latest PrePub: {e}");
|
let err_msg = format!("While getting latest PrePub: {e}");
|
||||||
error!(err_msg);
|
error!(err_msg);
|
||||||
return Err(());
|
return None;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let err_msg = format!("{e}");
|
let err_msg = format!("{e}");
|
||||||
error!(err_msg);
|
error!(err_msg);
|
||||||
return Err(());
|
return None;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -278,7 +278,7 @@ async fn get_latest_prepub(volume_slug: &str) -> Result<Option<PostInfoInner>, (
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let err_msg = format!("{e}");
|
let err_msg = format!("{e}");
|
||||||
error!(err_msg);
|
error!(err_msg);
|
||||||
return Err(());
|
return None;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
volume_prepub_parts_data.parts.reverse(); // Makes breaking out of the parts loop easier
|
volume_prepub_parts_data.parts.reverse(); // Makes breaking out of the parts loop easier
|
||||||
|
@ -300,5 +300,5 @@ async fn get_latest_prepub(volume_slug: &str) -> Result<Option<PostInfoInner>, (
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(post_details)
|
post_details
|
||||||
}
|
}
|
||||||
|
|
123
src/lemmy.rs
123
src/lemmy.rs
|
@ -15,6 +15,15 @@ use serde::{Deserialize, Serialize};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
use systemd_journal_logger::connected_to_journal;
|
use systemd_journal_logger::connected_to_journal;
|
||||||
|
|
||||||
|
macro_rules! debug {
|
||||||
|
($msg:tt) => {
|
||||||
|
match connected_to_journal() {
|
||||||
|
true => log::debug!("[DEBUG] {}", $msg),
|
||||||
|
false => println!("[DEBUG] {}", $msg),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
macro_rules! error {
|
macro_rules! error {
|
||||||
($msg:tt) => {
|
($msg:tt) => {
|
||||||
match connected_to_journal() {
|
match connected_to_journal() {
|
||||||
|
@ -252,21 +261,33 @@ impl Lemmy {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
pub(crate) async fn post(&self, post: CreatePost) -> Result<PostId, ()> {
|
pub(crate) async fn post(&self, post: CreatePost) -> Option<PostId> {
|
||||||
let response: String = self.post_data_json("/api/v3/post", &post).await?;
|
let response: String = match self.post_data_json("/api/v3/post", &post).await {
|
||||||
let json_data: PostView = self.parse_json_map(&response).await?;
|
Some(data) => data,
|
||||||
|
None => return None,
|
||||||
|
};
|
||||||
|
let json_data: PostView = match self.parse_json_map(&response).await {
|
||||||
|
Some(data) => data,
|
||||||
|
None => return None,
|
||||||
|
};
|
||||||
|
|
||||||
Ok(json_data.post.id)
|
Some(json_data.post.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn feature(&self, params: FeaturePost) -> Result<PostView, ()> {
|
async fn feature(&self, params: FeaturePost) -> Option<PostView> {
|
||||||
let response: String = self.post_data_json("/api/v3/post/feature", ¶ms).await?;
|
let response: String = match self.post_data_json("/api/v3/post/feature", ¶ms).await {
|
||||||
let json_data: PostView = self.parse_json_map(&response).await?;
|
Some(data) => data,
|
||||||
|
None => return None,
|
||||||
|
};
|
||||||
|
let json_data: PostView = match self.parse_json_map(&response).await {
|
||||||
|
Some(data) => data,
|
||||||
|
None => return None,
|
||||||
|
};
|
||||||
|
|
||||||
Ok(json_data)
|
Some(json_data)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn unpin(&self, post_id: PostId, location: PostFeatureType) -> Result<PostView, ()> {
|
pub(crate) async fn unpin(&self, post_id: PostId, location: PostFeatureType) -> Option<PostView> {
|
||||||
let pin_params = FeaturePost {
|
let pin_params = FeaturePost {
|
||||||
post_id,
|
post_id,
|
||||||
featured: false,
|
featured: false,
|
||||||
|
@ -275,7 +296,7 @@ impl Lemmy {
|
||||||
self.feature(pin_params).await
|
self.feature(pin_params).await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn pin(&self, post_id: PostId, location: PostFeatureType) -> Result<PostView, ()> {
|
pub(crate) async fn pin(&self, post_id: PostId, location: PostFeatureType) -> Option<PostView> {
|
||||||
let pin_params = FeaturePost {
|
let pin_params = FeaturePost {
|
||||||
post_id,
|
post_id,
|
||||||
featured: true,
|
featured: true,
|
||||||
|
@ -284,17 +305,23 @@ impl Lemmy {
|
||||||
self.feature(pin_params).await
|
self.feature(pin_params).await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn get_community_pinned(&self, community: CommunityId) -> Result<Vec<PostView>, ()> {
|
pub(crate) async fn get_community_pinned(&self, community: CommunityId) -> Option<Vec<PostView>> {
|
||||||
let list_params = GetPosts {
|
let list_params = GetPosts {
|
||||||
community_id: Some(community),
|
community_id: Some(community),
|
||||||
type_: Some(ListingType::Local),
|
type_: Some(ListingType::Local),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
|
|
||||||
let response: String = self.get_data_query("/api/v3/post/list", &list_params).await?;
|
let response: String = match self.get_data_query("/api/v3/post/list", &list_params).await {
|
||||||
let json_data: GetPostsResponse = self.parse_json(&response).await?;
|
Some(data) => data,
|
||||||
|
None => return None,
|
||||||
|
};
|
||||||
|
let json_data: GetPostsResponse = match self.parse_json(&response).await {
|
||||||
|
Some(data) => data,
|
||||||
|
None => return None,
|
||||||
|
};
|
||||||
|
|
||||||
Ok(json_data
|
Some(json_data
|
||||||
.posts
|
.posts
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|post| post.post.featured_community)
|
.filter(|post| post.post.featured_community)
|
||||||
|
@ -302,16 +329,22 @@ impl Lemmy {
|
||||||
.collect())
|
.collect())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn get_local_pinned(&self) -> Result<Vec<PostView>, ()> {
|
pub(crate) async fn get_local_pinned(&self) -> Option<Vec<PostView>> {
|
||||||
let list_params = GetPosts {
|
let list_params = GetPosts {
|
||||||
type_: Some(ListingType::Local),
|
type_: Some(ListingType::Local),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
|
|
||||||
let response: String = self.get_data_query("/api/v3/post/list", &list_params).await?;
|
let response: String = match self.get_data_query("/api/v3/post/list", &list_params).await {
|
||||||
let json_data: GetPostsResponse = self.parse_json(&response).await?;
|
Some(data) => data,
|
||||||
|
None => return None,
|
||||||
|
};
|
||||||
|
let json_data: GetPostsResponse = match self.parse_json(&response).await {
|
||||||
|
Some(data) => data,
|
||||||
|
None => return None,
|
||||||
|
};
|
||||||
|
|
||||||
Ok(json_data
|
Some(json_data
|
||||||
.posts
|
.posts
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|post| post.post.featured_local)
|
.filter(|post| post.post.featured_local)
|
||||||
|
@ -326,18 +359,12 @@ impl Lemmy {
|
||||||
};
|
};
|
||||||
|
|
||||||
let response: String = match self.get_data_query("/api/v3/community/list", &list_params).await {
|
let response: String = match self.get_data_query("/api/v3/community/list", &list_params).await {
|
||||||
Ok(data) => data,
|
Some(data) => data,
|
||||||
Err(_) => {
|
None => return,
|
||||||
error!("Unable to extract data from request");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
let json_data: ListCommunitiesResponse = match self.parse_json::<ListCommunitiesResponse>(&response).await {
|
let json_data: ListCommunitiesResponse = match self.parse_json::<ListCommunitiesResponse>(&response).await {
|
||||||
Ok(data) => data,
|
Some(data) => data,
|
||||||
Err(_) => {
|
None => return,
|
||||||
error!("Unable to parse data from json");
|
|
||||||
return;
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut communities: HashMap<String, CommunityId> = HashMap::new();
|
let mut communities: HashMap<String, CommunityId> = HashMap::new();
|
||||||
|
@ -349,7 +376,7 @@ impl Lemmy {
|
||||||
self.communities = communities;
|
self.communities = communities;
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn post_data_json<T: Serialize>(&self, route: &str, json: &T ) -> Result<String,()> {
|
async fn post_data_json<T: Serialize>(&self, route: &str, json: &T ) -> Option<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())
|
||||||
|
@ -359,7 +386,7 @@ impl Lemmy {
|
||||||
self.extract_data(res).await
|
self.extract_data(res).await
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn get_data_query<T: Serialize>(&self, route: &str, param: &T ) -> Result<String,()> {
|
async fn get_data_query<T: Serialize>(&self, route: &str, param: &T ) -> Option<String> {
|
||||||
let res = HTTP_CLIENT
|
let res = HTTP_CLIENT
|
||||||
.get(format!("{}{route}", &self.instance))
|
.get(format!("{}{route}", &self.instance))
|
||||||
.bearer_auth(&self.jwt_token.to_string())
|
.bearer_auth(&self.jwt_token.to_string())
|
||||||
|
@ -369,42 +396,52 @@ impl Lemmy {
|
||||||
self.extract_data(res).await
|
self.extract_data(res).await
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn extract_data(&self, response: Result<reqwest::Response, reqwest::Error>) -> Result<String,()> {
|
async fn extract_data(&self, response: Result<reqwest::Response, reqwest::Error>) -> Option<String> {
|
||||||
match response {
|
match response {
|
||||||
Ok(data) => match data.text().await {
|
Ok(data) => {
|
||||||
Ok(data) => Ok(data),
|
if data.status().is_success() {
|
||||||
|
match data.text().await {
|
||||||
|
Ok(data) => Some(data),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let err_msg = format!("{e}");
|
let err_msg = format!("{e}");
|
||||||
error!(err_msg);
|
error!(err_msg);
|
||||||
Err(())
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
let err_msg = format!("HTTP Request failed: {}", data.text().await.unwrap());
|
||||||
|
error!(err_msg);
|
||||||
|
None
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let err_msg = format!("{e}");
|
let err_msg = format!("{e}");
|
||||||
error!(err_msg);
|
error!(err_msg);
|
||||||
Err(())
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn parse_json<'a, T: Deserialize<'a>>(&self, response: &'a str) -> Result<T,()> {
|
async fn parse_json<'a, T: Deserialize<'a>>(&self, response: &'a str) -> Option<T> {
|
||||||
match serde_json::from_str::<T>(response) {
|
match serde_json::from_str::<T>(response) {
|
||||||
Ok(data) => Ok(data),
|
Ok(data) => Some(data),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let err_msg = format!("{e} while parsing JSON");
|
let err_msg = format!("while parsing JSON: {e} ");
|
||||||
error!(err_msg);
|
error!(err_msg);
|
||||||
Err(())
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn parse_json_map<'a, T: Deserialize<'a>>(&self, response: &'a str) -> Result<T,()> {
|
async fn parse_json_map<'a, T: Deserialize<'a>>(&self, response: &'a str) -> Option<T> {
|
||||||
|
debug!(response);
|
||||||
match serde_json::from_str::<HashMap<&str, T>>(response) {
|
match serde_json::from_str::<HashMap<&str, T>>(response) {
|
||||||
Ok(mut data) => Ok(data.remove("post_view").expect("Element should be present")),
|
Ok(mut data) => Some(data.remove("post_view").expect("Element should be present")),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let err_msg = format!("{e} while parsing JSON HashMap");
|
let err_msg = format!("while parsing JSON HashMap: {e}");
|
||||||
error!(err_msg);
|
error!(err_msg);
|
||||||
Err(())
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
12
src/main.rs
12
src/main.rs
|
@ -25,7 +25,17 @@ async fn main() {
|
||||||
.expect("Systemd-Logger crate error")
|
.expect("Systemd-Logger crate error")
|
||||||
.install()
|
.install()
|
||||||
.expect("Systemd-Logger crate error");
|
.expect("Systemd-Logger crate error");
|
||||||
log::set_max_level(LevelFilter::Info);
|
match std::env::var("LOG_LEVEL") {
|
||||||
|
Ok(level) => {
|
||||||
|
match level.as_str() {
|
||||||
|
"debug" => log::set_max_level(LevelFilter::Debug),
|
||||||
|
"info" => log::set_max_level(LevelFilter::Info),
|
||||||
|
_ => log::set_max_level(LevelFilter::Info),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => log::set_max_level(LevelFilter::Info),
|
||||||
|
}
|
||||||
|
|
||||||
let mut bot = Bot::new();
|
let mut bot = Bot::new();
|
||||||
bot.run().await;
|
bot.run().await;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue