ChatController: Handle pagination.

This commit is contained in:
lain 2020-04-16 18:43:31 +02:00
commit f8c3ae7a62
4 changed files with 68 additions and 12 deletions

View file

@ -11,6 +11,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.PleromaAPI.ChatView
alias Pleroma.Web.PleromaAPI.ChatMessageView
alias Pleroma.Pagination
import Ecto.Query
@ -35,7 +36,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
end
end
def messages(%{assigns: %{user: %{id: user_id} = user}} = conn, %{"id" => id}) do
def messages(%{assigns: %{user: %{id: user_id} = user}} = conn, %{"id" => id} = params) do
with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id) do
messages =
from(o in Object,
@ -54,10 +55,9 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
^chat.recipient,
o.data,
^[user.ap_id]
),
order_by: [desc: o.id]
)
)
|> Repo.all()
|> Pagination.fetch_paginated(params)
conn
|> put_view(ChatMessageView)
@ -65,13 +65,13 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
end
end
def index(%{assigns: %{user: %{id: user_id}}} = conn, _params) do
def index(%{assigns: %{user: %{id: user_id}}} = conn, params) do
chats =
from(c in Chat,
where: c.user_id == ^user_id,
order_by: [desc: c.updated_at]
)
|> Repo.all()
|> Pagination.fetch_paginated(params)
conn
|> put_view(ChatView)

View file

@ -15,9 +15,9 @@ defmodule Pleroma.Web.PleromaAPI.ChatMessageView do
}
) do
%{
id: id,
id: id |> to_string(),
content: chat_message["content"],
chat_id: chat_id,
chat_id: chat_id |> to_string(),
actor: chat_message["actor"]
}
end

View file

@ -9,7 +9,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatView do
def render("show.json", %{chat: %Chat{} = chat}) do
%{
id: chat.id,
id: chat.id |> to_string(),
recipient: chat.recipient,
unread: chat.unread
}