diff options
| author | lain <lain@soykaf.club> | 2020-08-27 15:38:03 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-27 15:38:03 +0200 |
| commit | 82bf27172c4aae19e22c8d976da547035ca7feb0 (patch) | |
| tree | 6413daca646cbb54b23a34864c243a45638fc960 /lib | |
| parent | 5dba3a50fcdb673473315ec9e425e1cf5ad52c3e (diff) | |
| parent | 1c05819c9b553e65ed3dcd62b098d820e1de0aea (diff) | |
| download | pleroma-82bf27172c4aae19e22c8d976da547035ca7feb0.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
Diffstat (limited to 'lib')
| -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() |