HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

chore: handle a bit more errors

Browse source
This commit is contained in:
naskya 2024-05-31 06:17:13 +09:00
parent 76a0e5fa28
commit af2b19709e
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/backend-rs/src/service/push_notification.rs
View file

@ -3,7 +3,7 @@ use crate::misc::get_note_summary::{get_note_summary, NoteLike};
use crate::misc::meta::fetch_meta; use crate::misc::meta::fetch_meta;
use crate::model::entity::{access_token, app, sw_subscription}; use crate::model::entity::{access_token, app, sw_subscription};
use crate::util::http_client; use crate::util::http_client;
use crate::util::id::get_timestamp; use crate::util::id::{get_timestamp, InvalidIdError};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use sea_orm::prelude::*; use sea_orm::prelude::*;
use web_push::{ use web_push::{
@ -21,6 +21,8 @@ pub enum Error {
Serialize(#[from] serde_json::Error), Serialize(#[from] serde_json::Error),
#[error("Invalid content: {0}")] #[error("Invalid content: {0}")]
InvalidContent(String), InvalidContent(String),
#[error("Invalid notification ID: {0}")]
InvalidId(#[from] InvalidIdError),
#[error("HTTP client aquisition error: {0}")] #[error("HTTP client aquisition error: {0}")]
HttpClient(#[from] http_client::Error), HttpClient(#[from] http_client::Error),
} }
@ -139,7 +141,8 @@ async fn encode_mastodon_payload(
let timestamp = object let timestamp = object
.get("notification_id") .get("notification_id")
.and_then(|id| id.as_str()) .and_then(|id| id.as_str())
.map(|id| get_timestamp(id).unwrap_or_default()) .map(get_timestamp)
.transpose()?
.unwrap_or_default(); .unwrap_or_default();
object.insert("notification_id".to_string(), timestamp.into()); object.insert("notification_id".to_string(), timestamp.into());