check dir existence in policy

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index e3edd05ca1b1744c6039ba4e1f346247a0768780..bd568d8580c75539cc88354823cccbfcdc93b3b9 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -114,9 +114,6 @@ defmodule Pleroma.Application do
 
     set_postgres_server_version()
 
-    # Requires Config.TransferTask so ConfigDB values are loaded
-    steal_emoji_policy_setup()
-
     result
   end
 
@@ -303,20 +300,4 @@ defmodule Pleroma.Application do
     [Pleroma.Web.RichMedia.Helpers, Pleroma.Web.MediaProxy]
     |> Enum.each(&ConcurrentLimiter.new(&1, 1, 0))
   end
-
-  @spec steal_emoji_policy_setup() :: :ok
-  defp steal_emoji_policy_setup() do
-    with true <-
-           Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy in Config.get!([:mrf, :policies]) do
-      path =
-        [:instance, :static_dir]
-        |> Config.get!()
-        |> Path.join("emoji/steal")
-
-      if !File.exists?(path), do: File.mkdir_p!(path)
-    else
-      _ ->
-        :ok
-    end
-  end
 end

diff --git a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
index 2858af9eb29be4a1e27aa3b3f201680a39ee822b..eabee654209d53f052fc7ec85c8144c3f64e63d7 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
@@ -14,18 +14,12 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
 
   defp accept_host?(host), do: host in Config.get([:mrf_steal_emoji, :hosts], [])
 
-  defp steal_emoji({shortcode, url}) do
+  defp steal_emoji({shortcode, url}, emoji_dir_path) do
     url = Pleroma.Web.MediaProxy.url(url)
     {:ok, response} = Pleroma.HTTP.get(url)
     size_limit = Config.get([:mrf_steal_emoji, :size_limit], 50_000)
 
     if byte_size(response.body) <= size_limit do
-      emoji_dir_path =
-        Config.get(
-          [:mrf_steal_emoji, :path],
-          Path.join(Config.get([:instance, :static_dir]), "emoji/stolen")
-        )
-
       extension =
         url
         |> URI.parse()
@@ -35,11 +29,9 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
 
       file_path = Path.join([emoji_dir_path, shortcode <> (extension || ".png")])
 
-      try do
-        :ok = File.write(file_path, response.body)
-
+      with :ok <- File.write(file_path, response.body) do
         shortcode
-      rescue
+      else
         e ->
           Logger.warn("MRF.StealEmojiPolicy: Failed to write to #{file_path}: #{inspect(e)}")
           nil
@@ -66,6 +58,16 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
     if remote_host?(host) and accept_host?(host) do
       installed_emoji = Pleroma.Emoji.get_all() |> Enum.map(fn {k, _} -> k end)
 
+      emoji_dir_path =
+        Config.get(
+          [:mrf_steal_emoji, :path],
+          Path.join(Config.get([:instance, :static_dir]), "emoji/stolen")
+        )
+
+      if not Config.get([:mrf_steal_emoji, :dir_exists?], false) do
+        create_dir(emoji_dir_path)
+      end
+
       new_emojis =
         foreign_emojis
         |> Enum.filter(fn {shortcode, _url} -> shortcode not in installed_emoji end)
@@ -76,7 +78,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
 
           !reject_emoji?
         end)
-        |> Enum.map(&steal_emoji(&1))
+        |> Enum.map(&steal_emoji(&1, emoji_dir_path))
         |> Enum.filter(& &1)
 
       if !Enum.empty?(new_emojis) do
@@ -94,4 +96,12 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
   def describe do
     {:ok, %{}}
   end
+
+  defp create_dir(path) do
+    if not File.exists?(path) do
+      File.mkdir_p!(path)
+    end
+
+    Config.put([:mrf_steal_emoji, :dir_exists?], true)
+  end
 end