alias Pleroma.Activity
alias Pleroma.Chat
- alias Pleroma.ChatMessageReference
+ alias Pleroma.Chat.MessageReference
alias Pleroma.Object
alias Pleroma.Pagination
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.CommonAPI
- alias Pleroma.Web.PleromaAPI.ChatMessageReferenceView
+ alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView
alias Pleroma.Web.PleromaAPI.ChatView
import Ecto.Query
- import Pleroma.Web.ActivityPub.ObjectValidator, only: [stringify_keys: 1]
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
plug(
OAuthScopesPlug,
- %{scopes: ["write:statuses"]}
- when action in [:post_chat_message, :create, :mark_as_read, :delete_message]
+ %{scopes: ["write:chats"]}
+ when action in [
+ :post_chat_message,
+ :create,
+ :mark_as_read,
+ :mark_message_as_read,
+ :delete_message
+ ]
)
plug(
OAuthScopesPlug,
- %{scopes: ["read:statuses"]} when action in [:messages, :index, :show]
+ %{scopes: ["read:chats"]} when action in [:messages, :index, :show]
)
plug(OpenApiSpex.Plug.CastAndValidate, render_error: Pleroma.Web.ApiSpec.RenderError)
message_id: message_id,
id: chat_id
}) do
- with %ChatMessageReference{} = cm_ref <-
- ChatMessageReference.get_by_id(message_id),
+ with %MessageReference{} = cm_ref <-
+ MessageReference.get_by_id(message_id),
^chat_id <- cm_ref.chat_id |> to_string(),
%Chat{user_id: ^user_id} <- Chat.get_by_id(chat_id),
{:ok, _} <- remove_or_delete(cm_ref, user) do
conn
- |> put_view(ChatMessageReferenceView)
+ |> put_view(MessageReferenceView)
|> render("show.json", chat_message_reference: cm_ref)
else
_e ->
defp remove_or_delete(cm_ref, _) do
cm_ref
- |> ChatMessageReference.delete()
+ |> MessageReference.delete()
end
def post_chat_message(
media_id: params[:media_id]
),
message <- Object.normalize(activity, false),
- cm_ref <- ChatMessageReference.for_chat_and_object(chat, message) do
+ cm_ref <- MessageReference.for_chat_and_object(chat, message) do
conn
- |> put_view(ChatMessageReferenceView)
- |> render("show.json", for: user, chat_message_reference: cm_ref)
+ |> put_view(MessageReferenceView)
+ |> render("show.json", chat_message_reference: cm_ref)
end
end
- def mark_as_read(%{assigns: %{user: %{id: user_id}}} = conn, %{id: id}) do
+ def mark_message_as_read(%{assigns: %{user: %{id: user_id}}} = conn, %{
+ id: chat_id,
+ message_id: message_id
+ }) do
+ with %MessageReference{} = cm_ref <-
+ MessageReference.get_by_id(message_id),
+ ^chat_id <- cm_ref.chat_id |> to_string(),
+ %Chat{user_id: ^user_id} <- Chat.get_by_id(chat_id),
+ {:ok, cm_ref} <- MessageReference.mark_as_read(cm_ref) do
+ conn
+ |> put_view(MessageReferenceView)
+ |> render("show.json", chat_message_reference: cm_ref)
+ end
+ end
+
+ def mark_as_read(
+ %{
+ 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),
- {:ok, chat} <- Chat.mark_as_read(chat) do
+ {_n, _} <-
+ MessageReference.set_all_seen_for_chat(chat, last_read_id) do
conn
|> put_view(ChatView)
|> render("show.json", chat: chat)
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
- |> ChatMessageReference.for_chat_query()
- |> Pagination.fetch_paginated(params |> stringify_keys())
+ |> MessageReference.for_chat_query()
+ |> Pagination.fetch_paginated(params)
conn
- |> put_view(ChatMessageReferenceView)
- |> render("index.json", for: user, chat_message_references: cm_refs)
+ |> put_view(MessageReferenceView)
+ |> render("index.json", chat_message_references: cm_refs)
else
_ ->
conn
end
end
- def index(%{assigns: %{user: %{id: user_id} = user}} = conn, params) do
+ def index(%{assigns: %{user: %{id: user_id} = user}} = conn, _params) do
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]
+ order_by: [desc: c.updated_at],
+ inner_join: u in User,
+ on: u.ap_id == c.recipient
)
- |> Pagination.fetch_paginated(params |> stringify_keys)
+ |> Repo.all()
conn
|> put_view(ChatView)