Fix #1161 无权限访问的条目显示为了错误

open-ani · Nov 10, 2024 · 8dc50b8 · 8dc50b8
1 parent 190029d
commit 8dc50b8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/...shared/app-data/src/commonMain/kotlin/data/network/AbstractBangumiBatchGraphQLExecutor.kt b/...shared/app-data/src/commonMain/kotlin/data/network/AbstractBangumiBatchGraphQLExecutor.kt
@@ -38,7 +38,7 @@ abstract class AbstractBangumiBatchGraphQLExecutor {
 
 data class BangumiGraphQLResponse(
     val data: List<JsonObject?>,
-    val errors: String,
+    val errors: String?,
 )
 
 fun IntSet.toIntArray(): IntArray {

diff --git a/app/shared/app-data/src/commonMain/kotlin/data/network/BangumiSubjectGraphQLExecutor.kt b/app/shared/app-data/src/commonMain/kotlin/data/network/BangumiSubjectGraphQLExecutor.kt
@@ -149,7 +149,7 @@ query BatchGetSubjectQuery(${'$'}id: Int!) {
         return try {
             BangumiGraphQLResponse(
                 processResponse(resp),
-                errors = resp["errors"].toString(),
+                errors = resp["errors"]?.toString(),
             )
         } catch (e: Exception) {
             throw IllegalStateException(

diff --git a/app/shared/app-data/src/commonMain/kotlin/data/network/BangumiSubjectService.kt b/app/shared/app-data/src/commonMain/kotlin/data/network/BangumiSubjectService.kt
@@ -198,19 +198,38 @@ class RemoteBangumiSubjectService(
             // 解析条目详情
             response.mapIndexed { index, element ->
                 if (element == null) { // error
-                    val subjectId = ids[index]
-                    BatchSubjectDetails(
-                        SubjectInfo.Empty.copy(
-                            subjectId = subjectId, subjectType = SubjectType.ANIME,
-                            nameCn = "<$subjectId 错误>",
-                            name = "<$subjectId 错误>",
-                            summary = errors,
-                        ),
-                        LightSubjectRelations(
-                            emptyList(),
-                            emptyList(),
-                        ),
-                    )
+                    if (errors == null) {
+                        // 没有错误, 说明这个条目是没权限获取
+                        val subjectId = ids[index]
+                        BatchSubjectDetails(
+                            SubjectInfo.Empty.copy(
+                                subjectId = subjectId,
+                                subjectType = SubjectType.ANIME,
+                                nameCn = "此条目已被隐藏 $subjectId",
+                                name = "此条目已被隐藏 $subjectId",
+                                summary = "此条目已被隐藏, 请尝试登录后再次尝试. 如已登录, 请等待注册时间满四个月后再看.",
+                                nsfw = true,
+                            ),
+                            LightSubjectRelations(
+                                emptyList(),
+                                emptyList(),
+                            ),
+                        )
+                    } else {
+                        val subjectId = ids[index]
+                        BatchSubjectDetails(
+                            SubjectInfo.Empty.copy(
+                                subjectId = subjectId, subjectType = SubjectType.ANIME,
+                                nameCn = "<$subjectId 错误>",
+                                name = "<$subjectId 错误>",
+                                summary = errors,
+                            ),
+                            LightSubjectRelations(
+                                emptyList(),
+                                emptyList(),
+                            ),
+                        )
+                    }
                 } else {
                     BangumiSubjectGraphQLParser.parseBatchSubjectDetails(element)
                 }