projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
conversation_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex
index 3d007f3245136e31e604f530c2bbd0e647889774..df52b7566ea1b8d3dd5f6c36f45cf0d68bf3bc2a 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex
@@
-8,9
+8,9
@@
defmodule Pleroma.Web.PleromaAPI.ConversationController do
import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
alias Pleroma.Conversation.Participation
import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
alias Pleroma.Conversation.Participation
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.MastodonAPI.StatusView
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(:put_view, Pleroma.Web.MastodonAPI.ConversationView)
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(:put_view, Pleroma.Web.MastodonAPI.ConversationView)