projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'link-headers-chats' into 'develop'
[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 4adc685fe9eb60591e6d6538848c9f867ca495df..669d50132c584e34760c2fb9712b9d64df83f67f 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
@@
-38,7
+38,7
@@
defmodule Pleroma.Web.PleromaAPI.ChatController do
%{scopes: ["read:chats"]} when action in [:messages, :index, :index2, :show]
)
%{scopes: ["read:chats"]} when action in [:messages, :index, :index2, :show]
)
- plug(
OpenApiSpex.Plug.CastAndValidate, render_error: Pleroma.Web.ApiSpec.RenderError
)
+ plug(
Pleroma.Web.ApiSpec.CastAndValidate
)
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.ChatOperation
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.ChatOperation
@@
-151,7
+151,9
@@
defmodule Pleroma.Web.PleromaAPI.ChatController do
index_query(user, params)
|> Pagination.fetch_paginated(params)
index_query(user, params)
|> Pagination.fetch_paginated(params)
- render(conn, "index.json", chats: chats)
+ conn
+ |> add_link_headers(chats)
+ |> render("index.json", chats: chats)
end
defp index_query(%{id: user_id} = user, params) do
end
defp index_query(%{id: user_id} = user, params) do