Merge remote-tracking branch 'upstream/develop' into chat-moderation

This commit is contained in:
Alex Gleason 2020-09-11 14:13:38 -05:00
commit 9733c9d065
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
168 changed files with 2652 additions and 8013 deletions

View file

@ -76,9 +76,7 @@ defmodule Pleroma.Chat do
def for_user_query(user_id) do
from(c in Chat,
where: c.user_id == ^user_id,
order_by: [desc: c.updated_at],
inner_join: u in User,
on: u.ap_id == c.recipient
order_by: [desc: c.updated_at]
)
end
end