Skip to content

Commit

Permalink
fix: make sensitive in AP optional bc AP
Browse files Browse the repository at this point in the history
  • Loading branch information
CutestNekoAqua committed Jul 16, 2024
1 parent f5e4092 commit 474b576
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/lysand/conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ pub async fn receive_lysand_note(
let ap_note = crate::objects::post::Note {
kind: Default::default(),
id,
sensitive: note.is_sensitive.unwrap_or(false),
sensitive: Some(note.is_sensitive.unwrap_or(false)),
cc,
to,
tag,
Expand Down Expand Up @@ -336,7 +336,7 @@ pub async fn receive_lysand_note(
id: Set(note.id.to_string()),
creator: Set(lysand_author.id.clone()),
content: Set(ap_note.content.clone()),
sensitive: Set(ap_note.sensitive),
sensitive: Set(ap_note.sensitive.unwrap_or_default()),
created_at: Set(Utc
.timestamp_micros(note.created_at.unix_timestamp())
.unwrap()),
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ async fn post_manually(
let note = Note {
kind: Default::default(),
id: id.clone(),
sensitive: false,
sensitive: Some(false),
attributed_to: Url::parse(&local_user.id).unwrap().into(),
to: vec![public(), mention.href.clone()],
content: format!("{} {}", path.1, target.name),
Expand Down
6 changes: 3 additions & 3 deletions src/objects/post.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub struct Note {
pub(crate) content: String,
pub(crate) in_reply_to: Option<ObjectId<post::Model>>,
pub(crate) tag: Vec<Mention>,
pub(crate) sensitive: bool,
pub(crate) sensitive: Option<bool>,
pub(crate) cc: Option<Vec<Url>>,
}

Expand Down Expand Up @@ -98,7 +98,7 @@ impl Object for post::Model {
content: self.content,
in_reply_to: None,
tag: vec![],
sensitive: self.sensitive,
sensitive: Some(self.sensitive),
cc: Some(to),
})
}
Expand Down Expand Up @@ -126,7 +126,7 @@ impl Object for post::Model {
content_type: Set("text/plain".to_string()), // TODO: make this use the real content type
local: Set(false),
visibility: Set("public".to_string()), // TODO: make this use the real visibility
sensitive: Set(json.sensitive.clone()),
sensitive: Set(json.sensitive.clone().unwrap_or_default()),
url: Set(json.id.clone().to_string()),
..Default::default()
};
Expand Down

0 comments on commit 474b576

Please sign in to comment.