summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-08 11:09:53 +0200
committerlain <lain@soykaf.club>2020-06-08 11:09:53 +0200
commit89b85f65297ef4b8ce92eacb27c90e8f7c874f54 (patch)
tree279c5cce5651f36a1208cac4a9ec2dd8204df429
parent7d66dd180ac98ab9b16463d2d71ab292f8fe07a0 (diff)
ChatController: Remove nonsensical pagination.
-rw-r--r--docs/API/chats.md2
-rw-r--r--lib/pleroma/web/pleroma_api/controllers/chat_controller.ex4
-rw-r--r--test/web/pleroma_api/controllers/chat_controller_test.exs11
3 files changed, 5 insertions, 12 deletions
diff --git a/docs/API/chats.md b/docs/API/chats.md
index 9eb581943..aa6119670 100644
--- a/docs/API/chats.md
+++ b/docs/API/chats.md
@@ -135,7 +135,7 @@ Returned data:
```
The recipient of messages that are sent to this chat is given by their AP ID.
-The usual pagination options are implemented.
+No pagination is implemented for now.
### Getting the messages for a Chat
diff --git a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
index b9949236c..e4760f53e 100644
--- a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
@@ -140,7 +140,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
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 =
@@ -149,7 +149,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
where: c.recipient not in ^blocked_ap_ids,
order_by: [desc: c.updated_at]
)
- |> Pagination.fetch_paginated(params |> stringify_keys)
+ |> Repo.all()
conn
|> put_view(ChatView)
diff --git a/test/web/pleroma_api/controllers/chat_controller_test.exs b/test/web/pleroma_api/controllers/chat_controller_test.exs
index c2960956d..82e16741d 100644
--- a/test/web/pleroma_api/controllers/chat_controller_test.exs
+++ b/test/web/pleroma_api/controllers/chat_controller_test.exs
@@ -289,7 +289,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
assert length(result) == 0
end
- test "it paginates", %{conn: conn, user: user} do
+ test "it returns all chats", %{conn: conn, user: user} do
Enum.each(1..30, fn _ ->
recipient = insert(:user)
{:ok, _} = Chat.get_or_create(user.id, recipient.ap_id)
@@ -300,14 +300,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
|> get("/api/v1/pleroma/chats")
|> json_response_and_validate_schema(200)
- assert length(result) == 20
-
- result =
- conn
- |> get("/api/v1/pleroma/chats?max_id=#{List.last(result)["id"]}")
- |> json_response_and_validate_schema(200)
-
- assert length(result) == 10
+ assert length(result) == 30
end
test "it return a list of chats the current user is participating in, in descending order of updates",