projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mastodon API: Fix thread mute detection
[akkoma]
/
lib
/
pleroma
/
web
/
metadata.ex
diff --git
a/lib/pleroma/web/metadata.ex
b/lib/pleroma/web/metadata.ex
index 8793fc265ec76dcfe1a78eed1752c5602c1870a4..8761260f2cd7398fd244f2b8397a160adfb60eb9 100644
(file)
--- a/
lib/pleroma/web/metadata.ex
+++ b/
lib/pleroma/web/metadata.ex
@@
-1,13
+1,12
@@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
# Pleroma: A lightweight social networking server
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.Metadata do
alias Phoenix.HTML
defmodule Pleroma.Web.Metadata do
alias Phoenix.HTML
- @providers Pleroma.Config.get([__MODULE__, :providers], [])
-
def build_tags(params) do
def build_tags(params) do
- Enum.reduce(
@providers
, "", fn parser, acc ->
+ Enum.reduce(
Pleroma.Config.get([__MODULE__, :providers], [])
, "", fn parser, acc ->
rendered_html =
params
|> parser.build_tags()
rendered_html =
params
|> parser.build_tags()
@@
-30,4
+29,12
@@
defmodule Pleroma.Web.Metadata do
raise ArgumentError, message: "make_tag invalid args"
end
end
raise ArgumentError, message: "make_tag invalid args"
end
end
+
+ def activity_nsfw?(%{data: %{"sensitive" => sensitive}}) do
+ Pleroma.Config.get([__MODULE__, :unfurl_nsfw], false) == false and sensitive
+ end
+
+ def activity_nsfw?(_) do
+ false
+ end
end
end