ChatController: Don't die if the recipient is gone.
This commit is contained in:
parent
22050f9ec0
commit
78939c1d16
2 changed files with 18 additions and 1 deletions
|
@ -149,7 +149,9 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
|
||||||
from(c in Chat,
|
from(c in Chat,
|
||||||
where: c.user_id == ^user_id,
|
where: c.user_id == ^user_id,
|
||||||
where: c.recipient not in ^blocked_ap_ids,
|
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()
|
|> Repo.all()
|
||||||
|
|
||||||
|
|
|
@ -267,6 +267,21 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
|
||||||
describe "GET /api/v1/pleroma/chats" do
|
describe "GET /api/v1/pleroma/chats" do
|
||||||
setup do: oauth_access(["read:chats"])
|
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
|
test "it does not return chats with users you blocked", %{conn: conn, user: user} do
|
||||||
recipient = insert(:user)
|
recipient = insert(:user)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue