mirror of https://github.com/usbharu/Hideout.git
fix: Mongodbの通知APIがおかしくなっていたのを修正
This commit is contained in:
parent
9859c36051
commit
4ed61efe76
|
@ -36,22 +36,25 @@ class MongoMastodonNotificationRepositoryWrapper(
|
||||||
): PaginationList<MastodonNotification, Long> {
|
): PaginationList<MastodonNotification, Long> {
|
||||||
val query = Query()
|
val query = Query()
|
||||||
|
|
||||||
if (page.minId != null) {
|
|
||||||
page.minId?.let { query.addCriteria(Criteria.where("id").gt(it)) }
|
|
||||||
page.maxId?.let { query.addCriteria(Criteria.where("id").lt(it)) }
|
|
||||||
} else {
|
|
||||||
query.with(Sort.by(Sort.Direction.DESC, "createdAt"))
|
|
||||||
page.sinceId?.let { query.addCriteria(Criteria.where("id").gt(it)) }
|
|
||||||
page.maxId?.let { query.addCriteria(Criteria.where("id").lt(it)) }
|
|
||||||
}
|
|
||||||
|
|
||||||
page.limit?.let { query.limit(it) }
|
page.limit?.let { query.limit(it) }
|
||||||
|
|
||||||
val mastodonNotifications = mongoTemplate.find(query, MastodonNotification::class.java)
|
val mastodonNotifications = if (page.minId != null) {
|
||||||
|
query.with(Sort.by(Sort.Direction.ASC, "id"))
|
||||||
|
page.minId?.let { query.addCriteria(Criteria.where("id").gt(it)) }
|
||||||
|
page.maxId?.let { query.addCriteria(Criteria.where("id").lt(it)) }
|
||||||
|
mongoTemplate.find(query, MastodonNotification::class.java).reversed()
|
||||||
|
} else {
|
||||||
|
query.with(Sort.by(Sort.Direction.DESC, "id"))
|
||||||
|
page.sinceId?.let { query.addCriteria(Criteria.where("id").gt(it)) }
|
||||||
|
page.maxId?.let { query.addCriteria(Criteria.where("id").lt(it)) }
|
||||||
|
mongoTemplate.find(query, MastodonNotification::class.java)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
return PaginationList(
|
return PaginationList(
|
||||||
mastodonNotifications,
|
mastodonNotifications,
|
||||||
mastodonNotifications.lastOrNull()?.id,
|
mastodonNotifications.firstOrNull()?.id,
|
||||||
mastodonNotifications.firstOrNull()?.id
|
mastodonNotifications.lastOrNull()?.id
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue