ChatController: Don't die if the recipient is gone.

2020-08-27 12:13:18 +02:00 · 2020-08-27 12:13:18 +02:00 · 78939c1d16
commit 78939c1d16
parent 22050f9ec0
2 changed files with 18 additions and 1 deletions
--- 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()