projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/bulk-confirmation
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
chat_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
index 7b5f3daf9f975fe7d6d031727f9a2efdf0b62f80..e667831c59c1b9d604208b4478c1ad15cbbd0a13 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
@@
-87,6
+87,16
@@
defmodule Pleroma.Web.PleromaAPI.ChatController do
conn
|> put_view(MessageReferenceView)
|> render("show.json", chat_message_reference: cm_ref)
conn
|> put_view(MessageReferenceView)
|> render("show.json", chat_message_reference: cm_ref)
+ else
+ {:reject, message} ->
+ conn
+ |> put_status(:unprocessable_entity)
+ |> json(%{error: message})
+
+ {:error, message} ->
+ conn
+ |> put_status(:bad_request)
+ |> json(%{error: message})
end
end
end
end
@@
-134,11
+144,8
@@
defmodule Pleroma.Web.PleromaAPI.ChatController do
blocked_ap_ids = User.blocked_users_ap_ids(user)
chats =
blocked_ap_ids = User.blocked_users_ap_ids(user)
chats =
- from(c in Chat,
- where: c.user_id == ^user_id,
- where: c.recipient not in ^blocked_ap_ids,
- order_by: [desc: c.updated_at]
- )
+ Chat.for_user_query(user_id)
+ |> where([c], c.recipient not in ^blocked_ap_ids)
|> Repo.all()
conn
|> Repo.all()
conn