From 8d5e9f865c833aca3c1398b8c2bf82ef90e24a83 Mon Sep 17 00:00:00 2001 From: Felix Ableitner <me@nutomic.com> Date: Mon, 22 Feb 2021 19:34:41 +0100 Subject: [PATCH] Use `name` field for post titles instead of `summary` (ref #1220) --- crates/apub/src/objects/post.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/crates/apub/src/objects/post.rs b/crates/apub/src/objects/post.rs index 097480cf..d3d9dfb8 100644 --- a/crates/apub/src/objects/post.rs +++ b/crates/apub/src/objects/post.rs @@ -58,8 +58,9 @@ impl ToApub for Post { // https://git.asonix.dog/Aardwolf/activitystreams/issues/5 .set_many_contexts(lemmy_context()?) .set_id(self.ap_id.to_owned().into_inner()) - // Use summary field to be consistent with mastodon content warning. - // https://mastodon.xyz/@Louisa/103987265222901387.json + .set_name(self.name.to_owned()) + // `summary` field for compatibility with lemmy v0.9.9 and older, + // TODO: remove this after some time .set_summary(self.name.to_owned()) .set_published(convert_datetime(self.published)) .set_many_tos(vec![community.actor_id.into_inner(), public()]) @@ -174,8 +175,11 @@ impl FromApubToForm<PageExt> for PostForm { let name = page .inner - .summary() - .as_ref() + .name() + .map(|s| s.map(|s2| s2.to_owned())) + // The following is for compatibility with lemmy v0.9.9 and older + // TODO: remove it after some time (along with the map above) + .or_else(|| page.inner.summary().map(|s| s.to_owned())) .context(location_info!())? .as_single_xsd_string() .context(location_info!())? -- 2.44.1