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

Merge develop

Browse source
This commit is contained in:
Roman Chvanikov 2019-07-16 16:19:19 +03:00
commit 9bca70b10a
51 changed files with 1157 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/notification.ex
View file

@ -67,7 +67,7 @@ defmodule Pleroma.Notification do
|> join(:left, [n, a], tm in Pleroma.ThreadMute,
on: tm.user_id == ^user.id and tm.context == fragment("?->>'context'", a.data)
)
|> where([n, a, o, tm], is_nil(tm.id))
|> where([n, a, o, tm], is_nil(tm.user_id))
end
end