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

refactor: use ok_or to return errors when Some is expected

Browse source
This commit is contained in:
naskya 2024-05-24 09:16:37 +09:00
parent 1df3680842
commit fbe906fe11
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
1 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,11 +58,9 @@ fn compact_content(
return Ok(content);
}
if !content.is_object() {
return Err(Error::InvalidContent("not a JSON object".to_string()));
}
let object = content.as_object_mut().unwrap();
let object = content
.as_object_mut()
.ok_or(Error::InvalidContent("not a JSON object".to_string()))?;
if !object.contains_key("note") {
return Ok(content);
@ -106,31 +104,24 @@ async fn encode_mastodon_payload(
db: &DatabaseConnection,
subscription: &sw_subscription::Model,
) -> Result<String, Error> {
if !content.is_object() {
return Err(Error::InvalidContent("not a JSON object".to_string()));
}
let object = content
.as_object_mut()
.ok_or(Error::InvalidContent("not a JSON object".to_string()))?;
if subscription.app_access_token_id.is_none() {
return Err(Error::InvalidContent("no access token".to_string()));
}
let token_id = subscription.app_access_token_id.as_ref().unwrap();
let maybe_token = access_token::Entity::find()
let token_id = subscription
.app_access_token_id
.as_ref()
.ok_or(Error::InvalidContent("no access token".to_string()))?;
let token = access_token::Entity::find()
.filter(access_token::Column::Id.eq(token_id))
.one(db)
.await?;
if maybe_token.is_none() {
return Err(Error::InvalidContent("access token not found".to_string()));
}
let token = maybe_token.unwrap();
.await?
.ok_or(Error::InvalidContent("access token not found".to_string()))?;
if token.app_id.is_none() {
return Err(Error::InvalidContent("no app ID".to_string()));
}
let object = content.as_object_mut().unwrap();
object.insert(
"access_token".to_string(),
serde_json::to_value(token.token)?,