Skip to content

Revert "Revert "feat: userTimelineをstatusesに統合"" #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
usbharu merged 1 commit into from
Feb 27, 2023
Merged

Revert "Revert "feat: userTimelineをstatusesに統合"" #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion core/src/main/kotlin/dev/usbharu/multim/api/AccountApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import dev.usbharu.multim.model.*
//todo 成功したかをboolで返しているが、詳細がわからないのでしっかり返す。

interface AccountApi {
@Deprecated("statusesに統合")
suspend fun userTimeline(
account: Account,
since: StatusId? = null,
Expand Down Expand Up @@ -48,7 +49,9 @@ interface AccountApi {

suspend fun statuses(
account: Account,
includeRepost: Boolean = false
includeRepost: Boolean = false,
since:StatusId? = null,
until:StatusId? = null,
): Result<List<Status>, MultiMError> {
Logger.debug("Account Api", "Not impl account api. statuses.")
return Err(MultiMError("statuses not implements", null, ErrorType.NOT_IMPL))
Expand Down
5 changes: 4 additions & 1 deletion core/src/main/kotlin/dev/usbharu/multim/api/StringIdAccountApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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<List<Status>> {
Logger.debug("Account Api", "Not impl account api. statuses by id.")
return Err(MultiMError("statuses by id not implements", null, ErrorType.NOT_IMPL))
Expand Down
8 changes: 6 additions & 2 deletions core/src/main/kotlin/dev/usbharu/multim/cache/CacheableAccountApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?,
Expand All @@ -30,15 +31,18 @@ class CacheableAccountApi(

override suspend fun statuses(
account: Account,
includeRepost: Boolean
includeRepost: Boolean,
since: StatusId?,
until: StatusId?
): Result<List<Status>, MultiMError> {
return cacheableApi.cacheOrGet(
STATUSES,
CacheableApi.generateKey(account) + includeRepost
) {
accountApi.statuses(
account,
includeRepost
includeRepost,
since, until
)
}
}
Expand Down
8 changes: 6 additions & 2 deletions core/src/main/kotlin/dev/usbharu/multim/multi/MultiAccountAccountApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?,
Expand Down Expand Up @@ -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<List<Status>, MultiMError> {
Logger.debug("Account Api", "Multi account account api statuses")
return getImpl2(account) {
statuses(
it,
includeRepost
includeRepost,
since, until
)
}.flatMap {
it.first.map { statuses ->
Expand Down
7 changes: 5 additions & 2 deletions impl/misskey/src/main/kotlin/dev/usbharu/multim/misskey/v12/common/api/MisskeyAccountApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?,
Expand Down Expand Up @@ -92,8 +93,10 @@ class MisskeyAccountApi(val misskeyApis: MisskeyApis) : AccountApi {

override suspend fun statuses(
account: Account,
includeRepost: Boolean
): Result<List<MisskeyStatus>, MultiMError> {
includeRepost: Boolean,
since: StatusId?,
until: StatusId?
): Result<List<Status>, MultiMError> {
return if (account is MisskeyAccount) {
misskeyApis.users.notes(
UsersNotesRequest(
Expand Down