projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Update elixir versions' (#512) from norm/akkoma:update-elixir...
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
emoji_pack_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
index d2e869e6e922114bb432b305e944561d985c060e..1ea44f347fb0de562e1b840d32ba234f064803a1 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
@@
-11,7
+11,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
plug(
Pleroma.Web.Plugs.OAuthScopesPlug,
plug(
Pleroma.Web.Plugs.OAuthScopesPlug,
- %{scopes: ["
write"], admin: true
}
+ %{scopes: ["
admin:write"]
}
when action in [
:import_from_filesystem,
:remote,
when action in [
:import_from_filesystem,
:remote,
@@
-22,11
+22,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
]
)
]
)
- @skip_plugs [
- Pleroma.Web.Plugs.OAuthScopesPlug,
- Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
- ]
- plug(:skip_plug, @skip_plugs when action in [:index, :archive, :show])
+ plug(:skip_auth when action in [:index, :archive, :show])
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.PleromaEmojiPackOperation
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.PleromaEmojiPackOperation
@@
-180,7
+176,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
|> json(%{error: "pack name cannot be empty"})
{:error, error, _} ->
|> json(%{error: "pack name cannot be empty"})
{:error, error, _} ->
- error_message = add_posix_error("Couldn't delete the
#{name}
pack", error)
+ error_message = add_posix_error("Couldn't delete the
`#{name}`
pack", error)
conn
|> put_status(:internal_server_error)
conn
|> put_status(:internal_server_error)