From f616f72415057f878ee82453854fc47402fdc3a8 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 29 Jan 2024 18:59:37 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Pagination=20API=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/MastodonAccountApiController.kt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiController.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiController.kt index 269943d2..6d69423a 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiController.kt +++ b/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiController.kt @@ -191,9 +191,21 @@ class MastodonAccountApiController( runBlocking { val userid = loginUserContextHolder.getLoginUserId() - val unmute = - accountApiService.mutesAccount(userid, maxId?.toLong(), sinceId?.toLong(), limit ?: 20).asFlow() + val mutes = + accountApiService.mutesAccount( + userid, + Page.PageByMaxId(maxId?.toLongOrNull(), sinceId?.toLongOrNull(), limit?.coerceIn(0, 80) ?: 40) + ) - return@runBlocking ResponseEntity.ok(unmute) + val httpHeader = mutes.toHttpHeader( + { "${applicationConfig.url}/api/v1/mutes?max_id=$it" }, + { "${applicationConfig.url}/api/v1/mutes?since_id=$it" }, + ) + + if (httpHeader != null) { + return@runBlocking ResponseEntity.ok().header("Link", httpHeader).body(mutes.asFlow()) + } + + return@runBlocking ResponseEntity.ok(mutes.asFlow()) } }