diff --git a/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt b/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt index bf6509bc5..a0e799513 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderQueen.kt @@ -328,7 +328,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS } private suspend fun readSpiderInfoFromInternet() = EhEngine.getPreviewList( - getGalleryDetailUrl(galleryInfo.gid, galleryInfo.token, 0, false), + getGalleryDetailUrl(galleryInfo.gid, galleryInfo.token), ).run { val spiderInfo = SpiderInfo(galleryInfo.gid, galleryInfo.token, total) readPreviews(previews, 0, spiderInfo) @@ -356,12 +356,7 @@ class SpiderQueen private constructor(val galleryInfo: GalleryInfo) : CoroutineS } else { 0 } - val url = getGalleryDetailUrl( - galleryInfo.gid, - galleryInfo.token, - previewIndex, - false, - ) + val url = getGalleryDetailUrl(galleryInfo.gid, galleryInfo.token, previewIndex) return runSuspendCatching { EhEngine.getPreviewList(url).run { readPreviews(previews, previewIndex, spiderInfo) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt index 07cff6f59..721d274b7 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt @@ -193,7 +193,7 @@ fun AnimatedVisibilityScope.GalleryCommentsScreen(gid: Long, navigator: Destinat val density = LocalDensity.current suspend fun refreshComment(showAll: Boolean) { - val url = EhUrl.getGalleryDetailUrl(galleryDetail.gid, galleryDetail.token, 0, showAll) + val url = EhUrl.getGalleryDetailUrl(galleryDetail.gid, galleryDetail.token, allComment = showAll) val detail = EhEngine.getGalleryDetail(url) comments = detail.comments } @@ -216,7 +216,7 @@ fun AnimatedVisibilityScope.GalleryCommentsScreen(gid: Long, navigator: Destinat suspend fun sendComment() { commenting = false withUIContext { focusManager.clearFocus() } - val url = EhUrl.getGalleryDetailUrl(galleryDetail.gid, galleryDetail.token, 0, false) + val url = EhUrl.getGalleryDetailUrl(galleryDetail.gid, galleryDetail.token) userComment.runSuspendCatching { val bbcode = annotatedString.normalizeSpan().toBBCode() logcat("sendComment") { bbcode } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailContent.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailContent.kt index 99f6388b1..29d69fd76 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailContent.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailContent.kt @@ -809,7 +809,7 @@ private fun GalleryDetail.collectPreviewItems() = rememberInVM(previewList) { runSuspendCatching { (up..end).filterNot { it in previewPagesMap }.map { it / pageSize }.toSet() .parMap(concurrency = Settings.multiThreadDownload.value) { page -> - val url = EhUrl.getGalleryDetailUrl(gid, token, page, false) + val url = EhUrl.getGalleryDetailUrl(gid, token, page) EhEngine.getPreviewList(url).previews }.flattenForEach { previewPagesMap[it.position] = it diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt index 2758d7131..22bebc26e 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt @@ -109,7 +109,7 @@ fun AnimatedVisibilityScope.GalleryDetailScreen(args: GalleryDetailScreenArgs, n is TokenArgs -> args.gid to args.token } } - val galleryDetailUrl = remember(gid, token) { EhUrl.getGalleryDetailUrl(gid, token, 0, false) } + val galleryDetailUrl = remember(gid, token) { EhUrl.getGalleryDetailUrl(gid, token) } contextOf().ProvideAssistContent(galleryDetailUrl) var galleryInfo by rememberInVM {