projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'open-api' 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 a809080fd17f8f74c8d97f8ed65393becef55154..ae87d47016cd031dab3fd73d7fc36d9058dcc38b 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/notification_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/notification_view.ex
@@
-36,7
+36,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationView do
Map.has_key?(opts, :relationships) ->
opts[:relationships]
Map.has_key?(opts, :relationships) ->
opts[:relationships]
- is_nil(
opts[:for]
) ->
+ is_nil(
reading_user
) ->
UserRelationship.view_relationships_option(nil, [])
true ->
UserRelationship.view_relationships_option(nil, [])
true ->
@@
-98,27
+98,27
@@
defmodule Pleroma.Web.MastodonAPI.NotificationView do
}
}
}
}
- re
lationships_opt
= %{relationships: opts[:relationships]}
+ re
nder_opts
= %{relationships: opts[:relationships]}
case mastodon_type do
"mention" ->
case mastodon_type do
"mention" ->
- put_status(response, activity, reading_user, re
lationships_opt
)
+ put_status(response, activity, reading_user, re
nder_opts
)
"favourite" ->
"favourite" ->
- put_status(response, parent_activity_fn.(), reading_user, re
lationships_opt
)
+ put_status(response, parent_activity_fn.(), reading_user, re
nder_opts
)
"reblog" ->
"reblog" ->
- put_status(response, parent_activity_fn.(), reading_user, re
lationships_opt
)
+ put_status(response, parent_activity_fn.(), reading_user, re
nder_opts
)
"move" ->
"move" ->
- put_target(response, activity, reading_user, re
lationships_opt
)
+ put_target(response, activity, reading_user, re
nder_opts
)
"follow" ->
response
"pleroma:emoji_reaction" ->
response
"follow" ->
response
"pleroma:emoji_reaction" ->
response
- |> put_status(parent_activity_fn.(), reading_user, re
lationships_opt
)
+ |> put_status(parent_activity_fn.(), reading_user, re
nder_opts
)
|> put_emoji(activity)
_ ->
|> put_emoji(activity)
_ ->