From 8d064eb451f13b2cdb444fcdbdff6057a8022ac2 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 14 Feb 2020 21:51:57 +0100 Subject: rich_media/helpers.ex: Add config to disable fetching from remote activities --- lib/pleroma/web/rich_media/helpers.ex | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex index 6506de46c..96c9686bc 100644 --- a/lib/pleroma/web/rich_media/helpers.ex +++ b/lib/pleroma/web/rich_media/helpers.ex @@ -49,8 +49,17 @@ defmodule Pleroma.Web.RichMedia.Helpers do |> hd end + # Comparison with true/false done to handle :local_only + defp can_fetch?(%Activity{local: true}) do + Config.get([:rich_media, :enabled]) != false + end + + defp can_fetch?(_activity) do + Config.get([:rich_media, :enabled]) == true + end + def fetch_data_for_activity(%Activity{data: %{"type" => "Create"}} = activity) do - with true <- Config.get([:rich_media, :enabled]), + with true <- can_fetch?(activity), %Object{} = object <- Object.normalize(activity), false <- object.data["sensitive"] || false, {:ok, page_url} <- HTML.extract_first_external_url(object, object.data["content"]), -- cgit v1.2.3