diff options
| author | lain <lain@soykaf.club> | 2020-05-06 09:04:13 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-06 09:04:13 +0000 |
| commit | df846eda71a90e7764353f0557b43bbbee42a640 (patch) | |
| tree | 9a6256075a25deea570bd9487bd27027558c7284 /lib | |
| parent | c3f1ce80ebc6caf85b2f874c31d6b98fd0ef5876 (diff) | |
| parent | bf0e41f0daa5809db53ed4a9130ade63952e8da0 (diff) | |
| download | pleroma-df846eda71a90e7764353f0557b43bbbee42a640.tar.gz | |
Merge branch 'bugfix/sensitive_object' into 'develop'
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 4 |
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 581e7040b..3a4d364e7 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -1195,6 +1195,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do Map.put(object, "conversation", object["context"]) end + def set_sensitive(%{"sensitive" => true} = object) do + object + end + def set_sensitive(object) do tags = object["tag"] || [] Map.put(object, "sensitive", "nsfw" in tags) |