projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge branch 'streamer-refactoring' into 'develop'"
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
pleroma_api_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
index f4df3b024e1004ddd77026b42539f505a46c7ef5..d17ccf84d0778ff5de3972f365a8a5df12e12f76 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
@@
-5,7
+5,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
use Pleroma.Web, :controller
- import Pleroma.Web.ControllerHelper, only: [add_link_headers:
7
]
+ import Pleroma.Web.ControllerHelper, only: [add_link_headers:
2
]
alias Pleroma.Conversation.Participation
alias Pleroma.Notification
alias Pleroma.Conversation.Participation
alias Pleroma.Notification
@@
-27,31
+27,22
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
%{assigns: %{user: user}} = conn,
%{"id" => participation_id} = params
) do
%{assigns: %{user: user}} = conn,
%{"id" => participation_id} = params
) do
- params =
- params
- |> Map.put("blocking_user", user)
- |> Map.put("muting_user", user)
- |> Map.put("user", user)
-
- participation =
- participation_id
- |> Participation.get(preload: [:conversation])
+ participation = Participation.get(participation_id, preload: [:conversation])
if user.id == participation.user_id do
if user.id == participation.user_id do
+ params =
+ params
+ |> Map.put("blocking_user", user)
+ |> Map.put("muting_user", user)
+ |> Map.put("user", user)
+
activities =
participation.conversation.ap_id
|> ActivityPub.fetch_activities_for_context(params)
|> Enum.reverse()
conn
activities =
participation.conversation.ap_id
|> ActivityPub.fetch_activities_for_context(params)
|> Enum.reverse()
conn
- |> add_link_headers(
- :conversation_statuses,
- activities,
- participation_id,
- params,
- nil,
- &pleroma_api_url/4
- )
+ |> add_link_headers(activities)
|> put_view(StatusView)
|> render("index.json", %{activities: activities, for: user, as: :activity})
end
|> put_view(StatusView)
|> render("index.json", %{activities: activities, for: user, as: :activity})
end