summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authortusooa <tusooa@kazv.moe>2024-01-13 22:23:21 +0000
committertusooa <tusooa@kazv.moe>2024-01-13 22:23:21 +0000
commitd3a4f5b7d7234efddc7fed608f6062b30e8a4c11 (patch)
treef7ad12e961971087ee1be3f288723709d8b2bc0e /lib
parent9cc46c55382d2e8960016b52f72ad63b0e55dd16 (diff)
parent7651198508cc40adfab27969f196e4496bd441da (diff)
downloadpleroma-d3a4f5b7d7234efddc7fed608f6062b30e8a4c11.tar.gz
pleroma-d3a4f5b7d7234efddc7fed608f6062b30e8a4c11.zip
Merge branch 'nil-contentMap' into 'develop'
Support objects with a nil contentMap (firefish) Closes #3231 See merge request pleroma/pleroma!4030
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 35f3aea03..68f3e1399 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -339,6 +339,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
def fix_tag(object), do: object
+ def fix_content_map(%{"contentMap" => nil} = object) do
+ Map.drop(object, ["contentMap"])
+ end
+
# content map usually only has one language so this will do for now.
def fix_content_map(%{"contentMap" => content_map} = object) do
content_groups = Map.to_list(content_map)