diff options
| author | feld <feld@feld.me> | 2020-10-06 20:19:39 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-06 20:19:39 +0000 |
| commit | f9ece1a7f65dc13a867c40ccf08f8973e822e6f2 (patch) | |
| tree | cb627ee53fc7726018bc2a1afec211195bfddd00 /lib | |
| parent | 2698bbc9f63d0bfd59de182d361db03d54aa2a68 (diff) | |
| parent | 21a73ce9f2c577c046e1cd17ef1a2b6636d01585 (diff) | |
| download | pleroma-f9ece1a7f65dc13a867c40ccf08f8973e822e6f2.tar.gz | |
Merge branch 'revert/rich-media-censorship' into 'develop'
#2192 Revert Rich Media censorship for sensitive statuses
See merge request pleroma/pleroma!3044
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/rich_media/helpers.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex index d7a19df4a..d67b594b5 100644 --- a/lib/pleroma/web/rich_media/helpers.ex +++ b/lib/pleroma/web/rich_media/helpers.ex @@ -57,7 +57,6 @@ defmodule Pleroma.Web.RichMedia.Helpers do def fetch_data_for_object(object) do with true <- Config.get([:rich_media, :enabled]), - false <- object.data["sensitive"] || false, {:ok, page_url} <- HTML.extract_first_external_url_from_object(object), :ok <- validate_page_url(page_url), |