From ee6834db7a2b32f8f82658282f4e9f25d6eee0ab Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 27 Feb 2023 17:40:35 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"feat:=20userTimeline?= =?UTF-8?q?=E3=82=92statuses=E3=81=AB=E7=B5=B1=E5=90=88""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 624d235155ea0068545d52efad39f377e2fdfb56. --- core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt | 5 ++++- .../kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt | 5 ++++- .../dev/usbharu/multim/cache/CacheableAccountApi.kt | 8 ++++++-- .../dev/usbharu/multim/multi/MultiAccountAccountApi.kt | 8 ++++++-- .../multim/misskey/v12/common/api/MisskeyAccountApi.kt | 7 +++++-- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt b/core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt index fccbc46..eeda7a9 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt @@ -10,6 +10,7 @@ import dev.usbharu.multim.model.* //todo 成功したかをboolで返しているが、詳細がわからないのでしっかり返す。 interface AccountApi { + @Deprecated("statusesに統合") suspend fun userTimeline( account: Account, since: StatusId? = null, @@ -48,7 +49,9 @@ interface AccountApi { suspend fun statuses( account: Account, - includeRepost: Boolean = false + includeRepost: Boolean = false, + since:StatusId? = null, + until:StatusId? = null, ): Result, MultiMError> { Logger.debug("Account Api", "Not impl account api. statuses.") return Err(MultiMError("statuses not implements", null, ErrorType.NOT_IMPL)) diff --git a/core/src/main/kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt b/core/src/main/kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt index 47233bf..d7ea8e3 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt @@ -9,6 +9,7 @@ import dev.usbharu.multim.model.Profile import dev.usbharu.multim.model.Status interface StringIdAccountApi : AccountApi { + @Deprecated("statusesに統合") suspend fun userTimeline( accountId: String, since: String? = null, @@ -20,7 +21,9 @@ interface StringIdAccountApi : AccountApi { suspend fun statuses( accountId: String, - includeRepost: Boolean = false + includeRepost: Boolean = false, + since:String? = null, + until:String? = null ): MultiMResult> { Logger.debug("Account Api", "Not impl account api. statuses by id.") return Err(MultiMError("statuses by id not implements", null, ErrorType.NOT_IMPL)) diff --git a/core/src/main/kotlin/dev/usbharu/multim/cache/CacheableAccountApi.kt b/core/src/main/kotlin/dev/usbharu/multim/cache/CacheableAccountApi.kt index 9cfd588..9473bfc 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/cache/CacheableAccountApi.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/cache/CacheableAccountApi.kt @@ -10,6 +10,7 @@ class CacheableAccountApi( private val cacheableApi: CacheableApi ) : CacheableApi by cacheableApi, AccountApi by accountApi { + @Deprecated("statusesに統合") override suspend fun userTimeline( account: Account, since: StatusId?, @@ -30,7 +31,9 @@ class CacheableAccountApi( override suspend fun statuses( account: Account, - includeRepost: Boolean + includeRepost: Boolean, + since: StatusId?, + until: StatusId? ): Result, MultiMError> { return cacheableApi.cacheOrGet( STATUSES, @@ -38,7 +41,8 @@ class CacheableAccountApi( ) { accountApi.statuses( account, - includeRepost + includeRepost, + since, until ) } } diff --git a/core/src/main/kotlin/dev/usbharu/multim/multi/MultiAccountAccountApi.kt b/core/src/main/kotlin/dev/usbharu/multim/multi/MultiAccountAccountApi.kt index 0b4f557..2481dae 100644 --- a/core/src/main/kotlin/dev/usbharu/multim/multi/MultiAccountAccountApi.kt +++ b/core/src/main/kotlin/dev/usbharu/multim/multi/MultiAccountAccountApi.kt @@ -12,6 +12,7 @@ import dev.usbharu.multim.multi.model.MultiAccountStatus class MultiAccountAccountApi(private val multiAccountApiBase: MultiAccountApiBase) : AccountApi { + @Deprecated("statusesに統合") override suspend fun userTimeline( account: Account, since: StatusId?, @@ -61,13 +62,16 @@ class MultiAccountAccountApi(private val multiAccountApiBase: MultiAccountApiBas override suspend fun statuses( account: Account, - includeRepost: Boolean + includeRepost: Boolean, + since: StatusId?, + until: StatusId? ): Result, MultiMError> { Logger.debug("Account Api", "Multi account account api statuses") return getImpl2(account) { statuses( it, - includeRepost + includeRepost, + since, until ) }.flatMap { it.first.map { statuses -> diff --git a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApi.kt b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApi.kt index 1846435..1adbe73 100644 --- a/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApi.kt +++ b/impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApi.kt @@ -19,6 +19,7 @@ import dev.usbharu.multim.misskey.v12.model.components.UserLite import dev.usbharu.multim.model.* class MisskeyAccountApi(val misskeyApis: MisskeyApis) : AccountApi { + @Deprecated("statusesに統合") override suspend fun userTimeline( account: Account, since: StatusId?, @@ -92,8 +93,10 @@ class MisskeyAccountApi(val misskeyApis: MisskeyApis) : AccountApi { override suspend fun statuses( account: Account, - includeRepost: Boolean - ): Result, MultiMError> { + includeRepost: Boolean, + since: StatusId?, + until: StatusId? + ): Result, MultiMError> { return if (account is MisskeyAccount) { misskeyApis.users.notes( UsersNotesRequest(