projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
chat_controller.ex
diff --git
a/lib/pleroma/web/admin_api/controllers/chat_controller.ex
b/lib/pleroma/web/admin_api/controllers/chat_controller.ex
index 61d45b970cd5c6629d43932125a8481d1a428626..ff20c8604360d2a33044df8e019da7b73958e6e3 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/chat_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/chat_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.AdminAPI.ChatController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ChatController do
@@
-10,10
+10,10
@@
defmodule Pleroma.Web.AdminAPI.ChatController do
alias Pleroma.Chat.MessageReference
alias Pleroma.ModerationLog
alias Pleroma.Pagination
alias Pleroma.Chat.MessageReference
alias Pleroma.ModerationLog
alias Pleroma.Pagination
- alias Pleroma.
Plugs.OAuthScopesPlug
+ alias Pleroma.
Web.AdminAPI
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView
- alias Pleroma.Web.Pl
eromaAPI.ChatView
+ alias Pleroma.Web.Pl
ugs.OAuthScopesPlug
require Logger
require Logger
@@
-21,12
+21,12
@@
defmodule Pleroma.Web.AdminAPI.ChatController do
plug(
OAuthScopesPlug,
plug(
OAuthScopesPlug,
- %{scopes: ["
read:chats"], admin: true
} when action in [:show, :messages]
+ %{scopes: ["
admin:read:chats"]
} when action in [:show, :messages]
)
plug(
OAuthScopesPlug,
)
plug(
OAuthScopesPlug,
- %{scopes: ["
write:chats"], admin: true
} when action in [:delete_message]
+ %{scopes: ["
admin:write:chats"]
} when action in [:delete_message]
)
action_fallback(Pleroma.Web.AdminAPI.FallbackController)
)
action_fallback(Pleroma.Web.AdminAPI.FallbackController)
@@
-78,7
+78,7
@@
defmodule Pleroma.Web.AdminAPI.ChatController do
def show(conn, %{id: id}) do
with %Chat{} = chat <- Chat.get_by_id(id) do
conn
def show(conn, %{id: id}) do
with %Chat{} = chat <- Chat.get_by_id(id) do
conn
- |> put_view(ChatView)
+ |> put_view(
AdminAPI.
ChatView)
|> render("show.json", chat: chat)
end
end
|> render("show.json", chat: chat)
end
end