Fix remote emoji in subject disappearing after edits

This commit is contained in:
Tusooa Zhu 2022-07-09 18:00:42 -04:00
parent 11a6e88420
commit 04ded94a50
No known key found for this signature in database
GPG Key ID: 7B467EDE43A08224
2 changed files with 50 additions and 1 deletions

View File

@ -415,7 +415,14 @@ def update(user, orig_activity, changes) do
defp make_update_data(user, orig_object, changes) do defp make_update_data(user, orig_object, changes) do
kept_params = %{ kept_params = %{
visibility: Visibility.get_visibility(orig_object) visibility: Visibility.get_visibility(orig_object),
in_reply_to_id:
with replied_id when is_binary(replied_id) <- orig_object.data["inReplyTo"],
%Activity{id: activity_id} <- Activity.get_create_by_object_ap_id(replied_id) do
activity_id
else
_ -> nil
end
} }
params = Map.merge(changes, kept_params) params = Map.merge(changes, kept_params)

View File

@ -1605,5 +1605,47 @@ test "updates a post with emoji and federate properly" do
assert called(Pleroma.Web.Federator.publish(updated)) assert called(Pleroma.Web.Federator.publish(updated))
end end
end end
test "editing a post that copied a remote title with remote emoji should keep that emoji" do
remote_emoji_uri = "https://remote.org/emoji.png"
note =
insert(
:note,
data: %{
"summary" => ":remoteemoji:",
"emoji" => %{
"remoteemoji" => remote_emoji_uri
},
"tag" => [
%{
"type" => "Emoji",
"name" => "remoteemoji",
"icon" => %{"url" => remote_emoji_uri}
}
]
}
)
note_activity = insert(:note_activity, note: note)
user = insert(:user)
{:ok, reply} =
CommonAPI.post(user, %{
status: "reply",
spoiler_text: ":remoteemoji:",
in_reply_to_id: note_activity.id
})
assert reply.object.data["emoji"]["remoteemoji"] == remote_emoji_uri
{:ok, edit} =
CommonAPI.update(user, reply, %{status: "reply mew mew", spoiler_text: ":remoteemoji:"})
edited_note = Pleroma.Object.normalize(edit)
assert edited_note.data["emoji"]["remoteemoji"] == remote_emoji_uri
end
end end
end end