summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTusooa Zhu <tusooa@kazv.moe>2022-06-25 09:23:09 -0400
committerTusooa Zhu <tusooa@kazv.moe>2022-06-25 09:23:09 -0400
commit9c6dae942d2ec5e2314af1d345cf2aeed504aae8 (patch)
treeedb27ad9c2396f810718810d4a54f6be477ed395 /lib
parente98579b1da78b47d6848ec55042640e539e44f6c (diff)
downloadpleroma-9c6dae942d2ec5e2314af1d345cf2aeed504aae8.tar.gz
pleroma-9c6dae942d2ec5e2314af1d345cf2aeed504aae8.zip
Fix local updates causing emojis to be lost
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/side_effects.ex9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index 7345a6904..747f467db 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -420,7 +420,14 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
orig_object = Object.get_by_ap_id(orig_object_ap_id)
orig_object_data = orig_object.data
- updated_object = meta[:object_data]
+ updated_object =
+ if meta[:local] do
+ # If this is a local Update, we don't process it by transmogrifier,
+ # so we use the embedded object as-is.
+ updated_object
+ else
+ meta[:object_data]
+ end
if orig_object_data["type"] in @updatable_object_types do
%{