Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

RichMedia: Add extra checks on configuration

Browse Source
This commit is contained in:
Haelwenn (lanodan) Monnier 2024-05-29 08:00:19 +02:00
parent c16ef40f13
commit 65c8763907
No known key found for this signature in database
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/rich_media/card.ex
View File

@ -77,6 +77,7 @@ defmodule Pleroma.Web.RichMedia.Card do
@spec get_or_backfill_by_url(String.t(), map()) :: t() | nil @spec get_or_backfill_by_url(String.t(), map()) :: t() | nil
def get_or_backfill_by_url(url, backfill_opts \\ %{}) do def get_or_backfill_by_url(url, backfill_opts \\ %{}) do
if @config_impl.get([:rich_media, :enabled]) do
case get_by_url(url) do case get_by_url(url) do
%__MODULE__{} = card -> %__MODULE__{} = card ->
card card
@ -91,6 +92,9 @@ defmodule Pleroma.Web.RichMedia.Card do
:error -> :error ->
nil nil
end end
else
nil
end
end end
@spec get_by_object(Object.t()) :: t() | nil | :error @spec get_by_object(Object.t()) :: t() | nil | :error

6
lib/pleroma/web/rich_media/parser.ex
View File

@ -15,10 +15,14 @@ defmodule Pleroma.Web.RichMedia.Parser do
@spec parse(String.t()) :: {:ok, map()} | {:error, any()} @spec parse(String.t()) :: {:ok, map()} | {:error, any()}
def parse(url) do def parse(url) do
with :ok <- validate_page_url(url), with {_, true} <- {:config, @config_impl.get([:rich_media, :enabled])},
:ok <- validate_page_url(url),
{:ok, data} <- parse_url(url) do {:ok, data} <- parse_url(url) do
data = Map.put(data, "url", url) data = Map.put(data, "url", url)
{:ok, data} {:ok, data}
else
{:config, _} -> {:error, :rich_media_disabled}
e -> e
end end
end end