hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'improve-move-notificaions-api' into 'develop'

Browse source 
Add `with_move` query param to the notifications API

See merge request pleroma/pleroma!2032
This commit is contained in:
rinpatch 2019-12-08 13:07:05 +00:00
commit 8404f8c8fb
7 changed files with 60 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/pleroma/notification.ex
View file

@ -77,6 +77,7 @@ defmodule Pleroma.Notification do
|> exclude_notification_muted(user, exclude_notification_muted_opts)
|> exclude_blocked(user, exclude_blocked_opts)
|> exclude_visibility(opts)
|> exclude_move(opts)
end
defp exclude_blocked(query, user, opts) do
@ -106,6 +107,14 @@ defmodule Pleroma.Notification do
|> where([n, a, o, tm], is_nil(tm.user_id))
end
defp exclude_move(query, %{with_move: true}) do
query
end
defp exclude_move(query, _opts) do
where(query, [n, a], fragment("?->>'type' != 'Move'", a.data))
end
@valid_visibilities ~w[direct unlisted public private]
defp exclude_visibility(query, %{exclude_visibilities: visibility})