projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/remove_auto_nsfw' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
transmogrifier.ex
diff --git
a/lib/pleroma/web/activity_pub/transmogrifier.ex
b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 0a701334f00d08f7f57e2a8ac963e2e526414c2e..8c7d6a7478c28ada25aeb7baf55b9fed5c9d2471 100644
(file)
--- a/
lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/
lib/pleroma/web/activity_pub/transmogrifier.ex
@@
-40,7
+40,6
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
|> fix_in_reply_to(options)
|> fix_emoji()
|> fix_tag()
|> fix_in_reply_to(options)
|> fix_emoji()
|> fix_tag()
- |> set_sensitive()
|> fix_content_map()
|> fix_addressing()
|> fix_summary()
|> fix_content_map()
|> fix_addressing()
|> fix_summary()
@@
-741,7
+740,6
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
# Prepares the object of an outgoing create activity.
def prepare_object(object) do
object
# Prepares the object of an outgoing create activity.
def prepare_object(object) do
object
- |> set_sensitive
|> add_hashtags
|> add_mention_tags
|> add_emoji_tags
|> add_hashtags
|> add_mention_tags
|> add_emoji_tags
@@
-932,15
+930,6
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
Map.put(object, "conversation", object["context"])
end
Map.put(object, "conversation", object["context"])
end
- def set_sensitive(%{"sensitive" => _} = object) do
- object
- end
-
- def set_sensitive(object) do
- tags = object["tag"] || []
- Map.put(object, "sensitive", "nsfw" in tags)
- end
-
def set_type(%{"type" => "Answer"} = object) do
Map.put(object, "type", "Note")
end
def set_type(%{"type" => "Answer"} = object) do
Map.put(object, "type", "Note")
end