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 'nondiscoverable-user-metadata'
[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 e4760f53eb63ce730ff2f4b1e91f52f4e701722b..27c9a2e0f77a0022019e21caa4b224ca9e81b6ae 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
@@
-17,7
+17,6
@@
defmodule Pleroma.Web.PleromaAPI.ChatController do
alias Pleroma.Web.PleromaAPI.ChatView
import Ecto.Query
alias Pleroma.Web.PleromaAPI.ChatView
import Ecto.Query
- import Pleroma.Web.ActivityPub.ObjectValidator, only: [stringify_keys: 1]
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
@@
-90,11
+89,11
@@
defmodule Pleroma.Web.PleromaAPI.ChatController do
cm_ref <- MessageReference.for_chat_and_object(chat, message) do
conn
|> put_view(MessageReferenceView)
cm_ref <- MessageReference.for_chat_and_object(chat, message) do
conn
|> put_view(MessageReferenceView)
- |> render("show.json",
for: user,
chat_message_reference: cm_ref)
+ |> render("show.json", chat_message_reference: cm_ref)
end
end
end
end
- def mark_message_as_read(%{assigns: %{user: %{id: user_id}
= user
}} = conn, %{
+ def mark_message_as_read(%{assigns: %{user: %{id: user_id}}} = conn, %{
id: chat_id,
message_id: message_id
}) do
id: chat_id,
message_id: message_id
}) do
@@
-105,12
+104,15
@@
defmodule Pleroma.Web.PleromaAPI.ChatController do
{:ok, cm_ref} <- MessageReference.mark_as_read(cm_ref) do
conn
|> put_view(MessageReferenceView)
{:ok, cm_ref} <- MessageReference.mark_as_read(cm_ref) do
conn
|> put_view(MessageReferenceView)
- |> render("show.json",
for: user,
chat_message_reference: cm_ref)
+ |> render("show.json", chat_message_reference: cm_ref)
end
end
def mark_as_read(
end
end
def mark_as_read(
- %{body_params: %{last_read_id: last_read_id}, assigns: %{user: %{id: user_id}}} = conn,
+ %{
+ body_params: %{last_read_id: last_read_id},
+ assigns: %{user: %{id: user_id}}
+ } = conn,
%{id: id}
) do
with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id),
%{id: id}
) do
with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id),
@@
-122,16
+124,16
@@
defmodule Pleroma.Web.PleromaAPI.ChatController do
end
end
end
end
- def messages(%{assigns: %{user: %{id: user_id}
= user
}} = conn, %{id: id} = params) do
+ def messages(%{assigns: %{user: %{id: user_id}}} = conn, %{id: id} = params) do
with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id) do
cm_refs =
chat
|> MessageReference.for_chat_query()
with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id) do
cm_refs =
chat
|> MessageReference.for_chat_query()
- |> Pagination.fetch_paginated(params
|> stringify_keys()
)
+ |> Pagination.fetch_paginated(params)
conn
|> put_view(MessageReferenceView)
conn
|> put_view(MessageReferenceView)
- |> render("index.json",
for: user,
chat_message_references: cm_refs)
+ |> render("index.json", chat_message_references: cm_refs)
else
_ ->
conn
else
_ ->
conn
@@
-144,11
+146,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