diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-17 01:20:04 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-17 01:20:04 +0000 |
| commit | 99f50bf3e8d3077216eecd101f16c31f46fdbf42 (patch) | |
| tree | bde5c636108728692ae89c66fc6dbbbbdcaa08f0 /lib | |
| parent | bf84d50c76cb8d9a6a9ea77a7620c9545b10a7ed (diff) | |
| parent | 443cd68a4c37cc8e3a3260feff25791bd5ebabf4 (diff) | |
| download | pleroma-99f50bf3e8d3077216eecd101f16c31f46fdbf42.tar.gz | |
Merge branch 'fix/mrf-tag-typo' into 'develop'
Fix MRF "tag" typo
See merge request pleroma/pleroma!1167
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/tag_policy.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex index 2f105700b..50426e920 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -55,7 +55,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do object = if Enum.member?(Pleroma.Config.get([:mrf_simple, :media_nsfw]), actor_host) do tags = (child_object["tag"] || []) ++ ["nsfw"] - child_object = Map.put(child_object, "tags", tags) + child_object = Map.put(child_object, "tag", tags) child_object = Map.put(child_object, "sensitive", true) Map.put(object, "object", child_object) else diff --git a/lib/pleroma/web/activity_pub/mrf/tag_policy.ex b/lib/pleroma/web/activity_pub/mrf/tag_policy.ex index b52be30e7..6683b8d8e 100644 --- a/lib/pleroma/web/activity_pub/mrf/tag_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/tag_policy.ex @@ -31,7 +31,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do object = object - |> Map.put("tags", tags) + |> Map.put("tag", tags) |> Map.put("sensitive", true) message = Map.put(message, "object", object) |