projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
conversation_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/conversation_view.ex
b/lib/pleroma/web/mastodon_api/views/conversation_view.ex
index 4aeb79d81dc313ea0c49743622ef10f044d2d7c9..2b6f84c72bbea703236178cb8c78f2f93eb13c05 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/conversation_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/conversation_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ConversationView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ConversationView do
@@
-11,6
+11,13
@@
defmodule Pleroma.Web.MastodonAPI.ConversationView do
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView
+ def render("participations.json", %{participations: participations, for: user}) do
+ safe_render_many(participations, __MODULE__, "participation.json", %{
+ as: :participation,
+ for: user
+ })
+ end
+
def render("participation.json", %{participation: participation, for: user}) do
participation = Repo.preload(participation, conversation: [], recipients: [])
def render("participation.json", %{participation: participation, for: user}) do
participation = Repo.preload(participation, conversation: [], recipients: [])
@@
-23,25
+30,18
@@
defmodule Pleroma.Web.MastodonAPI.ConversationView do
end
activity = Activity.get_by_id_with_object(last_activity_id)
end
activity = Activity.get_by_id_with_object(last_activity_id)
-
- last_status = StatusView.render("show.json", %{activity: activity, for: user})
-
# Conversations return all users except the current user.
# Conversations return all users except the current user.
- users =
- participation.recipients
- |> Enum.reject(&(&1.id == user.id))
-
- accounts =
- AccountView.render("accounts.json", %{
- users: users,
- as: :user
- })
+ users = Enum.reject(participation.recipients, &(&1.id == user.id))
%{
id: participation.id |> to_string(),
%{
id: participation.id |> to_string(),
- accounts:
accounts
,
+ accounts:
render(AccountView, "index.json", users: users, as: :user)
,
unread: !participation.read,
unread: !participation.read,
- last_status: last_status
+ last_status:
+ render(StatusView, "show.json",
+ activity: activity,
+ direct_conversation_id: participation.id
+ )
}
end
end
}
end
end