projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
notification_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/notification_view.ex
b/lib/pleroma/web/mastodon_api/views/notification_view.ex
index 0349bcc839cc88ced670baac868124c21e321c0e..c46ddcf5578f456b30c18cdce99ff3a9b0baccd0 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/notification_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/notification_view.ex
@@
-51,7
+51,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationView do
|> Enum.filter(& &1)
|> Kernel.++(move_activities_targets)
|> Enum.filter(& &1)
|> Kernel.++(move_activities_targets)
- UserRelationship.view_relationships_option(reading_user, actors, s
ource_mutes_only: true
)
+ UserRelationship.view_relationships_option(reading_user, actors, s
ubset: :source_mutes
)
end
opts =
end
opts =
@@
-84,12
+84,10
@@
defmodule Pleroma.Web.MastodonAPI.NotificationView do
# Note: :relationships contain user mutes (needed for :muted flag in :status)
status_render_opts = %{relationships: opts[:relationships]}
# Note: :relationships contain user mutes (needed for :muted flag in :status)
status_render_opts = %{relationships: opts[:relationships]}
- account_render_opts = %{skip_relationships: true}
-
with %{id: _} = account <-
AccountView.render(
"show.json",
with %{id: _} = account <-
AccountView.render(
"show.json",
- Map.merge(account_render_opts, %{user: actor, for: reading_user})
+ %{user: actor, for: reading_user}
) do
response = %{
id: to_string(notification.id),
) do
response = %{
id: to_string(notification.id),
@@
-112,7
+110,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationView do
put_status(response, parent_activity_fn.(), reading_user, status_render_opts)
"move" ->
put_status(response, parent_activity_fn.(), reading_user, status_render_opts)
"move" ->
- put_target(response, activity, reading_user,
account_render_opts
)
+ put_target(response, activity, reading_user,
%{}
)
"pleroma:emoji_reaction" ->
response
"pleroma:emoji_reaction" ->
response