logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: ddab8d45ec48be823846bae4cbe2d32f627e0e59
parent: b3b0855456a92351667a50c8ea77f328bded76ca
Author: lambda <pleromagit@rogerbraun.net>
Date:   Fri,  1 Feb 2019 09:33:50 +0000

Merge branch 'fix-rich-media-toggle' into 'develop'

Remove default value for rich media.

See merge request pleroma/pleroma!751

Diffstat:

Mlib/pleroma/web/rich_media/helpers.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex @@ -7,7 +7,7 @@ defmodule Pleroma.Web.RichMedia.Helpers do alias Pleroma.Web.RichMedia.Parser def fetch_data_for_activity(%Activity{} = activity) do - with true <- Pleroma.Config.get([:rich_media, :enabled], true), + with true <- Pleroma.Config.get([:rich_media, :enabled]), %Object{} = object <- Object.normalize(activity.data["object"]), {:ok, page_url} <- HTML.extract_first_external_url(object, object.data["content"]), {:ok, rich_media} <- Parser.parse(page_url) do