diff options
author | lain <lain@soykaf.club> | 2020-08-31 16:48:17 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-31 16:48:17 +0200 |
commit | 0b621a834acf751332f4d202bd50d4ff3e789176 (patch) | |
tree | 89fc93191f49d92050102935bf8aad1a7aacfa90 /lib | |
parent | 0417b2f649172ea300c124159aa86b964e404a0c (diff) | |
download | pleroma-0b621a834acf751332f4d202bd50d4ff3e789176.tar.gz |
Chats: Add cascading delete on both referenced users.
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/chat_controller.ex | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex index 1f2e953f7..e8a1746d4 100644 --- a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex @@ -149,9 +149,7 @@ 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], - inner_join: u in User, - on: u.ap_id == c.recipient + order_by: [desc: c.updated_at] ) |> Repo.all() |