fix(Scout): fix pagination when sorting by oldest
This commit is contained in:
parent
d8bfd28dd7
commit
bf9ef9ad8f
1 changed files with 15 additions and 5 deletions
|
|
@ -129,11 +129,21 @@ class Scout : Plugin() {
|
||||||
val self = param.thisObject as `SearchFetcher$getRestObservable$3`<*, *>
|
val self = param.thisObject as `SearchFetcher$getRestObservable$3`<*, *>
|
||||||
val retryAttempts = param.args[0] as Int?
|
val retryAttempts = param.args[0] as Int?
|
||||||
val params = self.`$searchQuery`.params
|
val params = self.`$searchQuery`.params
|
||||||
val maxID = self.`$oldestMessageId`?.let { listOf(it.toString()) } ?: params["max_id"]
|
|
||||||
|
var minID = params["min_id"]
|
||||||
|
var maxID = params["max_id"]
|
||||||
|
val sortOrder = params["sort_order"]
|
||||||
|
self.`$oldestMessageId`?.let {
|
||||||
|
if (sortOrder?.getOrNull(0) == "asc")
|
||||||
|
minID = listOf(it.toString())
|
||||||
|
else
|
||||||
|
maxID = listOf(it.toString())
|
||||||
|
}
|
||||||
|
|
||||||
param.result = if (self.`$searchTarget`.type == StoreSearch.SearchTarget.Type.GUILD)
|
param.result = if (self.`$searchTarget`.type == StoreSearch.SearchTarget.Type.GUILD)
|
||||||
searchApi.searchGuildMessages(
|
searchApi.searchGuildMessages(
|
||||||
self.`$searchTarget`.id,
|
self.`$searchTarget`.id,
|
||||||
params["min_id"],
|
minID,
|
||||||
maxID,
|
maxID,
|
||||||
params["author_id"],
|
params["author_id"],
|
||||||
params["mentions"],
|
params["mentions"],
|
||||||
|
|
@ -143,12 +153,12 @@ class Scout : Plugin() {
|
||||||
retryAttempts,
|
retryAttempts,
|
||||||
self.`$searchQuery`.includeNsfw,
|
self.`$searchQuery`.includeNsfw,
|
||||||
listOf("timestamp"),
|
listOf("timestamp"),
|
||||||
params["sort_order"]
|
sortOrder
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
searchApi.searchChannelMessages(
|
searchApi.searchChannelMessages(
|
||||||
self.`$searchTarget`.id,
|
self.`$searchTarget`.id,
|
||||||
params["min_id"],
|
minID,
|
||||||
maxID,
|
maxID,
|
||||||
params["author_id"],
|
params["author_id"],
|
||||||
params["mentions"],
|
params["mentions"],
|
||||||
|
|
@ -157,7 +167,7 @@ class Scout : Plugin() {
|
||||||
retryAttempts,
|
retryAttempts,
|
||||||
self.`$searchQuery`.includeNsfw,
|
self.`$searchQuery`.includeNsfw,
|
||||||
listOf("timestamp"),
|
listOf("timestamp"),
|
||||||
params["sort_order"]
|
sortOrder
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue