From 9ddf0eee2005d5b5684fca00143bc5b79bd30b8c Mon Sep 17 00:00:00 2001
From: "Mio." <mio.bluewatermelon@gmail.com>
Date: Sat, 28 Jun 2025 17:21:11 +0200
Subject: [PATCH] Fix the token for the action and add comics support in
 Reading Lists

---
 .github/workflows/build_push.yml              |  2 +-
 .../tachiyomi/extension/all/kavita/Kavita.kt  | 27 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 82d1521b..32b31c76 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -146,7 +146,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: Kareadita/tach-extension
-          token: ${{ secrets.BOT_PAT }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           ref: repo
           path: repo
 
diff --git a/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/Kavita.kt b/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/Kavita.kt
index 94f548d0..4258e847 100644
--- a/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/Kavita.kt
+++ b/src/all/kavita/src/eu/kanade/tachiyomi/extension/all/kavita/Kavita.kt
@@ -350,17 +350,22 @@ class Kavita(private val suffix: String = "") : ConfigurableSource, UnmeteredSou
                 }
                 name = buildString {
                     append("${item.order + 1}. ")
-                    if (item.chapterId != null && item.chapterId > 0) {
-                        if (item.chapterTitleName.isNullOrBlank()) {
-                            item.chapterNumber
-                                ?.takeIf { it.isNotBlank() && it != "-100000" }
-                                ?.let { append(" Chapter $it") }
+                    when {
+                        !item.chapterTitleName.isNullOrBlank() && !item.chapterTitleName.matches(Regex("^\\d+\$")) -> {
+                            append(item.chapterTitleName)
+                        }
+                        !item.volumeNumber.isNullOrBlank() && item.volumeNumber != "-100000" -> {
+                            append("Volume ${item.volumeNumber.padStart(2, '0')}")
+                        }
+                        !item.chapterNumber.isNullOrBlank() && item.chapterNumber != "-100000" -> {
+                            val libraryType = getLibraryType(item.seriesId)
+                            when (libraryType) {
+                                LibraryTypeEnum.Comic, LibraryTypeEnum.ComicVine ->
+                                    append("Issue #${item.chapterNumber.padStart(3, '0')}")
+                                else ->
+                                    append("Chapter ${item.chapterNumber.padStart(2, '0')}")
+                            }
                         }
-                        item.chapterTitleName
-                            ?.takeIf { it.isNotBlank() }
-                            ?.let { append(it) }
-                    } else if (!item.volumeNumber.isNullOrBlank()) {
-                        append(" (Vol.${item.volumeNumber})")
                     }
                 }
                 date_upload = if (preferences.RdDate && !item.releaseDate.isNullOrBlank()) {
@@ -369,7 +374,7 @@ class Kavita(private val suffix: String = "") : ConfigurableSource, UnmeteredSou
                     0L // Explicitly unset the date
                 }
                 chapter_number = item.order.toFloat()
-                scanlator = item.seriesName + " #" + (item.chapterNumber?.padStart(3, '0') ?: "") // For Comics #000
+                scanlator = item.seriesName
             }
         }.sortedBy { it.chapter_number }
     }