diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-08-30 11:28:45 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-08-30 11:28:45 -0500 |
| commit | 3737f38432609bb971822f1383eedb77343d0615 (patch) | |
| tree | ab599a93694eb567937402b378f431ed521719b9 /lib/pleroma/web/pleroma_api/controllers/chat_controller.ex | |
| parent | 4ef210a587113313cd6887b7499832d0c0798f7f (diff) | |
| parent | 51844b1e420fdfbceed6fda85e4c2e0ad87a9b1e (diff) | |
| download | pleroma-3737f38432609bb971822f1383eedb77343d0615.tar.gz | |
Merge branch 'develop' into feld-2168-media-preview-proxy
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/chat_controller.ex')
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/chat_controller.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex index e8a1746d4..1f2e953f7 100644 --- a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex @@ -149,7 +149,9 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do from(c in Chat, where: c.user_id == ^user_id, where: c.recipient not in ^blocked_ap_ids, - order_by: [desc: c.updated_at] + order_by: [desc: c.updated_at], + inner_join: u in User, + on: u.ap_id == c.recipient ) |> Repo.all() |