diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2024-05-29 07:59:02 +0200 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2024-05-29 08:02:04 +0200 |
| commit | c16ef40f134e69ad509a52dd3470672ca297f084 (patch) | |
| tree | 86dc738dbb491eca74f1ef6a59f894cdaf77c6f2 | |
| parent | 05b9805bf98ddfc6a0ecf72b778182eb7af169e2 (diff) | |
| download | pleroma-c16ef40f134e69ad509a52dd3470672ca297f084.tar.gz pleroma-c16ef40f134e69ad509a52dd3470672ca297f084.zip | |
RichMedia: Respect configuration on status previews
| -rw-r--r-- | changelog.d/rich_media_config.skip | 0 | ||||
| -rw-r--r-- | lib/pleroma/web/rich_media/card.ex | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/rich_media_config.skip b/changelog.d/rich_media_config.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/rich_media_config.skip diff --git a/lib/pleroma/web/rich_media/card.ex b/lib/pleroma/web/rich_media/card.ex index 36a1ae44a..f49bb2fee 100644 --- a/lib/pleroma/web/rich_media/card.ex +++ b/lib/pleroma/web/rich_media/card.ex @@ -104,7 +104,8 @@ defmodule Pleroma.Web.RichMedia.Card do @spec get_by_activity(Activity.t()) :: t() | nil | :error # Fake/Draft activity def get_by_activity(%Activity{id: "pleroma:fakeid"} = activity) do - with %Object{} = object <- Object.normalize(activity, fetch: false), + with {_, true} <- {:config, @config_impl.get([:rich_media, :enabled])}, + %Object{} = object <- Object.normalize(activity, fetch: false), url when not is_nil(url) <- HTML.extract_first_external_url_from_object(object) do case get_by_url(url) do # Cache hit |