aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-07-14 15:17:25 +0000
committerfeld <feld@feld.me>2020-07-14 15:17:25 +0000
commit246f49d6858973fbb8fd4d4d9c2e5be7f9ccb283 (patch)
tree6c4967700799aca0091ec2ef5373dd4355a84cbd /lib
parent2d5e96ea8ba4c1fc42d4ce4d2ce6cbd9e39cf232 (diff)
parentb221b640a2dd443e3c2274b16ed5b62566329d09 (diff)
downloadpleroma-246f49d6858973fbb8fd4d4d9c2e5be7f9ccb283.tar.gz
Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
Transmogrifier: filtering weirdness in address fields Closes #1916 See merge request pleroma/pleroma!2762
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 884646ceb..f37bcab3e 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -62,15 +62,17 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
def fix_summary(object), do: Map.put(object, "summary", "")
def fix_addressing_list(map, field) do
+ addrs = map[field]
+
cond do
- is_binary(map[field]) ->
- Map.put(map, field, [map[field]])
+ is_list(addrs) ->
+ Map.put(map, field, Enum.filter(addrs, &is_binary/1))
- is_nil(map[field]) ->
- Map.put(map, field, [])
+ is_binary(addrs) ->
+ Map.put(map, field, [addrs])
true ->
- map
+ Map.put(map, field, [])
end
end