From 295a0817b0554d30e78cbac14ba094562af15a2c Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Thu, 13 May 2021 18:28:30 +0430
Subject: [PATCH] fix wrong chapters being removed, fix da css

---
 .../kotlin/ir/armor/tachidesk/impl/Chapter.kt  | 18 ++++++++++--------
 webUI/react/src/screens/Manga.tsx              | 13 +++----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt b/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt
index 0dd59cb..90cfed7 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/impl/Chapter.kt
@@ -67,18 +67,20 @@ object Chapter {
             }
 
             // clear any orphaned chapters that are in the db but not in `chapterList`
-            val dbChapterCount = transaction { ChapterTable.selectAll().count() }
+            val dbChapterCount = transaction { ChapterTable.select { ChapterTable.manga eq mangaId }.count() }
             if (dbChapterCount > chapterCount) { // we got some clean up due
                 // TODO: delete orphan chapters
-                val dbChapterList = transaction { ChapterTable.selectAll() }
+                val dbChapterList = transaction { ChapterTable.select { ChapterTable.manga eq mangaId } }
 
                 dbChapterList.forEach {
-                    (
-                        it[ChapterTable.chapterIndex] >= chapterList.size ||
-                            chapterList[it[ChapterTable.chapterIndex]].url != it[ChapterTable.url]
-                        )
-
-                    ChapterTable.deleteWhere { ChapterTable.id eq it[ChapterTable.id] }
+                    if (it[ChapterTable.chapterIndex] >= chapterList.size ||
+                        chapterList[it[ChapterTable.chapterIndex] - 1].url != it[ChapterTable.url]
+                    ) {
+                        transaction {
+                            PageTable.deleteWhere { PageTable.chapter eq it[ChapterTable.id] }
+                            ChapterTable.deleteWhere { ChapterTable.id eq it[ChapterTable.id] }
+                        }
+                    }
                 }
             }
 
diff --git a/webUI/react/src/screens/Manga.tsx b/webUI/react/src/screens/Manga.tsx
index 0f1c69a..932bf19 100644
--- a/webUI/react/src/screens/Manga.tsx
+++ b/webUI/react/src/screens/Manga.tsx
@@ -89,16 +89,9 @@ export default function Manga() {
                     {chapters.map((chapter) => ())}
                 </ol> */}
                 <Virtuoso
-                    style={
-                        {
-                            width: '100vw',
-                            height: '100%',
-                            [theme.breakpoints.up('md')]: {
-                                height: 'calc(100vh - 64px)',
-                                width: '50vw',
-                            },
-                        }
-                    }
+                    style={{ // override Virtuoso default values and set them with class
+                        height: 'undefined',
+                    }}
                     className={classes.chapters}
                     totalCount={chapters.length}
                     itemContent={itemContent}