gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing ban_expires from federated fields.

temp_bans
Dessalines 2022-01-06 11:41:24 -05:00
parent 3fa4c0cc30
commit 3131679054
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/apub/src/objects/person.rs
View File

@ -113,7 +113,6 @@ impl ApubObject for ApubPerson {
updated: self.updated.map(convert_datetime), updated: self.updated.map(convert_datetime),
unparsed: Default::default(), unparsed: Default::default(),
inbox: self.inbox_url.clone().into(), inbox: self.inbox_url.clone().into(),
ban_expires: self.ban_expires.map(convert_datetime),
}; };
Ok(person) Ok(person)
} }
@ -150,6 +149,7 @@ impl ApubObject for ApubPerson {
name: person.preferred_username, name: person.preferred_username,
display_name: Some(person.name), display_name: Some(person.name),
banned: None, banned: None,
ban_expires: None,
deleted: None, deleted: None,
avatar: Some(person.icon.map(|i| i.url.into())), avatar: Some(person.icon.map(|i| i.url.into())),
banner: Some(person.image.map(|i| i.url.into())), banner: Some(person.image.map(|i| i.url.into())),
@ -169,7 +169,6 @@ impl ApubObject for ApubPerson {
inbox_url: Some(person.inbox.into()), inbox_url: Some(person.inbox.into()),
shared_inbox_url: Some(person.endpoints.shared_inbox.map(|s| s.into())), shared_inbox_url: Some(person.endpoints.shared_inbox.map(|s| s.into())),
matrix_user_id: Some(person.matrix_user_id), matrix_user_id: Some(person.matrix_user_id),
ban_expires: Some(person.ban_expires.map(|u| u.naive_local())),
}; };
let person = blocking(context.pool(), move |conn| { let person = blocking(context.pool(), move |conn| {
DbPerson::upsert(conn, &person_form) DbPerson::upsert(conn, &person_form)

1
crates/apub/src/protocol/objects/person.rs
View File

@ -39,7 +39,6 @@ pub struct Person {
pub(crate) public_key: PublicKey, pub(crate) public_key: PublicKey,
pub(crate) published: Option<DateTime<FixedOffset>>, pub(crate) published: Option<DateTime<FixedOffset>>,
pub(crate) updated: Option<DateTime<FixedOffset>>, pub(crate) updated: Option<DateTime<FixedOffset>>,
pub(crate) ban_expires: Option<DateTime<FixedOffset>>,
#[serde(flatten)] #[serde(flatten)]
pub(crate) unparsed: Unparsed, pub(crate) unparsed: Unparsed,
} }