pleroma

commit: 1c05819c9b553e65ed3dcd62b098d820e1de0aea
parent 22050f9ec0854bde430b060f7fea8d16c288720a
Author: lain <lain@soykaf.club>
Date:   Thu, 27 Aug 2020 11:18:42 +0000

Merge branch '2081-deleted-user-chats' into 'develop'

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

Closes #2081

See merge request pleroma/pleroma!2926
Diffstat:
M
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
4
+++-
M
test/web/pleroma_api/controllers/chat_controller_test.exs
15
+++++++++++++++

2 files changed, 18 insertions(+), 1 deletion(-)
diff --git 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()
 
diff --git a/test/web/pleroma_api/controllers/chat_controller_test.exs b/test/web/pleroma_api/controllers/chat_controller_test.exs
@@ -267,6 +267,21 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
   describe "GET /api/v1/pleroma/chats" do
     setup do: oauth_access(["read:chats"])
 
+    test "it does not return chats with deleted users", %{conn: conn, user: user} do
+      recipient = insert(:user)
+      {:ok, _} = Chat.get_or_create(user.id, recipient.ap_id)
+
+      Pleroma.Repo.delete(recipient)
+      User.invalidate_cache(recipient)
+
+      result =
+        conn
+        |> get("/api/v1/pleroma/chats")
+        |> json_response_and_validate_schema(200)
+
+      assert length(result) == 0
+    end
+
     test "it does not return chats with users you blocked", %{conn: conn, user: user} do
       recipient = insert(:user)