ChatController: Add `last_read_id` option to mark_as_read.
This commit is contained in:
parent
2cdaac4330
commit
801e668a97
|
@ -98,12 +98,20 @@ def mark_as_read(cm_ref) do
|
||||||
|> Repo.update()
|
|> Repo.update()
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_all_seen_for_chat(chat) do
|
def set_all_seen_for_chat(chat, last_read_id \\ nil) do
|
||||||
chat
|
query =
|
||||||
|> for_chat_query()
|
chat
|
||||||
|> exclude(:order_by)
|
|> for_chat_query()
|
||||||
|> exclude(:preload)
|
|> exclude(:order_by)
|
||||||
|> where([cmr], cmr.unread == true)
|
|> exclude(:preload)
|
||||||
|
|> where([cmr], cmr.unread == true)
|
||||||
|
|
||||||
|
if last_read_id do
|
||||||
|
query
|
||||||
|
|> where([cmr], cmr.id <= ^last_read_id)
|
||||||
|
else
|
||||||
|
query
|
||||||
|
end
|
||||||
|> Repo.update_all(set: [unread: false])
|
|> Repo.update_all(set: [unread: false])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -23,6 +23,7 @@ def mark_as_read_operation do
|
||||||
summary: "Mark all messages in the chat as read",
|
summary: "Mark all messages in the chat as read",
|
||||||
operationId: "ChatController.mark_as_read",
|
operationId: "ChatController.mark_as_read",
|
||||||
parameters: [Operation.parameter(:id, :path, :string, "The ID of the Chat")],
|
parameters: [Operation.parameter(:id, :path, :string, "The ID of the Chat")],
|
||||||
|
requestBody: request_body("Parameters", mark_as_read()),
|
||||||
responses: %{
|
responses: %{
|
||||||
200 =>
|
200 =>
|
||||||
Operation.response(
|
Operation.response(
|
||||||
|
@ -333,4 +334,21 @@ def chat_message_create do
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def mark_as_read do
|
||||||
|
%Schema{
|
||||||
|
title: "MarkAsReadRequest",
|
||||||
|
description: "POST body for marking a number of chat messages as read",
|
||||||
|
type: :object,
|
||||||
|
properties: %{
|
||||||
|
last_read_id: %Schema{
|
||||||
|
type: :string,
|
||||||
|
description: "The content of your message. Optional."
|
||||||
|
}
|
||||||
|
},
|
||||||
|
example: %{
|
||||||
|
"last_read_id" => "abcdef12456"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -111,7 +111,8 @@ def mark_message_as_read(%{assigns: %{user: %{id: user_id} = user}} = conn, %{
|
||||||
|
|
||||||
def mark_as_read(%{assigns: %{user: %{id: user_id}}} = conn, %{id: id}) do
|
def mark_as_read(%{assigns: %{user: %{id: user_id}}} = conn, %{id: id}) do
|
||||||
with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id),
|
with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id),
|
||||||
{_n, _} <- MessageReference.set_all_seen_for_chat(chat) do
|
{_n, _} <-
|
||||||
|
MessageReference.set_all_seen_for_chat(chat, conn.body_params[:last_read_id]) do
|
||||||
conn
|
conn
|
||||||
|> put_view(ChatView)
|
|> put_view(ChatView)
|
||||||
|> render("show.json", chat: chat)
|
|> render("show.json", chat: chat)
|
||||||
|
|
|
@ -65,6 +65,30 @@ test "it marks all messages in a chat as read", %{conn: conn, user: user} do
|
||||||
|
|
||||||
assert cm_ref.unread == false
|
assert cm_ref.unread == false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it given a `last_read_id` ", %{conn: conn, user: user} do
|
||||||
|
other_user = insert(:user)
|
||||||
|
|
||||||
|
{:ok, create} = CommonAPI.post_chat_message(other_user, user, "sup")
|
||||||
|
{:ok, _create} = CommonAPI.post_chat_message(other_user, user, "sup part 2")
|
||||||
|
{:ok, chat} = Chat.get_or_create(user.id, other_user.ap_id)
|
||||||
|
object = Object.normalize(create, false)
|
||||||
|
cm_ref = MessageReference.for_chat_and_object(chat, object)
|
||||||
|
|
||||||
|
assert cm_ref.unread == true
|
||||||
|
|
||||||
|
result =
|
||||||
|
conn
|
||||||
|
|> put_req_header("content-type", "application/json")
|
||||||
|
|> post("/api/v1/pleroma/chats/#{chat.id}/read", %{"last_read_id" => cm_ref.id})
|
||||||
|
|> json_response_and_validate_schema(200)
|
||||||
|
|
||||||
|
assert result["unread"] == 1
|
||||||
|
|
||||||
|
cm_ref = MessageReference.for_chat_and_object(chat, object)
|
||||||
|
|
||||||
|
assert cm_ref.unread == false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "POST /api/v1/pleroma/chats/:id/messages" do
|
describe "POST /api/v1/pleroma/chats/:id/messages" do
|
||||||
|
|
Loading…
Reference in New Issue