From e7fee0d6fa7b2ba046e57ca9364be1b62bfc9661 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Wed, 29 Jan 2020 13:51:17 +0300
Subject: [PATCH 1/2] emoji api error on not writable dir

---
 .../pleroma_api/controllers/emoji_api_controller.ex  | 12 ++++++++++--
 .../controllers/emoji_api_controller_test.exs        |  1 -
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
index 0bbf84fd3..42f62d97a 100644
--- a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
@@ -573,11 +573,14 @@ def update_file(conn, %{"action" => action}) do
   assumed to be emojis and stored in the new `pack.json` file.
   """
   def import_from_fs(conn, _params) do
-    with {:ok, results} <- File.ls(emoji_dir_path()) do
+    emoji_path = emoji_dir_path()
+
+    with {:ok, %{access: :read_write}} <- File.stat(emoji_path),
+         {:ok, results} <- File.ls(emoji_path) do
       imported_pack_names =
         results
         |> Enum.filter(fn file ->
-          dir_path = Path.join(emoji_dir_path(), file)
+          dir_path = Path.join(emoji_path, file)
           # Find the directories that do NOT have pack.json
           File.dir?(dir_path) and not File.exists?(Path.join(dir_path, "pack.json"))
         end)
@@ -585,6 +588,11 @@ def import_from_fs(conn, _params) do
 
       json(conn, imported_pack_names)
     else
+      {:ok, %{access: _}} ->
+        conn
+        |> put_status(:internal_server_error)
+        |> json(%{error: "Error emoji pack directory must be writable and readable"})
+
       {:error, _} ->
         conn
         |> put_status(:internal_server_error)
diff --git a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
index 8e76f2f3d..6f1ea78ec 100644
--- a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
@@ -6,7 +6,6 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
   use Pleroma.Web.ConnCase
 
   import Tesla.Mock
-
   import Pleroma.Factory
 
   @emoji_dir_path Path.join(

From b3e9c8772445bfdfe4ec72378fb76c4cf76dc2da Mon Sep 17 00:00:00 2001
From: feld <feld@feld.me>
Date: Thu, 30 Jan 2020 14:09:41 +0000
Subject: [PATCH 2/2] Update emoji_api_controller.ex

---
 lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
index 42f62d97a..a2f6d2287 100644
--- a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
@@ -591,7 +591,7 @@ def import_from_fs(conn, _params) do
       {:ok, %{access: _}} ->
         conn
         |> put_status(:internal_server_error)
-        |> json(%{error: "Error emoji pack directory must be writable and readable"})
+        |> json(%{error: "Error: emoji pack directory must be writable"})
 
       {:error, _} ->
         conn