Merge remote-tracking branch 'pleroma/develop' into cycles-email

[akkoma] / lib / pleroma / web / activity_pub / mrf / steal_emoji_policy.ex

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 0311ca43393a51647d37b5a4f626094f17e77a53..4c5e33619da38f5471954da5dbf9094e4041185d 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
@@ -65,9 +65,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do
           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
+      File.mkdir_p(emoji_dir_path)
 
       new_emojis =
         foreign_emojis
@@ -98,12 +96,4 @@ 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