Browse Source

Merge branch 'emoji-api-errors' into 'develop'

Emoji api error if emoji dir is not writable

Closes admin-fe#62

See merge request pleroma/pleroma!2161
thumbnail-proxy
feld 4 years ago
parent
commit
e2f2602fdc
2 changed files with 10 additions and 3 deletions
  1. +10
    -2
      lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
  2. +0
    -1
      test/web/pleroma_api/controllers/emoji_api_controller_test.exs

+ 10
- 2
lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex View File

@@ -573,11 +573,14 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
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 @@ keeping it in cache for #{div(cache_ms, 1000)}s")

json(conn, imported_pack_names)
else
{:ok, %{access: _}} ->
conn
|> put_status(:internal_server_error)
|> json(%{error: "Error: emoji pack directory must be writable"})

{:error, _} ->
conn
|> put_status(:internal_server_error)


+ 0
- 1
test/web/pleroma_api/controllers/emoji_api_controller_test.exs View File

@@ -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(


Loading…
Cancel
Save