Merge remote-tracking branch 'upstream/develop' into email-fix-develop

[akkoma] / lib / pleroma / chat.ex

diff --git a/lib/pleroma/chat.ex b/lib/pleroma/chat.ex
index b38c5c3ddfe92801abcab51042a68e66d9b1e6e8..84f8806a084c1ad957bc477af6d6b3ac8c88fd7f 100644 (file)
--- a/lib/pleroma/chat.ex
+++ b/lib/pleroma/chat.ex
@@ -76,9 +76,7 @@ defmodule Pleroma.Chat do
   def for_user_query(user_id) do
     from(c in Chat,
       where: c.user_id == ^user_id,
-      order_by: [desc: c.updated_at],
-      inner_join: u in User,
-      on: u.ap_id == c.recipient
+      order_by: [desc: c.updated_at]
     )
   end
 end