trying to bundle the changes

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt

@@ -11,9 +11,6 @@ import ch.qos.logback.classic.Level
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import com.typesafe.config.ConfigRenderOptions
-import com.typesafe.config.ConfigValue
-import com.typesafe.config.ConfigValueFactory
-import com.typesafe.config.parser.ConfigDocumentFactory
 import mu.KotlinLogging
 import java.io.File
 
@@ -21,17 +18,15 @@ import java.io.File
  * Manages app config.
  */
 open class ConfigManager {
-    val logger = KotlinLogging.logger {}
     private val generatedModules = mutableMapOf<Class<out ConfigModule>, ConfigModule>()
-    private val userConfigFile = File(ApplicationRootDir, "server.conf")
-    private var internalConfig = loadConfigs()
-    val config: Config
-        get() = internalConfig
+    val config by lazy { loadConfigs() }
 
     // Public read-only view of modules
     val loadedModules: Map<Class<out ConfigModule>, ConfigModule>
         get() = generatedModules
 
+    val logger = KotlinLogging.logger {}
+
     /**
      * Get a config module
      */
@@ -59,7 +54,7 @@ open class ConfigManager {
 
         // Load user config
         val userConfig =
-            userConfigFile.let {
+            File(ApplicationRootDir, "server.conf").let {
                 ConfigFactory.parseFile(it)
             }
 
@@ -91,20 +86,6 @@ open class ConfigManager {
             registerModule(it)
         }
     }
-
-    private fun updateUserConfigFile(path: String, value: ConfigValue) {
-        val userConfigDoc = ConfigDocumentFactory.parseFile(userConfigFile)
-        val updatedConfigDoc = userConfigDoc.withValue(path, value)
-        val newFileContent = updatedConfigDoc.render()
-        userConfigFile.writeText(newFileContent)
-    }
-
-    fun updateValue(path: String, value: Any) {
-        val configValue = ConfigValueFactory.fromAnyRef(value)
-
-        updateUserConfigFile(path, configValue)
-        internalConfig = internalConfig.withValue(path, configValue)
-    }
 }
 
 object GlobalConfigManager : ConfigManager()

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigModule.kt

@@ -15,23 +15,19 @@ import kotlin.reflect.KProperty
  * Abstract config module.
  */
 @Suppress("UNUSED_PARAMETER")
-abstract class ConfigModule(getConfig: () -> Config)
+abstract class ConfigModule(config: Config)
 
 /**
  * Abstract jvm-commandline-argument-overridable config module.
  */
-abstract class SystemPropertyOverridableConfigModule(getConfig: () -> Config, moduleName: String) : ConfigModule(getConfig) {
-    val overridableConfig = SystemPropertyOverrideDelegate(getConfig, moduleName)
+abstract class SystemPropertyOverridableConfigModule(config: Config, moduleName: String) : ConfigModule(config) {
+    val overridableConfig = SystemPropertyOverrideDelegate(config, moduleName)
 }
 
 /** Defines a config property that is overridable with jvm `-D` commandline arguments prefixed with [CONFIG_PREFIX] */
-class SystemPropertyOverrideDelegate(val getConfig: () -> Config, val moduleName: String) {
-    operator fun <R> setValue(thisRef: R, property: KProperty<*>, value: Any) {
-        GlobalConfigManager.updateValue("$moduleName.${property.name}", value)
-    }
-
+class SystemPropertyOverrideDelegate(val config: Config, val moduleName: String) {
     inline operator fun <R, reified T> getValue(thisRef: R, property: KProperty<*>): T {
-        val configValue: T = getConfig().getValue(thisRef, property)
+        val configValue: T = config.getValue(thisRef, property)
 
         val combined = System.getProperty(
             "$CONFIG_PREFIX.$moduleName.${property.name}",

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/ApplicationInfoConfigModule.kt

@@ -8,12 +8,12 @@ import xyz.nulldev.ts.config.ConfigModule
  * Application info config.
  */
 
-class ApplicationInfoConfigModule(getConfig: () -> Config) : ConfigModule(getConfig) {
-    val packageName: String by getConfig()
-    val debug: Boolean by getConfig()
+class ApplicationInfoConfigModule(config: Config) : ConfigModule(config) {
+    val packageName: String by config
+    val debug: Boolean by config
 
     companion object {
         fun register(config: Config) =
-            ApplicationInfoConfigModule { config.getConfig("android.app") }
+            ApplicationInfoConfigModule(config.getConfig("android.app"))
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt

@@ -8,27 +8,27 @@ import xyz.nulldev.ts.config.ConfigModule
  * Files configuration modules. Specifies where to store the Android files.
  */
 
-class FilesConfigModule(getConfig: () -> Config) : ConfigModule(getConfig) {
-    val dataDir: String by getConfig()
-    val filesDir: String by getConfig()
-    val noBackupFilesDir: String by getConfig()
-    val externalFilesDirs: MutableList<String> by getConfig()
-    val obbDirs: MutableList<String> by getConfig()
-    val cacheDir: String by getConfig()
-    val codeCacheDir: String by getConfig()
-    val externalCacheDirs: MutableList<String> by getConfig()
-    val externalMediaDirs: MutableList<String> by getConfig()
-    val rootDir: String by getConfig()
-    val externalStorageDir: String by getConfig()
-    val downloadCacheDir: String by getConfig()
-    val databasesDir: String by getConfig()
+class FilesConfigModule(config: Config) : ConfigModule(config) {
+    val dataDir: String by config
+    val filesDir: String by config
+    val noBackupFilesDir: String by config
+    val externalFilesDirs: MutableList<String> by config
+    val obbDirs: MutableList<String> by config
+    val cacheDir: String by config
+    val codeCacheDir: String by config
+    val externalCacheDirs: MutableList<String> by config
+    val externalMediaDirs: MutableList<String> by config
+    val rootDir: String by config
+    val externalStorageDir: String by config
+    val downloadCacheDir: String by config
+    val databasesDir: String by config
 
-    val prefsDir: String by getConfig()
+    val prefsDir: String by config
 
-    val packageDir: String by getConfig()
+    val packageDir: String by config
 
     companion object {
         fun register(config: Config) =
-            FilesConfigModule { config.getConfig("android.files") }
+            FilesConfigModule(config.getConfig("android.files"))
     }
 }

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt

@@ -4,19 +4,19 @@ import com.typesafe.config.Config
 import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule
 
-class SystemConfigModule(val getConfig: () -> Config) : ConfigModule(getConfig) {
-    val isDebuggable: Boolean by getConfig()
+class SystemConfigModule(val config: Config) : ConfigModule(config) {
+    val isDebuggable: Boolean by config
 
     val propertyPrefix = "properties."
 
-    fun getStringProperty(property: String) = getConfig().getString("$propertyPrefix$property")!!
-    fun getIntProperty(property: String) = getConfig().getInt("$propertyPrefix$property")
-    fun getLongProperty(property: String) = getConfig().getLong("$propertyPrefix$property")
-    fun getBooleanProperty(property: String) = getConfig().getBoolean("$propertyPrefix$property")
-    fun hasProperty(property: String) = getConfig().hasPath("$propertyPrefix$property")
+    fun getStringProperty(property: String) = config.getString("$propertyPrefix$property")!!
+    fun getIntProperty(property: String) = config.getInt("$propertyPrefix$property")
+    fun getLongProperty(property: String) = config.getLong("$propertyPrefix$property")
+    fun getBooleanProperty(property: String) = config.getBoolean("$propertyPrefix$property")
+    fun hasProperty(property: String) = config.hasPath("$propertyPrefix$property")
 
     companion object {
         fun register(config: Config) =
-            SystemConfigModule { config.getConfig("android.system") }
+            SystemConfigModule(config.getConfig("android.system"))
     }
 }

README.md

@@ -145,12 +145,10 @@ Check out [this wiki page](https://github.com/Suwayomi/Tachidesk-Server/wiki/Con
 If you face issues with your setup then we are happy to provide help, just join our discord server(a discord badge is on the top of the page, you are just a click clack away!).
 
 ## Syncing With Tachiyomi
-### The Suwayomi extension and tracker
-- You can install the `Suwayomi` extension inside tachiyomi.
-- The extension will load your Tachidesk library.
-- By manipulating extension search filters you can browse your categories.
-- You can enable the Suwayomi tracker to track reading progress with your Tachidesk server.
-  - Note: Tachiyomi [only allowes tracking one way](https://github.com/tachiyomiorg/tachiyomi/issues/1626), meaning that by reading chapters on other Tachidesk clients the last read chapter number will updated on the tracker but tachiyomi won't automatically mark them as read for you.
+### The Tachidesk extension
+- You can install the `Tachidesk` extension inside tachiyomi.
+- The extension will load Tachidesk library. 
+- By manipulating filters you can browse your categories.
 
 ### Other methods
 Checkout [this issue](https://github.com/Suwayomi/Tachidesk-Server/issues/159) for tracking progress.

buildSrc/src/main/kotlin/Constants.kt

@@ -12,7 +12,7 @@ const val MainClass = "suwayomi.tachidesk.MainKt"
 // should be bumped with each stable release
 val tachideskVersion = System.getenv("ProductVersion") ?: "v0.7.0"
 
-val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r983"
+val webUIRevisionTag = System.getenv("WebUIRevision") ?: "r1045"
 
 // counts commits on the master branch
 val tachideskRevision = runCatching {

gradle/libs.versions.toml

@@ -10,7 +10,6 @@ dex2jar = "v60"
 rhino = "1.7.14"
 settings = "1.0.0-RC"
 twelvemonkeys = "3.9.4"
-playwright = "1.28.0"
 
 [libraries]
 # Kotlin
@@ -93,12 +92,8 @@ xmlpull = "xmlpull:xmlpull:1.1.3.4a"
 # Disk & File
 appdirs = "net.harawata:appdirs:1.2.1"
 zip4j = "net.lingala.zip4j:zip4j:2.11.2"
-commonscompress = "org.apache.commons:commons-compress:1.23.0"
 junrar = "com.github.junrar:junrar:7.5.3"
 
-# CloudflareInterceptor
-playwright = { module = "com.microsoft.playwright:playwright", version.ref = "playwright" }
-
 # AES/CBC/PKCS7Padding Cypher provider
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.72"
 

scripts/bundler.sh

@@ -26,8 +26,6 @@ main() {
   set -- "${POSITIONAL_ARGS[@]}"
 
   OS="$1"
-  PLAYWRIGHT_VERSION="$(cat gradle/libs.versions.toml | grep -oP "playwright = \"\K([0-9\.]*)(?=\")")"
-  PLAYWRIGHT_REVISION="$(curl --silent "https://raw.githubusercontent.com/microsoft/playwright/v$PLAYWRIGHT_VERSION/packages/playwright-core/browsers.json" 2>&1 | grep -ozP "\"name\": \"chromium\",\n *\"revision\": \"\K[0-9]*")"
   JAR="$(ls server/build/*.jar | tail -n1)"
   RELEASE_NAME="$(echo "${JAR%.*}" | xargs basename)-$OS"
   RELEASE_VERSION="$(tmp="${JAR%-*}"; echo "${tmp##*-}" | tr -d v)"
@@ -127,8 +125,9 @@ main() {
       ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
       download_jre_and_electron
 
-      PLAYWRIGHT_PLATFORM="win64"
-      setup_playwright
+      PYTHON=Winpython64-3.10.9.0dot.exe
+      PYTHON_URL=https://github.com/winpython/winpython/releases/download/5.3.20221233/Winpython64-3.10.9.0dot.exe
+      setup_undetected_chromedriver_and_python
 
       RELEASE="$RELEASE_NAME.zip"
       make_windows_bundle
@@ -285,9 +284,23 @@ make_windows_package() {
     "$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" -o "$RELEASE"
 }
 
-setup_playwright() {
-  mkdir "$RELEASE_NAME/bin"
-  curl -L "https://playwright.azureedge.net/builds/chromium/$PLAYWRIGHT_REVISION/chromium-$PLAYWRIGHT_PLATFORM.zip" -o "$RELEASE_NAME/bin/chromium.zip"
+setup_python() {
+  mkdir "$RELEASE_NAME/"
+  curl -L "$PYTHON_URL" -o "$PYTHON"
+  7z x $PYTHON
+  mv WPy64-31090/python-3.10.9.amd64 "$RELEASE_NAME/python"
+}
+
+setup_undetected_chromedriver() {
+  curl -L "https://github.com/Suwayomi/undetected-chromedriver/archive/refs/heads/master.zip" -o undetected-chromedriver-master.zip
+  unzip undetected-chromedriver-master.zip
+  mv undetected-chromedriver-master "$RELEASE_NAME/undetected-chromedriver"
+}
+
+
+setup_undetected_chromedriver_and_python() {
+  setup_python
+  setup_undetected_chromedriver
 }
 
 # Error handler

server/build.gradle.kts

@@ -48,12 +48,8 @@ dependencies {
 
     // Disk & File
     implementation(libs.zip4j)
-    implementation(libs.commonscompress)
     implementation(libs.junrar)
 
-    // CloudflareInterceptor
-    implementation(libs.playwright)
-
     // AES/CBC/PKCS7Padding Cypher provider for zh.copymanga
     implementation(libs.bouncycastle)
 
@@ -65,10 +61,6 @@ dependencies {
 //    implementation(fileTree("lib/"))
     implementation(kotlin("script-runtime"))
 
-    implementation("com.expediagroup:graphql-kotlin-server:6.4.0")
-    implementation("com.expediagroup:graphql-kotlin-schema-generator:6.4.0")
-    implementation("com.graphql-java:graphql-java-extended-scalars:20.0")
-
     testImplementation(libs.mockk)
 }
 

server/src/main/java/suwayomi/tachidesk/server/util/DriverJar.java

@@ -1,212 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package suwayomi.tachidesk.server.util;
-
-import com.microsoft.playwright.impl.driver.Driver;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.*;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Copy of <a href="https://github.com/microsoft/playwright-java/blob/8c0231b0f739656e8a86bc58fca9ee778ddc571b/driver-bundle/src/main/java/com/microsoft/playwright/impl/driver/jar/DriverJar.java">DriverJar</a>
- * with support for pre-installing chromium and only supports chromium playwright
- */
-public class DriverJar extends Driver {
-  private static final String PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD";
-  private static final String SELENIUM_REMOTE_URL = "SELENIUM_REMOTE_URL";
-  static final String PLAYWRIGHT_NODEJS_PATH = "PLAYWRIGHT_NODEJS_PATH";
-  private final Path driverTempDir;
-  private Path preinstalledNodePath;
-
-  public DriverJar() throws IOException {
-    // Allow specifying custom path for the driver installation
-    // See https://github.com/microsoft/playwright-java/issues/728
-    String alternativeTmpdir = System.getProperty("playwright.driver.tmpdir");
-    String prefix = "playwright-java-";
-    driverTempDir = alternativeTmpdir == null
-            ? Files.createTempDirectory(prefix)
-            : Files.createTempDirectory(Paths.get(alternativeTmpdir), prefix);
-    driverTempDir.toFile().deleteOnExit();
-    String nodePath = System.getProperty("playwright.nodejs.path");
-    if (nodePath != null) {
-      preinstalledNodePath = Paths.get(nodePath);
-      if (!Files.exists(preinstalledNodePath)) {
-        throw new RuntimeException("Invalid Node.js path specified: " + nodePath);
-      }
-    }
-    logMessage("created DriverJar: " + driverTempDir);
-  }
-
-  @Override
-  protected void initialize(Boolean installBrowsers) throws Exception {
-    if (preinstalledNodePath == null && env.containsKey(PLAYWRIGHT_NODEJS_PATH)) {
-      preinstalledNodePath = Paths.get(env.get(PLAYWRIGHT_NODEJS_PATH));
-      if (!Files.exists(preinstalledNodePath)) {
-        throw new RuntimeException("Invalid Node.js path specified: " + preinstalledNodePath);
-      }
-    } else if (preinstalledNodePath != null) {
-      // Pass the env variable to the driver process.
-      env.put(PLAYWRIGHT_NODEJS_PATH, preinstalledNodePath.toString());
-    }
-    extractDriverToTempDir();
-    logMessage("extracted driver from jar to " + driverPath());
-    if (installBrowsers)
-      installBrowsers(env);
-  }
-
-  private void installBrowsers(Map<String, String> env) throws IOException, InterruptedException {
-    String skip = env.get(PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD);
-    if (skip == null) {
-      skip = System.getenv(PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD);
-    }
-    if (skip != null && !"0".equals(skip) && !"false".equals(skip)) {
-      System.out.println("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
-      return;
-    }
-    if (env.get(SELENIUM_REMOTE_URL) != null || System.getenv(SELENIUM_REMOTE_URL) != null) {
-      logMessage("Skipping browsers download because `SELENIUM_REMOTE_URL` env variable is set");
-      return;
-    }
-    Chromium.preinstall(platformDir());
-    Path driver = driverPath();
-    if (!Files.exists(driver)) {
-      throw new RuntimeException("Failed to find driver: " + driver);
-    }
-    ProcessBuilder pb = createProcessBuilder();
-    pb.command().add("install");
-    pb.command().add("chromium");
-    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
-    Process p = pb.start();
-    boolean result = p.waitFor(10, TimeUnit.MINUTES);
-    if (!result) {
-      p.destroy();
-      throw new RuntimeException("Timed out waiting for browsers to install");
-    }
-    if (p.exitValue() != 0) {
-      throw new RuntimeException("Failed to install browsers, exit code: " + p.exitValue());
-    }
-  }
-
-  private static boolean isExecutable(Path filePath) {
-    String name = filePath.getFileName().toString();
-    return name.endsWith(".sh") || name.endsWith(".exe") || !name.contains(".");
-  }
-
-  private FileSystem initFileSystem(URI uri) throws IOException {
-    try {
-      return FileSystems.newFileSystem(uri, Collections.emptyMap());
-    } catch (FileSystemAlreadyExistsException e) {
-      return null;
-    }
-  }
-
-  public static URI getDriverResourceURI() throws URISyntaxException {
-    ClassLoader classloader = Thread.currentThread().getContextClassLoader();
-    return classloader.getResource("driver/" + platformDir()).toURI();
-  }
-
-  void extractDriverToTempDir() throws URISyntaxException, IOException {
-    URI originalUri = getDriverResourceURI();
-    URI uri = maybeExtractNestedJar(originalUri);
-
-    // Create zip filesystem if loading from jar.
-    try (FileSystem fileSystem = "jar".equals(uri.getScheme()) ? initFileSystem(uri) : null) {
-      Path srcRoot = Paths.get(uri);
-      // jar file system's .relativize gives wrong results when used with
-      // spring-boot-maven-plugin, convert to the default filesystem to
-      // have predictable results.
-      // See https://github.com/microsoft/playwright-java/issues/306
-      Path srcRootDefaultFs = Paths.get(srcRoot.toString());
-      Files.walk(srcRoot).forEach(fromPath -> {
-        if (preinstalledNodePath != null) {
-          String fileName = fromPath.getFileName().toString();
-          if ("node.exe".equals(fileName) || "node".equals(fileName)) {
-            return;
-          }
-        }
-        Path relative = srcRootDefaultFs.relativize(Paths.get(fromPath.toString()));
-        Path toPath = driverTempDir.resolve(relative.toString());
-        try {
-          if (Files.isDirectory(fromPath)) {
-            Files.createDirectories(toPath);
-          } else {
-            Files.copy(fromPath, toPath);
-            if (isExecutable(toPath)) {
-              toPath.toFile().setExecutable(true, true);
-            }
-          }
-          toPath.toFile().deleteOnExit();
-        } catch (IOException e) {
-          throw new RuntimeException("Failed to extract driver from " + uri + ", full uri: " + originalUri, e);
-        }
-      });
-    }
-  }
-
-  private URI maybeExtractNestedJar(final URI uri) throws URISyntaxException {
-    if (!"jar".equals(uri.getScheme())) {
-      return uri;
-    }
-    final String JAR_URL_SEPARATOR = "!/";
-    String[] parts = uri.toString().split("!/");
-    if (parts.length != 3) {
-      return uri;
-    }
-    String innerJar = String.join(JAR_URL_SEPARATOR, parts[0], parts[1]);
-    URI jarUri = new URI(innerJar);
-    try (FileSystem fs = FileSystems.newFileSystem(jarUri, Collections.emptyMap())) {
-      Path fromPath = Paths.get(jarUri);
-      Path toPath = driverTempDir.resolve(fromPath.getFileName().toString());
-      Files.copy(fromPath, toPath);
-      toPath.toFile().deleteOnExit();
-      return new URI("jar:" + toPath.toUri() + JAR_URL_SEPARATOR + parts[2]);
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to extract driver's nested .jar from " + jarUri + "; full uri: " + uri, e);
-    }
-  }
-
-  private static String platformDir() {
-    String name = System.getProperty("os.name").toLowerCase();
-    String arch = System.getProperty("os.arch").toLowerCase();
-
-    if (name.contains("windows")) {
-      return "win32_x64";
-    }
-    if (name.contains("linux")) {
-      if (arch.equals("aarch64")) {
-        return "linux-arm64";
-      } else {
-        return "linux";
-      }
-    }
-    if (name.contains("mac os x")) {
-      return "mac";
-    }
-    throw new RuntimeException("Unexpected os.name value: " + name);
-  }
-
-  @Override
-  protected Path driverDir() {
-    return driverTempDir;
-  }
-}

server/src/main/kotlin/eu/kanade/domain/track/service/TrackPreferences.kt

@@ -1,33 +0,0 @@
-package eu.kanade.domain.track.service
-
-import eu.kanade.tachiyomi.data.track.TrackService
-// import eu.kanade.tachiyomi.data.track.anilist.Anilist
-import tachiyomi.core.preference.PreferenceStore
-
-class TrackPreferences(
-    private val preferenceStore: PreferenceStore
-) {
-
-    fun trackUsername(sync: TrackService) = preferenceStore.getString(trackUsername(sync.id), "")
-
-    fun trackPassword(sync: TrackService) = preferenceStore.getString(trackPassword(sync.id), "")
-
-    fun setTrackCredentials(sync: TrackService, username: String, password: String) {
-        trackUsername(sync).set(username)
-        trackPassword(sync).set(password)
-    }
-
-    fun trackToken(sync: TrackService) = preferenceStore.getString(trackToken(sync.id), "")
-
-//    fun anilistScoreType() = preferenceStore.getString("anilist_score_type", Anilist.POINT_10)
-
-    fun autoUpdateTrack() = preferenceStore.getBoolean("pref_auto_update_manga_sync_key", true)
-
-    companion object {
-        fun trackUsername(syncId: Long) = "pref_mangasync_username_$syncId"
-
-        private fun trackPassword(syncId: Long) = "pref_mangasync_password_$syncId"
-
-        private fun trackToken(syncId: Long) = "track_token_$syncId"
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/database/models/Track.kt

@@ -1,46 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-import java.io.Serializable
-
-interface Track : Serializable {
-
-    var id: Long?
-
-    var manga_id: Long
-
-    var sync_id: Int
-
-    var media_id: Long
-
-    var library_id: Long?
-
-    var title: String
-
-    var last_chapter_read: Float
-
-    var total_chapters: Int
-
-    var score: Float
-
-    var status: Int
-
-    var started_reading_date: Long
-
-    var finished_reading_date: Long
-
-    var tracking_url: String
-
-    fun copyPersonalFrom(other: Track) {
-        last_chapter_read = other.last_chapter_read
-        score = other.score
-        status = other.status
-        started_reading_date = other.started_reading_date
-        finished_reading_date = other.finished_reading_date
-    }
-
-    companion object {
-        fun create(serviceId: Long): Track = TrackImpl().apply {
-            sync_id = serviceId.toInt()
-        }
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/database/models/TrackImpl.kt

@@ -1,30 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-class TrackImpl : Track {
-
-    override var id: Long? = null
-
-    override var manga_id: Long = 0
-
-    override var sync_id: Int = 0
-
-    override var media_id: Long = 0
-
-    override var library_id: Long? = null
-
-    override lateinit var title: String
-
-    override var last_chapter_read: Float = 0F
-
-    override var total_chapters: Int = 0
-
-    override var score: Float = 0f
-
-    override var status: Int = 0
-
-    override var started_reading_date: Long = 0
-
-    override var finished_reading_date: Long = 0
-
-    override var tracking_url: String = ""
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/EnhancedTrackService.kt

@@ -1,41 +0,0 @@
-package eu.kanade.tachiyomi.data.track
-
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
-import eu.kanade.tachiyomi.source.Source
-import tachiyomi.domain.manga.model.Manga
-import tachiyomi.domain.track.model.Track
-
-/**
- * An Enhanced Track Service will never prompt the user to match a manga with the remote.
- * It is expected that such Track Service can only work with specific sources and unique IDs.
- */
-interface EnhancedTrackService {
-    /**
-     * This TrackService will only work with the sources that are accepted by this filter function.
-     */
-    fun accept(source: Source): Boolean {
-        return source::class.qualifiedName in getAcceptedSources()
-    }
-
-    /**
-     * Fully qualified source classes that this track service is compatible with.
-     */
-    fun getAcceptedSources(): List<String>
-
-    fun loginNoop()
-
-    /**
-     * match is similar to TrackService.search, but only return zero or one match.
-     */
-    suspend fun match(manga: Manga): TrackSearch?
-
-    /**
-     * Checks whether the provided source/track/manga triplet is from this TrackService
-     */
-    fun isTrackFrom(track: Track, manga: Manga, source: Source?): Boolean
-
-    /**
-     * Migrates the given track for the manga to the newSource, if possible
-     */
-    fun migrateTrack(track: Track, manga: Manga, newSource: Source): Track?
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/TrackManager.kt

@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.data.track
-
-// import eu.kanade.tachiyomi.data.track.anilist.Anilist
-// import eu.kanade.tachiyomi.data.track.bangumi.Bangumi
-// import eu.kanade.tachiyomi.data.track.kavita.Kavita
-// import eu.kanade.tachiyomi.data.track.kitsu.Kitsu
-// import eu.kanade.tachiyomi.data.track.komga.Komga
-import eu.kanade.tachiyomi.data.track.mangaupdates.MangaUpdates
-// import eu.kanade.tachiyomi.data.track.myanimelist.MyAnimeList
-// import eu.kanade.tachiyomi.data.track.shikimori.Shikimori
-// import eu.kanade.tachiyomi.data.track.suwayomi.Suwayomi
-
-class TrackManager {
-
-    companion object {
-        const val MYANIMELIST = 1L
-        const val ANILIST = 2L
-        const val KITSU = 3L
-        const val SHIKIMORI = 4L
-        const val BANGUMI = 5L
-        const val KOMGA = 6L
-        const val MANGA_UPDATES = 7L
-        const val KAVITA = 8L
-        const val SUWAYOMI = 9L
-    }
-
-//    val myAnimeList = MyAnimeList(MYANIMELIST)
-//    val aniList = Anilist(ANILIST)
-//    val kitsu = Kitsu(KITSU)
-//    val shikimori = Shikimori(SHIKIMORI)
-//    val bangumi = Bangumi(BANGUMI)
-//    val komga = Komga(KOMGA)
-    val mangaUpdates = MangaUpdates(MANGA_UPDATES)
-//    val kavita = Kavita(KAVITA)
-//    val suwayomi = Suwayomi(SUWAYOMI)
-
-//    val services = listOf(myAnimeList, aniList, kitsu, shikimori, bangumi, komga, mangaUpdates, kavita, suwayomi)
-    val services = listOf(mangaUpdates)
-
-    fun getService(id: Long) = services.find { it.id == id }
-
-    fun hasLoggedServices() = services.any { it.isLogged }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/TrackService.kt

@@ -1,188 +0,0 @@
-package eu.kanade.tachiyomi.data.track
-
-// import androidx.annotation.CallSuper
-// import androidx.annotation.ColorInt
-// import androidx.annotation.DrawableRes
-// import androidx.annotation.StringRes
-// import eu.kanade.domain.base.BasePreferences
-// import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay
-// import eu.kanade.domain.track.model.toDbTrack
-// import eu.kanade.domain.track.model.toDomainTrack
-import eu.kanade.domain.track.service.TrackPreferences
-import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
-import eu.kanade.tachiyomi.network.NetworkHelper
-// import eu.kanade.tachiyomi.util.system.toast
-// import logcat.LogPriority
-import okhttp3.OkHttpClient
-// import tachiyomi.core.util.lang.withIOContext
-// import tachiyomi.core.util.lang.withUIContext
-// import tachiyomi.core.util.system.logcat
-// import tachiyomi.domain.chapter.interactor.GetChapterByMangaId
-// import tachiyomi.domain.track.interactor.InsertTrack
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import tachiyomi.domain.track.model.Track as DomainTrack
-
-abstract class TrackService(val id: Long) {
-
-//    val preferences: BasePreferences by injectLazy()
-    val trackPreferences: TrackPreferences by injectLazy()
-    val networkService: NetworkHelper by injectLazy()
-
-    open val client: OkHttpClient
-        get() = networkService.client
-
-    // Name of the manga sync service to display
-    abstract val name: String
-
-    // Application and remote support for reading dates
-    open val supportsReadingDates: Boolean = false
-
-//    @DrawableRes
-//    abstract fun getLogo(): Int
-
-//    @ColorInt
-//    abstract fun getLogoColor(): Int
-
-    abstract fun getStatusList(): List<Int>
-
-//    @StringRes
-    abstract fun getStatus(status: Int): String?
-
-    abstract fun getReadingStatus(): Int
-
-    abstract fun getRereadingStatus(): Int
-
-    abstract fun getCompletionStatus(): Int
-
-    abstract fun getScoreList(): List<String>
-
-    // TODO: Store all scores as 10 point in the future maybe?
-    open fun get10PointScore(track: DomainTrack): Float {
-        return track.score
-    }
-
-    open fun indexToScore(index: Int): Float {
-        return index.toFloat()
-    }
-
-    abstract fun displayScore(track: Track): String
-
-    abstract suspend fun update(track: Track, didReadChapter: Boolean = false): Track
-
-    abstract suspend fun bind(track: Track, hasReadChapters: Boolean = false): Track
-
-    abstract suspend fun search(query: String): List<TrackSearch>
-
-    abstract suspend fun refresh(track: Track): Track
-
-    abstract suspend fun login(username: String, password: String)
-
-//    @CallSuper
-    open fun logout() {
-        trackPreferences.setTrackCredentials(this, "", "")
-    }
-
-    open val isLogged: Boolean
-        get() = getUsername().isNotEmpty() &&
-            getPassword().isNotEmpty()
-
-    fun getUsername() = trackPreferences.trackUsername(this).get()
-
-    fun getPassword() = trackPreferences.trackPassword(this).get()
-
-    fun saveCredentials(username: String, password: String) {
-        trackPreferences.setTrackCredentials(this, username, password)
-    }
-
-    fun withIOContext(body: () -> Unit) { body() }
-    fun withUIContext(body: () -> Unit) { body() }
-
-    fun registerTracking(item: Track, mangaId: Long) {
-//        item.manga_id = mangaId
-//        try {
-//            withIOContext {
-//                val allChapters = Injekt.get<GetChapterByMangaId>().await(mangaId)
-//                val hasReadChapters = allChapters.any { it.read }
-//                bind(item, hasReadChapters)
-//
-//                val track = item.toDomainTrack(idRequired = false) ?: return@withIOContext
-//
-//                Injekt.get<InsertTrack>().await(track)
-//
-//                // Update chapter progress if newer chapters marked read locally
-//                if (hasReadChapters) {
-//                    val latestLocalReadChapterNumber = allChapters
-//                        .sortedBy { it.chapterNumber }
-//                        .takeWhile { it.read }
-//                        .lastOrNull()
-//                        ?.chapterNumber?.toDouble() ?: -1.0
-//
-//                    if (latestLocalReadChapterNumber > track.lastChapterRead) {
-//                        val updatedTrack = track.copy(
-//                            lastChapterRead = latestLocalReadChapterNumber
-//                        )
-//                        setRemoteLastChapterRead(updatedTrack.toDbTrack(), latestLocalReadChapterNumber.toInt())
-//                    }
-//                }
-//
-//                if (this is EnhancedTrackService) {
-// //                    Injekt.get<SyncChaptersWithTrackServiceTwoWay>().await(allChapters, track, this@TrackService)
-//                }
-//            }
-//        } catch (e: Throwable) {
-//            withUIContext {
-// //                Injekt.get<Application>().toast(e.message)
-//            }
-//        }
-    }
-
-    fun setRemoteStatus(track: Track, status: Int) {
-        track.status = status
-        if (track.status == getCompletionStatus() && track.total_chapters != 0) {
-            track.last_chapter_read = track.total_chapters.toFloat()
-        }
-        withIOContext { updateRemote(track) }
-    }
-
-    fun setRemoteLastChapterRead(track: Track, chapterNumber: Int) {
-        if (track.last_chapter_read == 0F && track.last_chapter_read < chapterNumber && track.status != getRereadingStatus()) {
-            track.status = getReadingStatus()
-        }
-        track.last_chapter_read = chapterNumber.toFloat()
-        if (track.total_chapters != 0 && track.last_chapter_read.toInt() == track.total_chapters) {
-            track.status = getCompletionStatus()
-        }
-        withIOContext { updateRemote(track) }
-    }
-
-    fun setRemoteScore(track: Track, scoreString: String) {
-        track.score = indexToScore(getScoreList().indexOf(scoreString))
-        withIOContext { updateRemote(track) }
-    }
-
-    fun setRemoteStartDate(track: Track, epochMillis: Long) {
-        track.started_reading_date = epochMillis
-        withIOContext { updateRemote(track) }
-    }
-
-    fun setRemoteFinishDate(track: Track, epochMillis: Long) {
-        track.finished_reading_date = epochMillis
-        withIOContext { updateRemote(track) }
-    }
-
-    private fun updateRemote(track: Track) {
-//        withIOContext {
-//            try {
-//                update(track)
-//                track.toDomainTrack(idRequired = false)?.let {
-//                    Injekt.get<InsertTrack>().await(it)
-//                }
-//            } catch (e: Exception) {
-//                logcat(LogPriority.ERROR, e) { "Failed to update remote track data id=$id" }
-//                withUIContext { Injekt.get<Application>().toast(e.message) }
-//            }
-//        }
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt

@@ -1,101 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates
-
-// import android.graphics.Color
-// import androidx.annotation.StringRes
-// import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.track.TrackService
-import eu.kanade.tachiyomi.data.track.mangaupdates.dto.copyTo
-import eu.kanade.tachiyomi.data.track.mangaupdates.dto.toTrackSearch
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
-
-class MangaUpdates(id: Long) : TrackService(id) {
-
-    companion object {
-        const val READING_LIST = 0
-        const val WISH_LIST = 1
-        const val COMPLETE_LIST = 2
-        const val UNFINISHED_LIST = 3
-        const val ON_HOLD_LIST = 4
-    }
-
-    private val interceptor by lazy { MangaUpdatesInterceptor(this) }
-
-    private val api by lazy { MangaUpdatesApi(interceptor, client) }
-
-    override val name: String = "MangaUpdates"
-
-//    override fun getLogo(): Int = R.drawable.ic_manga_updates
-
-//    override fun getLogoColor(): Int = Color.rgb(146, 160, 173)
-
-    override fun getStatusList(): List<Int> {
-        return listOf(READING_LIST, COMPLETE_LIST, ON_HOLD_LIST, UNFINISHED_LIST, WISH_LIST)
-    }
-
-//    @StringRes
-    override fun getStatus(status: Int): String? = when (status) {
-        READING_LIST -> "Reading List"
-        WISH_LIST -> "Wish List"
-        COMPLETE_LIST -> "Complete List"
-        ON_HOLD_LIST -> ">On Hold List"
-        UNFINISHED_LIST -> "Unfinished List"
-        else -> null
-    }
-
-    override fun getReadingStatus(): Int = READING_LIST
-
-    override fun getRereadingStatus(): Int = -1
-
-    override fun getCompletionStatus(): Int = COMPLETE_LIST
-
-    private val _scoreList = (0..9).flatMap { i -> (0..9).map { j -> "$i.$j" } } + listOf("10.0")
-
-    override fun getScoreList(): List<String> = _scoreList
-
-    override fun indexToScore(index: Int): Float = _scoreList[index].toFloat()
-
-    override fun displayScore(track: Track): String = track.score.toString()
-
-    override suspend fun update(track: Track, didReadChapter: Boolean): Track {
-        if (track.status != COMPLETE_LIST && didReadChapter) {
-            track.status = READING_LIST
-        }
-        api.updateSeriesListItem(track)
-        return track
-    }
-
-    override suspend fun bind(track: Track, hasReadChapters: Boolean): Track {
-        return try {
-            val (series, rating) = api.getSeriesListItem(track)
-            series.copyTo(track)
-            rating?.copyTo(track) ?: track
-        } catch (e: Exception) {
-            api.addSeriesToList(track, hasReadChapters)
-            track
-        }
-    }
-
-    override suspend fun search(query: String): List<TrackSearch> {
-        return api.search(query)
-            .map {
-                it.toTrackSearch(id)
-            }
-    }
-
-    override suspend fun refresh(track: Track): Track {
-        val (series, rating) = api.getSeriesListItem(track)
-        series.copyTo(track)
-        return rating?.copyTo(track) ?: track
-    }
-
-    override suspend fun login(username: String, password: String) {
-        val authenticated = api.authenticate(username, password) ?: throw Throwable("Unable to login")
-        saveCredentials(authenticated.uid.toString(), authenticated.sessionToken)
-        interceptor.newAuth(authenticated.sessionToken)
-    }
-
-    fun restoreSession(): String? {
-        return trackPreferences.trackPassword(this).get()
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt

@@ -1,196 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates
-
-import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.track.mangaupdates.MangaUpdates.Companion.READING_LIST
-import eu.kanade.tachiyomi.data.track.mangaupdates.MangaUpdates.Companion.WISH_LIST
-import eu.kanade.tachiyomi.data.track.mangaupdates.dto.Context
-import eu.kanade.tachiyomi.data.track.mangaupdates.dto.ListItem
-import eu.kanade.tachiyomi.data.track.mangaupdates.dto.Rating
-import eu.kanade.tachiyomi.data.track.mangaupdates.dto.Record
-import eu.kanade.tachiyomi.network.DELETE
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.PUT
-import eu.kanade.tachiyomi.network.awaitSuccess
-import eu.kanade.tachiyomi.network.parseAs
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.add
-import kotlinx.serialization.json.addJsonObject
-import kotlinx.serialization.json.buildJsonArray
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.decodeFromJsonElement
-import kotlinx.serialization.json.jsonArray
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.put
-import kotlinx.serialization.json.putJsonObject
-// import logcat.LogPriority
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody.Companion.toRequestBody
-// import tachiyomi.core.util.system.logcat
-import uy.kohesive.injekt.injectLazy
-
-class MangaUpdatesApi(
-    interceptor: MangaUpdatesInterceptor,
-    private val client: OkHttpClient
-) {
-    private val json: Json by injectLazy()
-
-    private val baseUrl = "https://api.mangaupdates.com"
-    private val contentType = "application/vnd.api+json".toMediaType()
-
-    private val authClient by lazy {
-        client.newBuilder()
-            .addInterceptor(interceptor)
-            .build()
-    }
-
-    suspend fun getSeriesListItem(track: Track): Pair<ListItem, Rating?> {
-        val listItem = with(json) {
-            authClient.newCall(GET("$baseUrl/v1/lists/series/${track.media_id}"))
-                .awaitSuccess()
-                .parseAs<ListItem>()
-        }
-
-        val rating = getSeriesRating(track)
-
-        return listItem to rating
-    }
-
-    suspend fun addSeriesToList(track: Track, hasReadChapters: Boolean) {
-        val status = if (hasReadChapters) READING_LIST else WISH_LIST
-        val body = buildJsonArray {
-            addJsonObject {
-                putJsonObject("series") {
-                    put("id", track.media_id)
-                }
-                put("list_id", status)
-            }
-        }
-        authClient.newCall(
-            POST(
-                url = "$baseUrl/v1/lists/series",
-                body = body.toString().toRequestBody(contentType)
-            )
-        )
-            .awaitSuccess()
-            .let {
-                if (it.code == 200) {
-                    track.status = status
-                    track.last_chapter_read = 1f
-                }
-            }
-    }
-
-    suspend fun updateSeriesListItem(track: Track) {
-        val body = buildJsonArray {
-            addJsonObject {
-                putJsonObject("series") {
-                    put("id", track.media_id)
-                }
-                put("list_id", track.status)
-                putJsonObject("status") {
-                    put("chapter", track.last_chapter_read.toInt())
-                }
-            }
-        }
-        authClient.newCall(
-            POST(
-                url = "$baseUrl/v1/lists/series/update",
-                body = body.toString().toRequestBody(contentType)
-            )
-        )
-            .awaitSuccess()
-
-        updateSeriesRating(track)
-    }
-
-    private suspend fun getSeriesRating(track: Track): Rating? {
-        return try {
-            with(json) {
-                authClient.newCall(GET("$baseUrl/v1/series/${track.media_id}/rating"))
-                    .awaitSuccess()
-                    .parseAs<Rating>()
-            }
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    private suspend fun updateSeriesRating(track: Track) {
-        if (track.score != 0f) {
-            val body = buildJsonObject {
-                put("rating", track.score)
-            }
-            authClient.newCall(
-                PUT(
-                    url = "$baseUrl/v1/series/${track.media_id}/rating",
-                    body = body.toString().toRequestBody(contentType)
-                )
-            )
-                .awaitSuccess()
-        } else {
-            authClient.newCall(
-                DELETE(
-                    url = "$baseUrl/v1/series/${track.media_id}/rating"
-                )
-            )
-                .awaitSuccess()
-        }
-    }
-
-    suspend fun search(query: String): List<Record> {
-        val body = buildJsonObject {
-            put("search", query)
-            put(
-                "filter_types",
-                buildJsonArray {
-                    add("drama cd")
-                    add("novel")
-                }
-            )
-        }
-        return with(json) {
-            client.newCall(
-                POST(
-                    url = "$baseUrl/v1/series/search",
-                    body = body.toString().toRequestBody(contentType)
-                )
-            )
-                .awaitSuccess()
-                .parseAs<JsonObject>()
-                .let { obj ->
-                    obj["results"]?.jsonArray?.map { element ->
-                        json.decodeFromJsonElement<Record>(element.jsonObject["record"]!!)
-                    }
-                }
-                .orEmpty()
-        }
-    }
-
-    suspend fun authenticate(username: String, password: String): Context? {
-        val body = buildJsonObject {
-            put("username", username)
-            put("password", password)
-        }
-        return with(json) {
-            client.newCall(
-                PUT(
-                    url = "$baseUrl/v1/account/login",
-                    body = body.toString().toRequestBody(contentType)
-                )
-            )
-                .awaitSuccess()
-                .parseAs<JsonObject>()
-                .let { obj ->
-                    try {
-                        json.decodeFromJsonElement<Context>(obj["context"]!!)
-                    } catch (e: Exception) {
-//                        logcat(LogPriority.ERROR, e)
-                        null
-                    }
-                }
-        }
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesInterceptor.kt

@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates
-
-import okhttp3.Interceptor
-import okhttp3.Response
-import java.io.IOException
-
-class MangaUpdatesInterceptor(
-    mangaUpdates: MangaUpdates
-) : Interceptor {
-
-    private var token: String? = mangaUpdates.restoreSession()
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val originalRequest = chain.request()
-
-        val token = token ?: throw IOException("Not authenticated with MangaUpdates")
-
-        // Add the authorization header to the original request.
-        val authRequest = originalRequest.newBuilder()
-            .addHeader("Authorization", "Bearer $token")
-            .build()
-
-        return chain.proceed(authRequest)
-    }
-
-    fun newAuth(token: String?) {
-        this.token = token
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/dto/Context.kt

@@ -1,11 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates.dto
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Context(
-    @SerialName("session_token")
-    val sessionToken: String,
-    val uid: Long
-)

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/dto/Image.kt

@@ -1,10 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates.dto
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Image(
-    val url: Url? = null,
-    val height: Int? = null,
-    val width: Int? = null
-)

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/dto/ListItem.kt

@@ -1,22 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates.dto
-
-import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.track.mangaupdates.MangaUpdates.Companion.READING_LIST
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ListItem(
-    val series: Series? = null,
-    @SerialName("list_id")
-    val listId: Int? = null,
-    val status: Status? = null,
-    val priority: Int? = null
-)
-
-fun ListItem.copyTo(track: Track): Track {
-    return track.apply {
-        this.status = listId ?: READING_LIST
-        this.last_chapter_read = this@copyTo.status?.chapter?.toFloat() ?: 0f
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/dto/Rating.kt

@@ -1,15 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates.dto
-
-import eu.kanade.tachiyomi.data.database.models.Track
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Rating(
-    val rating: Float? = null
-)
-
-fun Rating.copyTo(track: Track): Track {
-    return track.apply {
-        this.score = rating ?: 0f
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/dto/Record.kt

@@ -1,38 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates.dto
-
-import eu.kanade.tachiyomi.data.track.model.TrackSearch
-import eu.kanade.tachiyomi.util.lang.htmlDecode
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Record(
-    @SerialName("series_id")
-    val seriesId: Long? = null,
-    val title: String? = null,
-    val url: String? = null,
-    val description: String? = null,
-    val image: Image? = null,
-    val type: String? = null,
-    val year: String? = null,
-    @SerialName("bayesian_rating")
-    val bayesianRating: Double? = null,
-    @SerialName("rating_votes")
-    val ratingVotes: Int? = null,
-    @SerialName("latest_chapter")
-    val latestChapter: Int? = null
-)
-
-fun Record.toTrackSearch(id: Long): TrackSearch {
-    return TrackSearch.create(id).apply {
-        media_id = this@toTrackSearch.seriesId ?: 0L
-        title = this@toTrackSearch.title?.htmlDecode() ?: ""
-        total_chapters = 0
-        cover_url = this@toTrackSearch.image?.url?.original ?: ""
-        summary = this@toTrackSearch.description?.htmlDecode() ?: ""
-        tracking_url = this@toTrackSearch.url ?: ""
-        publishing_status = ""
-        publishing_type = this@toTrackSearch.type.toString()
-        start_date = this@toTrackSearch.year.toString()
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/dto/Series.kt

@@ -1,9 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates.dto
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Series(
-    val id: Long? = null,
-    val title: String? = null
-)

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/dto/Status.kt

@@ -1,9 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates.dto
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Status(
-    val volume: Int? = null,
-    val chapter: Int? = null
-)

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/mangaupdates/dto/Url.kt

@@ -1,9 +0,0 @@
-package eu.kanade.tachiyomi.data.track.mangaupdates.dto
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Url(
-    val original: String? = null,
-    val thumb: String? = null
-)

server/src/main/kotlin/eu/kanade/tachiyomi/data/track/model/TrackSearch.kt

@@ -1,68 +0,0 @@
-package eu.kanade.tachiyomi.data.track.model
-
-import eu.kanade.tachiyomi.data.database.models.Track
-
-class TrackSearch : Track {
-
-    override var id: Long? = null
-
-    override var manga_id: Long = 0
-
-    override var sync_id: Int = 0
-
-    override var media_id: Long = 0
-
-    override var library_id: Long? = null
-
-    override lateinit var title: String
-
-    override var last_chapter_read: Float = 0F
-
-    override var total_chapters: Int = 0
-
-    override var score: Float = 0f
-
-    override var status: Int = 0
-
-    override var started_reading_date: Long = 0
-
-    override var finished_reading_date: Long = 0
-
-    override lateinit var tracking_url: String
-
-    var cover_url: String = ""
-
-    var summary: String = ""
-
-    var publishing_status: String = ""
-
-    var publishing_type: String = ""
-
-    var start_date: String = ""
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TrackSearch
-
-        if (manga_id != other.manga_id) return false
-        if (sync_id != other.sync_id) return false
-        if (media_id != other.media_id) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = manga_id.hashCode()
-        result = 31 * result + sync_id
-        result = 31 * result + media_id.hashCode()
-        return result
-    }
-
-    companion object {
-        fun create(serviceId: Long): TrackSearch = TrackSearch().apply {
-            sync_id = serviceId.toInt()
-        }
-    }
-}

server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt

@@ -89,11 +89,6 @@ suspend fun Call.await(): Response {
     }
 }
 
-suspend fun Call.awaitSuccess(): Response {
-    // awaitSuccess is a renamed version of our await, they added a new await that allows non-success error codes
-    return await()
-}
-
 fun Call.asObservableSuccess(): Observable<Response> {
     return asObservable()
         .doOnNext { response ->

server/src/main/kotlin/eu/kanade/tachiyomi/network/Requests.kt

@@ -4,7 +4,6 @@ import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.RequestBody
 import java.util.concurrent.TimeUnit.MINUTES
@@ -18,7 +17,11 @@ fun GET(
     headers: Headers = DEFAULT_HEADERS,
     cache: CacheControl = DEFAULT_CACHE_CONTROL
 ): Request {
-    return GET(url.toHttpUrl(), headers, cache)
+    return Request.Builder()
+        .url(url)
+        .headers(headers)
+        .cacheControl(cache)
+        .build()
 }
 
 /**
@@ -49,31 +52,3 @@ fun POST(
         .cacheControl(cache)
         .build()
 }
-
-fun PUT(
-    url: String,
-    headers: Headers = DEFAULT_HEADERS,
-    body: RequestBody = DEFAULT_BODY,
-    cache: CacheControl = DEFAULT_CACHE_CONTROL
-): Request {
-    return Request.Builder()
-        .url(url)
-        .put(body)
-        .headers(headers)
-        .cacheControl(cache)
-        .build()
-}
-
-fun DELETE(
-    url: String,
-    headers: Headers = DEFAULT_HEADERS,
-    body: RequestBody = DEFAULT_BODY,
-    cache: CacheControl = DEFAULT_CACHE_CONTROL
-): Request {
-    return Request.Builder()
-        .url(url)
-        .delete(body)
-        .headers(headers)
-        .cacheControl(cache)
-        .build()
-}

server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt

@@ -1,24 +1,29 @@
 package eu.kanade.tachiyomi.network.interceptor
 
-import com.microsoft.playwright.Browser
-import com.microsoft.playwright.BrowserType.LaunchOptions
-import com.microsoft.playwright.Page
-import com.microsoft.playwright.Playwright
-import com.microsoft.playwright.PlaywrightException
 import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.network.interceptor.CFClearance.resolveWithWebView
+import eu.kanade.tachiyomi.network.interceptor.CloudflareBypasser.resolveWithWebView
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import mu.KotlinLogging
 import okhttp3.Cookie
 import okhttp3.HttpUrl
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
-import suwayomi.tachidesk.server.ServerConfig
+import org.kodein.di.DI
+import org.kodein.di.conf.global
+import org.kodein.di.instance
 import suwayomi.tachidesk.server.serverConfig
 import uy.kohesive.injekt.injectLazy
+import java.io.BufferedReader
+import java.io.Closeable
+import java.io.File
 import java.io.IOException
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.DurationUnit
+import java.io.InputStreamReader
+import java.io.PrintWriter
+import java.nio.file.Paths
+import java.util.concurrent.TimeUnit
 
 class CloudflareInterceptor : Interceptor {
     private val logger = KotlinLogging.logger {}
@@ -38,10 +43,12 @@ class CloudflareInterceptor : Interceptor {
             return originalResponse
         }
 
-        throw IOException("playwrite is diabled for v0.6.7")
-
         logger.debug { "Cloudflare anti-bot is on, CloudflareInterceptor is kicking in..." }
 
+        if (!serverConfig.webviewEnabled) {
+            throw CloudflareBypassException("Webview is disabled, enable it in server config")
+        }
+
         return try {
             originalResponse.close()
             network.cookies.remove(originalRequest.url.toUri())
@@ -63,43 +70,43 @@ class CloudflareInterceptor : Interceptor {
     }
 }
 
-/*
- * This class is ported from https://github.com/vvanglro/cf-clearance
- * The original code is licensed under Apache 2.0
-*/
-object CFClearance {
+object CloudflareBypasser {
     private val logger = KotlinLogging.logger {}
     private val network: NetworkHelper by injectLazy()
 
-    init {
-        // Fix the default DriverJar issue by providing our own implementation
-        // ref: https://github.com/microsoft/playwright-java/issues/1138
-        System.setProperty("playwright.driver.impl", "suwayomi.tachidesk.server.util.DriverJar")
-    }
-
     fun resolveWithWebView(originalRequest: Request): Request {
         val url = originalRequest.url.toString()
 
         logger.debug { "resolveWithWebView($url)" }
 
-        val cookies = Playwright.create().use { playwright ->
-            playwright.chromium().launch(
-                LaunchOptions()
-                    .setHeadless(false)
-                    .apply {
-                        if (serverConfig.socksProxyEnabled) {
-                            setProxy("socks5://${serverConfig.socksProxyHost}:${serverConfig.socksProxyPort}")
-                        }
-                    }
-            ).use { browser ->
-                val userAgent = originalRequest.header("User-Agent")
-                if (userAgent != null) {
-                    browser.newContext(Browser.NewContextOptions().setUserAgent(userAgent)).use { browserContext ->
-                        browserContext.newPage().use { getCookies(it, url) }
-                    }
-                } else {
-                    browser.newPage().use { getCookies(it, url) }
+        val cookies = PythonInterpreter.create().use { py ->
+            try {
+                py.exec("import undetected_chromedriver as uc")
+
+                py.exec("options = uc.ChromeOptions()")
+
+                if (serverConfig.socksProxyEnabled) {
+                    val proxy = "socks5://${serverConfig.socksProxyHost}:${serverConfig.socksProxyPort}"
+                    py.exec("options.add_argument('--proxy-server=$proxy')")
                 }
+//                py.exec("driver = uc.Chrome(options=options)")
+                py.exec("driver = uc.Chrome(options=options, driver_executable_path='${py.chromedriverPath.replace("\\","\\\\")}', version_main=111)")
+
+                // TODO: handle custom userAgent
+//                val userAgent = originalRequest.header("User-Agent")
+
+//                if (userAgent != null) {
+//                    browser.newContext(Browser.NewContextOptions().setUserAgent(userAgent)).use { browserContext ->
+//                        browserContext.newPage().use { getCookies(it, url) }
+//                    }
+//                } else {
+//                    browser.newPage().use { getCookies(it, url) }
+//                }
+                py.exec("driver.get('$url')")
+
+                getCookies(py)
+            } finally {
+                py.exec("driver.quit()")
             }
         }
 
@@ -139,44 +146,64 @@ object CFClearance {
 
     fun getWebViewUserAgent(): String {
         return try {
-            throw PlaywrightException("playwrite is diabled for v0.6.7")
-
-            Playwright.create().use { playwright ->
-                playwright.chromium().launch(
-                    LaunchOptions()
-                        .setHeadless(true)
-                ).use { browser ->
-                    browser.newPage().use { page ->
-                        val userAgent = page.evaluate("() => {return navigator.userAgent}") as String
-                        logger.debug { "WebView User-Agent is $userAgent" }
-                        return userAgent
-                    }
-                }
+            if (!serverConfig.webviewEnabled) {
+                throw CloudflareBypassException("Webview is disabled, enable it in server config")
             }
-        } catch (e: PlaywrightException) {
-            // Playwright might fail on headless environments like docker
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
+
+            PythonInterpreter.create().use { py ->
+                py.exec("import undetected_chromedriver as uc")
+
+                py.exec("options = uc.ChromeOptions()")
+                py.exec("options.add_argument('--headless')")
+                py.exec("options.add_argument('--disable-gpu')")
+//                py.exec("driver = uc.Chrome(options=options)")
+                py.exec("driver = uc.Chrome(options=options, driver_executable_path='${py.chromedriverPath.replace("\\","\\\\")}', version_main=111)")
+
+                py.exec("userAgent = driver.execute_script('return navigator.userAgent')")
+                val userAgent = py.getValue("userAgent")
+                py.exec("driver.quit()")
+
+                userAgent
+            }
+        } catch (e: Exception) {
+            // Webview might fail on headless environments like docker
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36"
         }
     }
 
-    private fun getCookies(page: Page, url: String): List<Cookie> {
-        applyStealthInitScripts(page)
-        page.navigate(url)
-        val challengeResolved = waitForChallengeResolve(page)
+    @Serializable
+    data class PythonSeleniumCookie(
+        val domain: String,
+        val expiry: Long?,
+        val httpOnly: Boolean,
+        val name: String,
+        val path: String,
+        val sameSite: String,
+        val secure: Boolean,
+        val value: String
+    )
+
+    private val json by DI.global.instance<Json>()
+    private fun getCookies(py: PythonInterpreter): List<Cookie> {
+        val challengeResolved = waitForChallengeResolve(py)
 
         return if (challengeResolved) {
-            val cookies = page.context().cookies()
+            py.exec("import json")
+            py.exec("cookies = json.dumps(driver.get_cookies())")
+            val cookiesJson = py.getValue("cookies")
+            val cookies = json.decodeFromString<List<PythonSeleniumCookie>>(cookiesJson)
 
             logger.debug {
-                val userAgent = page.evaluate("() => {return navigator.userAgent}")
-                "Playwright User-Agent is $userAgent"
+                py.exec("userAgent = driver.execute_script('return navigator.userAgent')")
+                val userAgent = py.getValue("userAgent")
+                "Webview User-Agent is $userAgent"
             }
 
-            // Convert PlayWright cookies to OkHttp cookies
+            // Convert Webview cookies to OkHttp cookies
             cookies.map {
                 Cookie.Builder()
                     .domain(it.domain.removePrefix("."))
-                    .expiresAt(it.expires?.times(1000)?.toLong() ?: Long.MAX_VALUE)
+                    .expiresAt(it.expiry?.times(1000) ?: Long.MAX_VALUE)
                     .name(it.name)
                     .path(it.path)
                     .value(it.value).apply {
@@ -185,39 +212,18 @@ object CFClearance {
                     }.build()
             }
         } else {
-            logger.debug { "Cloudflare challenge failed to resolve" }
-            throw CloudflareBypassException()
+            throw CloudflareBypassException("Cloudflare challenge failed to resolve")
         }
     }
 
-    // ref: https://github.com/vvanglro/cf-clearance/blob/44124a8f06d8d0ecf2bf558a027082ff88dab435/cf_clearance/stealth.py#L18
-    private val stealthInitScripts by lazy {
-        arrayOf(
-            ServerConfig::class.java.getResource("/cloudflare-js/canvas.fingerprinting.js")!!.readText(),
-            ServerConfig::class.java.getResource("/cloudflare-js/chrome.global.js")!!.readText(),
-            ServerConfig::class.java.getResource("/cloudflare-js/emulate.touch.js")!!.readText(),
-            ServerConfig::class.java.getResource("/cloudflare-js/navigator.permissions.js")!!.readText(),
-            ServerConfig::class.java.getResource("/cloudflare-js/navigator.webdriver.js")!!.readText(),
-            ServerConfig::class.java.getResource("/cloudflare-js/chrome.runtime.js")!!.readText(),
-            ServerConfig::class.java.getResource("/cloudflare-js/chrome.plugin.js")!!.readText()
-        )
-    }
-
-    // ref: https://github.com/vvanglro/cf-clearance/blob/44124a8f06d8d0ecf2bf558a027082ff88dab435/cf_clearance/stealth.py#L76
-    private fun applyStealthInitScripts(page: Page) {
-        for (script in stealthInitScripts) {
-            page.addInitScript(script)
-        }
-    }
-
-    // ref: https://github.com/vvanglro/cf-clearance/blob/44124a8f06d8d0ecf2bf558a027082ff88dab435/cf_clearance/retry.py#L21
-    private fun waitForChallengeResolve(page: Page): Boolean {
-        // sometimes the user has to solve the captcha challenge manually, potentially wait a long time
+    private fun waitForChallengeResolve(py: PythonInterpreter): Boolean {
+        // sometimes the user has to solve the captcha challenge manually and multiple times, potentially wait a long time
         val timeoutSeconds = 120
         repeat(timeoutSeconds) {
-            page.waitForTimeout(1.seconds.toDouble(DurationUnit.MILLISECONDS))
+            TimeUnit.SECONDS.sleep(1)
             val success = try {
-                page.querySelector("#challenge-form") == null
+                py.exec("r = driver.execute_script('return document.querySelector(\"#challenge-form\") == null')")
+                py.getValue("r").lowercase().toBoolean()
             } catch (e: Exception) {
                 logger.debug(e) { "query Error" }
                 false
@@ -226,6 +232,113 @@ object CFClearance {
         }
         return false
     }
-
-    private class CloudflareBypassException : Exception()
+}
+private class CloudflareBypassException(message: String?) : Exception(message)
+
+class PythonInterpreter
+private constructor(private val process: Process, val chromedriverPath: String) : Closeable {
+    private val stdin = process.outputStream
+    private val stdout = process.inputStream
+    private val stderr = process.errorStream
+
+    private val stdinWriter = PrintWriter(stdin)
+    private val stdoutReader = BufferedReader(InputStreamReader(stdout))
+    private val stderrReader = BufferedReader(InputStreamReader(stderr))
+
+    private fun rawExec(command: String) {
+        stdinWriter.println(command)
+        stdinWriter.flush()
+    }
+
+    val BUFF_SIZE = 102400
+    fun exec(command: String) {
+        logger.debug { "Python Command: $command" }
+        rawExec(command)
+        makeSureExecDone()
+    }
+
+    private val commandOutputs = mutableListOf<String>()
+
+    fun makeSureExecDone() {
+        val makeSureString = "PYTHON_IS_READY"
+
+        rawExec("print('$makeSureString')")
+        var line: String?
+        do {
+            line = stdoutReader.readLine()
+            if (line != makeSureString) {
+                commandOutputs.add(line)
+            }
+        } while (line != makeSureString)
+
+        val pyError = buildString {
+            while (stderrReader.ready())
+                append(stderr.read().toChar())
+        }
+        if (pyError.isNotEmpty()) {
+            println("Python STDERR: $pyError")
+        }
+    }
+
+    fun getValue(variableName: String): String {
+        exec("print($variableName)")
+        return commandOutputs.last()
+    }
+
+    private fun flushStdoutReader() {
+        var line: String?
+        while (stdoutReader.ready()) {
+            val line = stdoutReader.readLine()
+        }
+    }
+
+    fun destroy() {
+        stdinWriter.close()
+        stdoutReader.close()
+        stderr.close()
+        process.destroy()
+    }
+    override fun close() {
+        destroy()
+    }
+    companion object {
+        private val logger = KotlinLogging.logger {}
+
+        fun create(pythonPath: String, workingDir: String, pythonStartupFile: String, chromedriverPath: String): PythonInterpreter {
+            val processBuilder = ProcessBuilder()
+                .command(pythonPath, "-i", "-q")
+            processBuilder.directory(File(workingDir))
+
+            val environment = processBuilder.environment()
+            environment["PYTHONSTARTUP"] = pythonStartupFile
+
+            val process = processBuilder.start()
+
+            return PythonInterpreter(process, chromedriverPath)
+        }
+
+        fun create(): PythonInterpreter {
+            val uc = Paths.get(serverConfig.undetectedChromePath).toAbsolutePath().toString()
+            logger.debug { "absolute path to undetected-chromedriver: $uc" }
+
+            val (pythonPath, chromedriverPath) = if (System.getProperty("os.name").startsWith("Windows")) {
+                arrayOf(
+                    "$uc\\venv\\Scripts\\python.exe",
+                    "$uc\\chromedriver.exe"
+                )
+            } else {
+                arrayOf(
+                    "$uc/venv/bin/python",
+                    "$uc/chromedriver"
+                )
+            }
+
+            return create(
+                pythonPath,
+                uc,
+                "$uc/console.py",
+                chromedriverPath
+            )
+        }
+    }
 }

server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt

@@ -26,7 +26,6 @@ import kotlinx.serialization.json.intOrNull
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonPrimitive
 import mu.KotlinLogging
-import org.apache.commons.compress.archivers.zip.ZipFile
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
@@ -46,6 +45,7 @@ import java.io.FileInputStream
 import java.io.InputStream
 import java.util.Locale
 import java.util.concurrent.TimeUnit
+import java.util.zip.ZipFile
 
 class LocalSource : CatalogueSource {
     companion object {
@@ -212,12 +212,6 @@ class LocalSource : CatalogueSource {
                 manga.status = obj["status"]?.jsonPrimitive?.intOrNull ?: manga.status
             }
 
-        // update the cover
-        val cover = getCoverFile(File("${applicationDirs.localMangaRoot}/${manga.url}"))
-        if (cover != null && cover.exists()) {
-            manga.thumbnail_url = cover.absolutePath
-        }
-
         return Observable.just(manga)
     }
 
@@ -362,7 +356,7 @@ class LocalSource : CatalogueSource {
             }
             is Format.Zip -> {
                 ZipFile(format.file).use { zip ->
-                    val entry = zip.entries.toList()
+                    val entry = zip.entries().toList()
                         .sortedWith { f1, f2 -> f1.name.compareToCaseInsensitiveNaturalOrder(f2.name) }
                         .find { !it.isDirectory && ImageUtil.isImage(it.name) { zip.getInputStream(it) } }
 

server/src/main/kotlin/eu/kanade/tachiyomi/source/local/loader/ZipPageLoader.kt

@@ -1,9 +1,9 @@
 package eu.kanade.tachiyomi.source.local.loader
 
 import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
-import org.apache.commons.compress.archivers.zip.ZipFile
 import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil
 import java.io.File
+import java.util.zip.ZipFile
 
 class ZipPageLoader(file: File) : PageLoader {
     /**
@@ -16,7 +16,7 @@ class ZipPageLoader(file: File) : PageLoader {
      * comparator.
      */
     override fun getPages(): List<ReaderPage> {
-        return zip.entries.toList()
+        return zip.entries().toList()
             .filter { !it.isDirectory && ImageUtil.isImage(it.name) { zip.getInputStream(it) } }
             .sortedWith { f1, f2 -> f1.name.compareToCaseInsensitiveNaturalOrder(f2.name) }
             .mapIndexed { i, entry ->

server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt

@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.source.online
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.asObservableSuccess
-import eu.kanade.tachiyomi.network.interceptor.CFClearance.getWebViewUserAgent
+import eu.kanade.tachiyomi.network.interceptor.CloudflareBypasser.getWebViewUserAgent
 import eu.kanade.tachiyomi.network.newCallWithProgress
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.FilterList

server/src/main/kotlin/eu/kanade/tachiyomi/util/lang/StringExtensions.kt

@@ -1,8 +1,6 @@
 package eu.kanade.tachiyomi.util.lang
 
 import net.greypanther.natsort.CaseInsensitiveSimpleNaturalComparator
-import org.jsoup.Jsoup
-import org.jsoup.safety.Safelist
 import kotlin.math.floor
 
 /**
@@ -58,10 +56,3 @@ fun String.takeBytes(n: Int): String {
         bytes.decodeToString(endIndex = n).replace("\uFFFD", "")
     }
 }
-
-/**
- * HTML-decode the string
- */
-fun String.htmlDecode(): String {
-    return Jsoup.clean(this, Safelist.none()).toString()
-}

server/src/main/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt

@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.util.storage
 
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
-import org.apache.commons.compress.archivers.zip.ZipFile
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import java.io.Closeable
@@ -12,6 +10,8 @@ import java.io.InputStream
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Locale
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
 
 /**
  * Wrapper over ZipFile to load files in epub format.
@@ -38,14 +38,14 @@ class EpubFile(file: File) : Closeable {
     /**
      * Returns an input stream for reading the contents of the specified zip file entry.
      */
-    fun getInputStream(entry: ZipArchiveEntry): InputStream {
+    fun getInputStream(entry: ZipEntry): InputStream {
         return zip.getInputStream(entry)
     }
 
     /**
      * Returns the zip file entry for the specified name, or null if not found.
      */
-    fun getEntry(name: String): ZipArchiveEntry? {
+    fun getEntry(name: String): ZipEntry? {
         return zip.getEntry(name)
     }
 

server/src/main/kotlin/suwayomi/tachidesk/graphql/GraphQL.kt

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql
-
-import io.javalin.apibuilder.ApiBuilder.get
-import io.javalin.apibuilder.ApiBuilder.post
-import io.javalin.apibuilder.ApiBuilder.ws
-import suwayomi.tachidesk.graphql.controller.GraphQLController
-
-object GraphQL {
-    fun defineEndpoints() {
-        post("graphql", GraphQLController::execute)
-        ws("graphql", GraphQLController::webSocket)
-
-        // graphql playground
-        get("graphql", GraphQLController::playground)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/controller/GraphQLController.kt

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.controller
-
-import io.javalin.http.ContentType
-import io.javalin.http.Context
-import io.javalin.websocket.WsConfig
-import suwayomi.tachidesk.graphql.server.TachideskGraphQLServer
-import suwayomi.tachidesk.server.JavalinSetup.future
-
-object GraphQLController {
-    private val server = TachideskGraphQLServer.create()
-
-    /** execute graphql query */
-    fun execute(ctx: Context) {
-        ctx.future(
-            future {
-                server.execute(ctx)
-            }
-        )
-    }
-
-    fun playground(ctx: Context) {
-        ctx.contentType(ContentType.TEXT_HTML)
-        ctx.result(javaClass.getResourceAsStream("/graphql-playground.html")!!)
-    }
-
-    fun webSocket(ws: WsConfig) {
-        ws.onMessage { ctx ->
-            server.handleSubscriptionMessage(ctx)
-        }
-        ws.onClose { ctx ->
-            server.handleSubscriptionDisconnect(ctx)
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/CategoryDataLoader.kt

@@ -1,54 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.dataLoaders
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoader
-import org.dataloader.DataLoader
-import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.types.CategoryNodeList
-import suwayomi.tachidesk.graphql.types.CategoryNodeList.Companion.toNodeList
-import suwayomi.tachidesk.graphql.types.CategoryType
-import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-
-class CategoryDataLoader : KotlinDataLoader<Int, CategoryType> {
-    override val dataLoaderName = "CategoryDataLoader"
-    override fun getDataLoader(): DataLoader<Int, CategoryType> = DataLoaderFactory.newDataLoader { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val categories = CategoryTable.select { CategoryTable.id inList ids }
-                    .map { CategoryType(it) }
-                    .associateBy { it.id }
-                ids.map { categories[it] }
-            }
-        }
-    }
-}
-
-class CategoriesForMangaDataLoader : KotlinDataLoader<Int, CategoryNodeList> {
-    override val dataLoaderName = "CategoriesForMangaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, CategoryNodeList> = DataLoaderFactory.newDataLoader<Int, CategoryNodeList> { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val itemsByRef = CategoryMangaTable.innerJoin(CategoryTable)
-                    .select { CategoryMangaTable.manga inList ids }
-                    .map { Pair(it[CategoryMangaTable.manga].value, CategoryType(it)) }
-                    .groupBy { it.first }
-                    .mapValues { it.value.map { pair -> pair.second } }
-                ids.map { (itemsByRef[it] ?: emptyList()).toNodeList() }
-            }
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.dataLoaders
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoader
-import org.dataloader.DataLoader
-import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.types.ChapterNodeList
-import suwayomi.tachidesk.graphql.types.ChapterNodeList.Companion.toNodeList
-import suwayomi.tachidesk.graphql.types.ChapterType
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-
-class ChapterDataLoader : KotlinDataLoader<Int, ChapterType?> {
-    override val dataLoaderName = "ChapterDataLoader"
-    override fun getDataLoader(): DataLoader<Int, ChapterType?> = DataLoaderFactory.newDataLoader<Int, ChapterType> { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val chapters = ChapterTable.select { ChapterTable.id inList ids }
-                    .map { ChapterType(it) }
-                    .associateBy { it.id }
-                ids.map { chapters[it] }
-            }
-        }
-    }
-}
-
-class ChaptersForMangaDataLoader : KotlinDataLoader<Int, ChapterNodeList> {
-    override val dataLoaderName = "ChaptersForMangaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, ChapterNodeList> = DataLoaderFactory.newDataLoader<Int, ChapterNodeList> { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val chaptersByMangaId = ChapterTable.select { ChapterTable.manga inList ids }
-                    .map { ChapterType(it) }
-                    .groupBy { it.mangaId }
-                ids.map { (chaptersByMangaId[it] ?: emptyList()).toNodeList() }
-            }
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionDataLoader.kt

@@ -1,63 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.dataLoaders
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoader
-import org.dataloader.DataLoader
-import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.types.ExtensionType
-import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.manga.model.table.SourceTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-
-class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType?> {
-    override val dataLoaderName = "ExtensionDataLoader"
-    override fun getDataLoader(): DataLoader<String, ExtensionType?> = DataLoaderFactory.newDataLoader { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val extensions = ExtensionTable.select { ExtensionTable.pkgName inList ids }
-                    .map { ExtensionType(it) }
-                    .associateBy { it.pkgName }
-                ids.map { extensions[it] }
-            }
-        }
-    }
-}
-
-class ExtensionForSourceDataLoader : KotlinDataLoader<Long, ExtensionType?> {
-    override val dataLoaderName = "ExtensionForSourceDataLoader"
-    override fun getDataLoader(): DataLoader<Long, ExtensionType?> = DataLoaderFactory.newDataLoader { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val extensions = ExtensionTable.innerJoin(SourceTable)
-                    .select { SourceTable.id inList ids }
-                    .toList()
-                    .map { Triple(it[SourceTable.id].value, it[ExtensionTable.pkgName], it) }
-                    .let { triples ->
-                        val sources = buildMap {
-                            triples.forEach {
-                                if (!containsKey(it.second)) {
-                                    put(it.second, ExtensionType(it.third))
-                                }
-                            }
-                        }
-                        triples.associate {
-                            it.first to sources[it.second]
-                        }
-                    }
-                ids.map { extensions[it] }
-            }
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt

@@ -1,67 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.dataLoaders
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoader
-import org.dataloader.DataLoader
-import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.types.MangaNodeList
-import suwayomi.tachidesk.graphql.types.MangaNodeList.Companion.toNodeList
-import suwayomi.tachidesk.graphql.types.MangaType
-import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-
-class MangaDataLoader : KotlinDataLoader<Int, MangaType?> {
-    override val dataLoaderName = "MangaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, MangaType?> = DataLoaderFactory.newDataLoader { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val manga = MangaTable.select { MangaTable.id inList ids }
-                    .map { MangaType(it) }
-                    .associateBy { it.id }
-                ids.map { manga[it] }
-            }
-        }
-    }
-}
-
-class MangaForCategoryDataLoader : KotlinDataLoader<Int, MangaNodeList> {
-    override val dataLoaderName = "MangaForCategoryDataLoader"
-    override fun getDataLoader(): DataLoader<Int, MangaNodeList> = DataLoaderFactory.newDataLoader<Int, MangaNodeList> { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val itemsByRef = if (ids.contains(0)) {
-                    MangaTable
-                        .leftJoin(CategoryMangaTable)
-                        .select { MangaTable.inLibrary eq true }
-                        .andWhere { CategoryMangaTable.manga.isNull() }
-                        .map { MangaType(it) }
-                        .let {
-                            mapOf(0 to it)
-                        }
-                } else {
-                    emptyMap()
-                } + CategoryMangaTable.innerJoin(MangaTable)
-                    .select { CategoryMangaTable.category inList ids }
-                    .map { Pair(it[CategoryMangaTable.category].value, MangaType(it)) }
-                    .groupBy { it.first }
-                    .mapValues { it.value.map { pair -> pair.second } }
-
-                ids.map { (itemsByRef[it] ?: emptyList()).toNodeList() }
-            }
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt

@@ -1,78 +0,0 @@
-package suwayomi.tachidesk.graphql.dataLoaders
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoader
-import org.dataloader.DataLoader
-import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.global.model.table.GlobalMetaTable
-import suwayomi.tachidesk.graphql.types.CategoryMetaType
-import suwayomi.tachidesk.graphql.types.ChapterMetaType
-import suwayomi.tachidesk.graphql.types.GlobalMetaType
-import suwayomi.tachidesk.graphql.types.MangaMetaType
-import suwayomi.tachidesk.manga.model.table.CategoryMetaTable
-import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
-import suwayomi.tachidesk.manga.model.table.MangaMetaTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-
-class GlobalMetaDataLoader : KotlinDataLoader<String, GlobalMetaType?> {
-    override val dataLoaderName = "GlobalMetaDataLoader"
-    override fun getDataLoader(): DataLoader<String, GlobalMetaType?> = DataLoaderFactory.newDataLoader<String, GlobalMetaType?> { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val metasByRefId = GlobalMetaTable.select { GlobalMetaTable.key inList ids }
-                    .map { GlobalMetaType(it) }
-                    .associateBy { it.key }
-                ids.map { metasByRefId[it] }
-            }
-        }
-    }
-}
-
-class ChapterMetaDataLoader : KotlinDataLoader<Int, List<ChapterMetaType>> {
-    override val dataLoaderName = "ChapterMetaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, List<ChapterMetaType>> = DataLoaderFactory.newDataLoader<Int, List<ChapterMetaType>> { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val metasByRefId = ChapterMetaTable.select { ChapterMetaTable.ref inList ids }
-                    .map { ChapterMetaType(it) }
-                    .groupBy { it.chapterId }
-                ids.map { metasByRefId[it].orEmpty() }
-            }
-        }
-    }
-}
-
-class MangaMetaDataLoader : KotlinDataLoader<Int, List<MangaMetaType>> {
-    override val dataLoaderName = "MangaMetaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, List<MangaMetaType>> = DataLoaderFactory.newDataLoader<Int, List<MangaMetaType>> { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val metasByRefId = MangaMetaTable.select { MangaMetaTable.ref inList ids }
-                    .map { MangaMetaType(it) }
-                    .groupBy { it.mangaId }
-                ids.map { metasByRefId[it].orEmpty() }
-            }
-        }
-    }
-}
-
-class CategoryMetaDataLoader : KotlinDataLoader<Int, List<CategoryMetaType>> {
-    override val dataLoaderName = "CategoryMetaDataLoader"
-    override fun getDataLoader(): DataLoader<Int, List<CategoryMetaType>> = DataLoaderFactory.newDataLoader<Int, List<CategoryMetaType>> { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val metasByRefId = CategoryMetaTable.select { CategoryMetaTable.ref inList ids }
-                    .map { CategoryMetaType(it) }
-                    .groupBy { it.categoryId }
-                ids.map { metasByRefId[it].orEmpty() }
-            }
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt

@@ -1,56 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.dataLoaders
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoader
-import org.dataloader.DataLoader
-import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.types.SourceNodeList
-import suwayomi.tachidesk.graphql.types.SourceNodeList.Companion.toNodeList
-import suwayomi.tachidesk.graphql.types.SourceType
-import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.manga.model.table.SourceTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-
-class SourceDataLoader : KotlinDataLoader<Long, SourceType?> {
-    override val dataLoaderName = "SourceDataLoader"
-    override fun getDataLoader(): DataLoader<Long, SourceType?> = DataLoaderFactory.newDataLoader { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-                val source = SourceTable.select { SourceTable.id inList ids }
-                    .mapNotNull { SourceType(it) }
-                    .associateBy { it.id }
-                ids.map { source[it] }
-            }
-        }
-    }
-}
-
-class SourcesForExtensionDataLoader : KotlinDataLoader<String, SourceNodeList> {
-    override val dataLoaderName = "SourcesForExtensionDataLoader"
-    override fun getDataLoader(): DataLoader<String, SourceNodeList> = DataLoaderFactory.newDataLoader { ids ->
-        future {
-            transaction {
-                addLogger(Slf4jSqlDebugLogger)
-
-                val sourcesByExtensionPkg = SourceTable.innerJoin(ExtensionTable)
-                    .select { ExtensionTable.pkgName inList ids }
-                    .map { Pair(it[ExtensionTable.pkgName], SourceType(it)) }
-                    .groupBy { it.first }
-                    .mapValues { it.value.mapNotNull { pair -> pair.second } }
-
-                ids.map { (sourcesByExtensionPkg[it] ?: emptyList()).toNodeList() }
-            }
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/CategoryMutation.kt

@@ -1,400 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.minus
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.plus
-import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.graphql.types.CategoryMetaType
-import suwayomi.tachidesk.graphql.types.CategoryType
-import suwayomi.tachidesk.graphql.types.MangaType
-import suwayomi.tachidesk.manga.impl.Category
-import suwayomi.tachidesk.manga.impl.util.lang.isEmpty
-import suwayomi.tachidesk.manga.impl.util.lang.isNotEmpty
-import suwayomi.tachidesk.manga.model.dataclass.IncludeInUpdate
-import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.manga.model.table.CategoryMetaTable
-import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
-
-class CategoryMutation {
-    data class SetCategoryMetaInput(
-        val clientMutationId: String? = null,
-        val meta: CategoryMetaType
-    )
-    data class SetCategoryMetaPayload(
-        val clientMutationId: String?,
-        val meta: CategoryMetaType
-    )
-    fun setCategoryMeta(
-        input: SetCategoryMetaInput
-    ): SetCategoryMetaPayload {
-        val (clientMutationId, meta) = input
-
-        Category.modifyMeta(meta.categoryId, meta.key, meta.value)
-
-        return SetCategoryMetaPayload(clientMutationId, meta)
-    }
-
-    data class DeleteCategoryMetaInput(
-        val clientMutationId: String? = null,
-        val categoryId: Int,
-        val key: String
-    )
-    data class DeleteCategoryMetaPayload(
-        val clientMutationId: String?,
-        val meta: CategoryMetaType?,
-        val category: CategoryType
-    )
-    fun deleteCategoryMeta(
-        input: DeleteCategoryMetaInput
-    ): DeleteCategoryMetaPayload {
-        val (clientMutationId, categoryId, key) = input
-
-        val (meta, category) = transaction {
-            val meta = CategoryMetaTable.select { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
-                .firstOrNull()
-
-            CategoryMetaTable.deleteWhere { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
-
-            val category = transaction {
-                CategoryType(CategoryTable.select { CategoryTable.id eq categoryId }.first())
-            }
-
-            if (meta != null) {
-                CategoryMetaType(meta)
-            } else {
-                null
-            } to category
-        }
-
-        return DeleteCategoryMetaPayload(clientMutationId, meta, category)
-    }
-
-    data class UpdateCategoryPatch(
-        val name: String? = null,
-        val default: Boolean? = null,
-        val includeInUpdate: IncludeInUpdate? = null
-    )
-
-    data class UpdateCategoryPayload(
-        val clientMutationId: String?,
-        val category: CategoryType
-    )
-    data class UpdateCategoryInput(
-        val clientMutationId: String? = null,
-        val id: Int,
-        val patch: UpdateCategoryPatch
-    )
-
-    data class UpdateCategoriesPayload(
-        val clientMutationId: String?,
-        val categories: List<CategoryType>
-    )
-    data class UpdateCategoriesInput(
-        val clientMutationId: String? = null,
-        val ids: List<Int>,
-        val patch: UpdateCategoryPatch
-    )
-
-    private fun updateCategories(ids: List<Int>, patch: UpdateCategoryPatch) {
-        transaction {
-            if (patch.name != null) {
-                CategoryTable.update({ CategoryTable.id inList ids }) { update ->
-                    patch.name.also {
-                        update[name] = it
-                    }
-                }
-            }
-            if (patch.default != null) {
-                CategoryTable.update({ CategoryTable.id inList ids }) { update ->
-                    patch.default.also {
-                        update[isDefault] = it
-                    }
-                }
-            }
-            if (patch.includeInUpdate != null) {
-                CategoryTable.update({ CategoryTable.id inList ids }) { update ->
-                    patch.includeInUpdate.also {
-                        update[includeInUpdate] = it.value
-                    }
-                }
-            }
-        }
-    }
-
-    fun updateCategory(input: UpdateCategoryInput): UpdateCategoryPayload {
-        val (clientMutationId, id, patch) = input
-
-        updateCategories(listOf(id), patch)
-
-        val category = transaction {
-            CategoryType(CategoryTable.select { CategoryTable.id eq id }.first())
-        }
-
-        return UpdateCategoryPayload(
-            clientMutationId = clientMutationId,
-            category = category
-        )
-    }
-
-    fun updateCategories(input: UpdateCategoriesInput): UpdateCategoriesPayload {
-        val (clientMutationId, ids, patch) = input
-
-        updateCategories(ids, patch)
-
-        val categories = transaction {
-            CategoryTable.select { CategoryTable.id inList ids }.map { CategoryType(it) }
-        }
-
-        return UpdateCategoriesPayload(
-            clientMutationId = clientMutationId,
-            categories = categories
-        )
-    }
-
-    data class UpdateCategoryOrderPayload(
-        val clientMutationId: String?,
-        val categories: List<CategoryType>
-    )
-    data class UpdateCategoryOrderInput(
-        val clientMutationId: String? = null,
-        val id: Int,
-        val position: Int
-    )
-
-    fun updateCategoryOrder(input: UpdateCategoryOrderInput): UpdateCategoryOrderPayload {
-        val (clientMutationId, categoryId, position) = input
-        require(position > 0) {
-            "'order' must not be <= 0"
-        }
-
-        transaction {
-            val currentOrder = CategoryTable
-                .select { CategoryTable.id eq categoryId }
-                .first()[CategoryTable.order]
-
-            if (currentOrder != position) {
-                if (position < currentOrder) {
-                    CategoryTable.update({ CategoryTable.order greaterEq position }) {
-                        it[CategoryTable.order] = CategoryTable.order + 1
-                    }
-                } else {
-                    CategoryTable.update({ CategoryTable.order lessEq position }) {
-                        it[CategoryTable.order] = CategoryTable.order - 1
-                    }
-                }
-
-                CategoryTable.update({ CategoryTable.id eq categoryId }) {
-                    it[CategoryTable.order] = position
-                }
-            }
-        }
-
-        Category.normalizeCategories()
-
-        val categories = transaction {
-            CategoryTable.selectAll().orderBy(CategoryTable.order).map { CategoryType(it) }
-        }
-
-        return UpdateCategoryOrderPayload(
-            clientMutationId = clientMutationId,
-            categories = categories
-        )
-    }
-
-    data class CreateCategoryInput(
-        val clientMutationId: String? = null,
-        val name: String,
-        val order: Int? = null,
-        val default: Boolean? = null,
-        val includeInUpdate: IncludeInUpdate? = null
-    )
-    data class CreateCategoryPayload(
-        val clientMutationId: String?,
-        val category: CategoryType
-    )
-    fun createCategory(
-        input: CreateCategoryInput
-    ): CreateCategoryPayload {
-        val (clientMutationId, name, order, default, includeInUpdate) = input
-        transaction {
-            require(CategoryTable.select { CategoryTable.name eq input.name }.isEmpty()) {
-                "'name' must be unique"
-            }
-        }
-        require(!name.equals(Category.DEFAULT_CATEGORY_NAME, ignoreCase = true)) {
-            "'name' must not be ${Category.DEFAULT_CATEGORY_NAME}"
-        }
-        if (order != null) {
-            require(order > 0) {
-                "'order' must not be <= 0"
-            }
-        }
-
-        val category = transaction {
-            if (order != null) {
-                CategoryTable.update({ CategoryTable.order greaterEq order }) {
-                    it[CategoryTable.order] = CategoryTable.order + 1
-                }
-            }
-
-            val id = CategoryTable.insertAndGetId {
-                it[CategoryTable.name] = input.name
-                it[CategoryTable.order] = order ?: Int.MAX_VALUE
-                if (default != null) {
-                    it[CategoryTable.isDefault] = default
-                }
-                if (includeInUpdate != null) {
-                    it[CategoryTable.includeInUpdate] = includeInUpdate.value
-                }
-            }
-
-            Category.normalizeCategories()
-
-            CategoryType(CategoryTable.select { CategoryTable.id eq id }.first())
-        }
-
-        return CreateCategoryPayload(clientMutationId, category)
-    }
-
-    data class DeleteCategoryInput(
-        val clientMutationId: String? = null,
-        val categoryId: Int
-    )
-    data class DeleteCategoryPayload(
-        val clientMutationId: String?,
-        val category: CategoryType?,
-        val mangas: List<MangaType>
-    )
-    fun deleteCategory(
-        input: DeleteCategoryInput
-    ): DeleteCategoryPayload {
-        val (clientMutationId, categoryId) = input
-        if (categoryId == 0) { // Don't delete default category
-            return DeleteCategoryPayload(
-                clientMutationId,
-                null,
-                emptyList()
-            )
-        }
-
-        val (category, mangas) = transaction {
-            val category = CategoryTable.select { CategoryTable.id eq categoryId }
-                .firstOrNull()
-
-            val mangas = transaction {
-                MangaTable.innerJoin(CategoryMangaTable)
-                    .select { CategoryMangaTable.category eq categoryId }
-                    .map { MangaType(it) }
-            }
-
-            CategoryTable.deleteWhere { CategoryTable.id eq categoryId }
-
-            Category.normalizeCategories()
-
-            if (category != null) {
-                CategoryType(category)
-            } else {
-                null
-            } to mangas
-        }
-
-        return DeleteCategoryPayload(clientMutationId, category, mangas)
-    }
-
-    data class UpdateMangaCategoriesPatch(
-        val clearCategories: Boolean? = null,
-        val addToCategories: List<Int>? = null,
-        val removeFromCategories: List<Int>? = null
-    )
-
-    data class UpdateMangaCategoriesPayload(
-        val clientMutationId: String?,
-        val manga: MangaType
-    )
-    data class UpdateMangaCategoriesInput(
-        val clientMutationId: String? = null,
-        val id: Int,
-        val patch: UpdateMangaCategoriesPatch
-    )
-
-    data class UpdateMangasCategoriesPayload(
-        val clientMutationId: String?,
-        val mangas: List<MangaType>
-    )
-    data class UpdateMangasCategoriesInput(
-        val clientMutationId: String? = null,
-        val ids: List<Int>,
-        val patch: UpdateMangaCategoriesPatch
-    )
-
-    private fun updateMangas(ids: List<Int>, patch: UpdateMangaCategoriesPatch) {
-        transaction {
-            if (patch.clearCategories == true) {
-                CategoryMangaTable.deleteWhere { CategoryMangaTable.manga inList ids }
-            } else if (!patch.removeFromCategories.isNullOrEmpty()) {
-                CategoryMangaTable.deleteWhere {
-                    (CategoryMangaTable.manga inList ids) and (CategoryMangaTable.category inList patch.removeFromCategories)
-                }
-            }
-            if (!patch.addToCategories.isNullOrEmpty()) {
-                val newCategories = buildList {
-                    ids.forEach { mangaId ->
-                        patch.addToCategories.forEach { categoryId ->
-                            val existingMapping = CategoryMangaTable.select {
-                                (CategoryMangaTable.manga eq mangaId) and (CategoryMangaTable.category eq categoryId)
-                            }.isNotEmpty()
-
-                            if (!existingMapping) {
-                                add(mangaId to categoryId)
-                            }
-                        }
-                    }
-                }
-
-                CategoryMangaTable.batchInsert(newCategories) { (manga, category) ->
-                    this[CategoryMangaTable.manga] = manga
-                    this[CategoryMangaTable.category] = category
-                }
-            }
-        }
-    }
-
-    fun updateMangaCategories(input: UpdateMangaCategoriesInput): UpdateMangaCategoriesPayload {
-        val (clientMutationId, id, patch) = input
-
-        updateMangas(listOf(id), patch)
-
-        val manga = transaction {
-            MangaType(MangaTable.select { MangaTable.id eq id }.first())
-        }
-
-        return UpdateMangaCategoriesPayload(
-            clientMutationId = clientMutationId,
-            manga = manga
-        )
-    }
-
-    fun updateMangasCategories(input: UpdateMangasCategoriesInput): UpdateMangasCategoriesPayload {
-        val (clientMutationId, ids, patch) = input
-
-        updateMangas(ids, patch)
-
-        val mangas = transaction {
-            MangaTable.select { MangaTable.id inList ids }.map { MangaType(it) }
-        }
-
-        return UpdateMangasCategoriesPayload(
-            clientMutationId = clientMutationId,
-            mangas = mangas
-        )
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt

@@ -1,186 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.graphql.types.ChapterMetaType
-import suwayomi.tachidesk.graphql.types.ChapterType
-import suwayomi.tachidesk.manga.impl.Chapter
-import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-import java.time.Instant
-import java.util.concurrent.CompletableFuture
-
-/**
- * TODO Mutations
- * - Download
- * - Delete download
- */
-class ChapterMutation {
-    data class UpdateChapterPatch(
-        val isBookmarked: Boolean? = null,
-        val isRead: Boolean? = null,
-        val lastPageRead: Int? = null
-    )
-
-    data class UpdateChapterPayload(
-        val clientMutationId: String?,
-        val chapter: ChapterType
-    )
-    data class UpdateChapterInput(
-        val clientMutationId: String? = null,
-        val id: Int,
-        val patch: UpdateChapterPatch
-    )
-
-    data class UpdateChaptersPayload(
-        val clientMutationId: String?,
-        val chapters: List<ChapterType>
-    )
-    data class UpdateChaptersInput(
-        val clientMutationId: String? = null,
-        val ids: List<Int>,
-        val patch: UpdateChapterPatch
-    )
-
-    private fun updateChapters(ids: List<Int>, patch: UpdateChapterPatch) {
-        transaction {
-            if (patch.isRead != null || patch.isBookmarked != null || patch.lastPageRead != null) {
-                val now = Instant.now().epochSecond
-                ChapterTable.update({ ChapterTable.id inList ids }) { update ->
-                    patch.isRead?.also {
-                        update[isRead] = it
-                    }
-                    patch.isBookmarked?.also {
-                        update[isBookmarked] = it
-                    }
-                    patch.lastPageRead?.also {
-                        update[lastPageRead] = it
-                        update[lastReadAt] = now
-                    }
-                }
-            }
-        }
-    }
-
-    fun updateChapter(
-        input: UpdateChapterInput
-    ): UpdateChapterPayload {
-        val (clientMutationId, id, patch) = input
-
-        updateChapters(listOf(id), patch)
-
-        val chapter = transaction {
-            ChapterType(ChapterTable.select { ChapterTable.id eq id }.first())
-        }
-
-        return UpdateChapterPayload(
-            clientMutationId = clientMutationId,
-            chapter = chapter
-        )
-    }
-
-    fun updateChapters(
-        input: UpdateChaptersInput
-    ): UpdateChaptersPayload {
-        val (clientMutationId, ids, patch) = input
-
-        updateChapters(ids, patch)
-
-        val chapters = transaction {
-            ChapterTable.select { ChapterTable.id inList ids }.map { ChapterType(it) }
-        }
-
-        return UpdateChaptersPayload(
-            clientMutationId = clientMutationId,
-            chapters = chapters
-        )
-    }
-
-    data class FetchChaptersInput(
-        val clientMutationId: String? = null,
-        val mangaId: Int
-    )
-    data class FetchChaptersPayload(
-        val clientMutationId: String?,
-        val chapters: List<ChapterType>
-    )
-
-    fun fetchChapters(
-        input: FetchChaptersInput
-    ): CompletableFuture<FetchChaptersPayload> {
-        val (clientMutationId, mangaId) = input
-
-        return future {
-            Chapter.fetchChapterList(mangaId)
-        }.thenApply {
-            val chapters = transaction {
-                ChapterTable.select { ChapterTable.manga eq mangaId }
-                    .orderBy(ChapterTable.sourceOrder)
-                    .map { ChapterType(it) }
-            }
-
-            FetchChaptersPayload(
-                clientMutationId = clientMutationId,
-                chapters = chapters
-            )
-        }
-    }
-
-    data class SetChapterMetaInput(
-        val clientMutationId: String? = null,
-        val meta: ChapterMetaType
-    )
-    data class SetChapterMetaPayload(
-        val clientMutationId: String?,
-        val meta: ChapterMetaType
-    )
-    fun setChapterMeta(
-        input: SetChapterMetaInput
-    ): SetChapterMetaPayload {
-        val (clientMutationId, meta) = input
-
-        Chapter.modifyChapterMeta(meta.chapterId, meta.key, meta.value)
-
-        return SetChapterMetaPayload(clientMutationId, meta)
-    }
-
-    data class DeleteChapterMetaInput(
-        val clientMutationId: String? = null,
-        val chapterId: Int,
-        val key: String
-    )
-    data class DeleteChapterMetaPayload(
-        val clientMutationId: String?,
-        val meta: ChapterMetaType?,
-        val chapter: ChapterType
-    )
-    fun deleteChapterMeta(
-        input: DeleteChapterMetaInput
-    ): DeleteChapterMetaPayload {
-        val (clientMutationId, chapterId, key) = input
-
-        val (meta, chapter) = transaction {
-            val meta = ChapterMetaTable.select { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
-                .firstOrNull()
-
-            ChapterMetaTable.deleteWhere { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
-
-            val chapter = transaction {
-                ChapterType(ChapterTable.select { ChapterTable.id eq chapterId }.first())
-            }
-
-            if (meta != null) {
-                ChapterMetaType(meta)
-            } else {
-                null
-            } to chapter
-        }
-
-        return DeleteChapterMetaPayload(clientMutationId, meta, chapter)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt

@@ -1,127 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-import eu.kanade.tachiyomi.source.local.LocalSource
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.types.ExtensionType
-import suwayomi.tachidesk.manga.impl.extension.Extension
-import suwayomi.tachidesk.manga.impl.extension.ExtensionsList
-import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-import java.util.concurrent.CompletableFuture
-
-class ExtensionMutation {
-    data class UpdateExtensionPatch(
-        val install: Boolean? = null,
-        val update: Boolean? = null,
-        val uninstall: Boolean? = null
-    )
-
-    data class UpdateExtensionPayload(
-        val clientMutationId: String?,
-        val extension: ExtensionType
-    )
-    data class UpdateExtensionInput(
-        val clientMutationId: String? = null,
-        val id: String,
-        val patch: UpdateExtensionPatch
-    )
-
-    data class UpdateExtensionsPayload(
-        val clientMutationId: String?,
-        val extensions: List<ExtensionType>
-    )
-    data class UpdateExtensionsInput(
-        val clientMutationId: String? = null,
-        val ids: List<String>,
-        val patch: UpdateExtensionPatch
-    )
-
-    private suspend fun updateExtensions(ids: List<String>, patch: UpdateExtensionPatch) {
-        val extensions = transaction {
-            ExtensionTable.select { ExtensionTable.pkgName inList ids }
-                .map { ExtensionType(it) }
-        }
-
-        if (patch.update == true) {
-            extensions.filter { it.hasUpdate }.forEach {
-                Extension.updateExtension(it.pkgName)
-            }
-        }
-
-        if (patch.install == true) {
-            extensions.filterNot { it.isInstalled }.forEach {
-                Extension.installExtension(it.pkgName)
-            }
-        }
-
-        if (patch.uninstall == true) {
-            extensions.filter { it.isInstalled }.forEach {
-                Extension.uninstallExtension(it.pkgName)
-            }
-        }
-    }
-
-    fun updateExtension(input: UpdateExtensionInput): CompletableFuture<UpdateExtensionPayload> {
-        val (clientMutationId, id, patch) = input
-
-        return future {
-            updateExtensions(listOf(id), patch)
-        }.thenApply {
-            val extension = transaction {
-                ExtensionType(ExtensionTable.select { ExtensionTable.pkgName eq id }.first())
-            }
-
-            UpdateExtensionPayload(
-                clientMutationId = clientMutationId,
-                extension = extension
-            )
-        }
-    }
-
-    fun updateExtensions(input: UpdateExtensionsInput): CompletableFuture<UpdateExtensionsPayload> {
-        val (clientMutationId, ids, patch) = input
-
-        return future {
-            updateExtensions(ids, patch)
-        }.thenApply {
-            val extensions = transaction {
-                ExtensionTable.select { ExtensionTable.pkgName inList ids }
-                    .map { ExtensionType(it) }
-            }
-
-            UpdateExtensionsPayload(
-                clientMutationId = clientMutationId,
-                extensions = extensions
-            )
-        }
-    }
-
-    data class FetchExtensionsInput(
-        val clientMutationId: String? = null
-    )
-    data class FetchExtensionsPayload(
-        val clientMutationId: String?,
-        val extensions: List<ExtensionType>
-    )
-
-    fun fetchExtensions(
-        input: FetchExtensionsInput
-    ): CompletableFuture<FetchExtensionsPayload> {
-        val (clientMutationId) = input
-
-        return future {
-            ExtensionsList.fetchExtensions()
-        }.thenApply {
-            val extensions = transaction {
-                ExtensionTable.select { ExtensionTable.name neq LocalSource.EXTENSION_NAME }
-                    .map { ExtensionType(it) }
-            }
-
-            FetchExtensionsPayload(
-                clientMutationId = clientMutationId,
-                extensions = extensions
-            )
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt

@@ -1,168 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.graphql.types.MangaMetaType
-import suwayomi.tachidesk.graphql.types.MangaType
-import suwayomi.tachidesk.manga.impl.Manga
-import suwayomi.tachidesk.manga.model.table.MangaMetaTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-import java.util.concurrent.CompletableFuture
-
-/**
- * TODO Mutations
- * - Download x(all = -1) chapters
- * - Delete read/all downloaded chapters
- */
-class MangaMutation {
-    data class UpdateMangaPatch(
-        val inLibrary: Boolean? = null
-    )
-
-    data class UpdateMangaPayload(
-        val clientMutationId: String?,
-        val manga: MangaType
-    )
-    data class UpdateMangaInput(
-        val clientMutationId: String? = null,
-        val id: Int,
-        val patch: UpdateMangaPatch
-    )
-
-    data class UpdateMangasPayload(
-        val clientMutationId: String?,
-        val mangas: List<MangaType>
-    )
-    data class UpdateMangasInput(
-        val clientMutationId: String? = null,
-        val ids: List<Int>,
-        val patch: UpdateMangaPatch
-    )
-
-    private fun updateMangas(ids: List<Int>, patch: UpdateMangaPatch) {
-        transaction {
-            if (patch.inLibrary != null) {
-                MangaTable.update({ MangaTable.id inList ids }) { update ->
-                    patch.inLibrary.also {
-                        update[inLibrary] = it
-                    }
-                }
-            }
-        }
-    }
-
-    fun updateManga(input: UpdateMangaInput): UpdateMangaPayload {
-        val (clientMutationId, id, patch) = input
-
-        updateMangas(listOf(id), patch)
-
-        val manga = transaction {
-            MangaType(MangaTable.select { MangaTable.id eq id }.first())
-        }
-
-        return UpdateMangaPayload(
-            clientMutationId = clientMutationId,
-            manga = manga
-        )
-    }
-
-    fun updateMangas(input: UpdateMangasInput): UpdateMangasPayload {
-        val (clientMutationId, ids, patch) = input
-
-        updateMangas(ids, patch)
-
-        val mangas = transaction {
-            MangaTable.select { MangaTable.id inList ids }.map { MangaType(it) }
-        }
-
-        return UpdateMangasPayload(
-            clientMutationId = clientMutationId,
-            mangas = mangas
-        )
-    }
-
-    data class FetchMangaInput(
-        val clientMutationId: String? = null,
-        val id: Int
-    )
-    data class FetchMangaPayload(
-        val clientMutationId: String?,
-        val manga: MangaType
-    )
-
-    fun fetchManga(
-        input: FetchMangaInput
-    ): CompletableFuture<FetchMangaPayload> {
-        val (clientMutationId, id) = input
-
-        return future {
-            Manga.fetchManga(id)
-        }.thenApply {
-            val manga = transaction {
-                MangaTable.select { MangaTable.id eq id }.first()
-            }
-            FetchMangaPayload(
-                clientMutationId = clientMutationId,
-                manga = MangaType(manga)
-            )
-        }
-    }
-
-    data class SetMangaMetaInput(
-        val clientMutationId: String? = null,
-        val meta: MangaMetaType
-    )
-    data class SetMangaMetaPayload(
-        val clientMutationId: String?,
-        val meta: MangaMetaType
-    )
-    fun setMangaMeta(
-        input: SetMangaMetaInput
-    ): SetMangaMetaPayload {
-        val (clientMutationId, meta) = input
-
-        Manga.modifyMangaMeta(meta.mangaId, meta.key, meta.value)
-
-        return SetMangaMetaPayload(clientMutationId, meta)
-    }
-
-    data class DeleteMangaMetaInput(
-        val clientMutationId: String? = null,
-        val mangaId: Int,
-        val key: String
-    )
-    data class DeleteMangaMetaPayload(
-        val clientMutationId: String?,
-        val meta: MangaMetaType?,
-        val manga: MangaType
-    )
-    fun deleteMangaMeta(
-        input: DeleteMangaMetaInput
-    ): DeleteMangaMetaPayload {
-        val (clientMutationId, mangaId, key) = input
-
-        val (meta, manga) = transaction {
-            val meta = MangaMetaTable.select { (MangaMetaTable.ref eq mangaId) and (MangaMetaTable.key eq key) }
-                .firstOrNull()
-
-            MangaMetaTable.deleteWhere { (MangaMetaTable.ref eq mangaId) and (MangaMetaTable.key eq key) }
-
-            val manga = transaction {
-                MangaType(MangaTable.select { MangaTable.id eq mangaId }.first())
-            }
-
-            if (meta != null) {
-                MangaMetaType(meta)
-            } else {
-                null
-            } to manga
-        }
-
-        return DeleteMangaMetaPayload(clientMutationId, meta, manga)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MetaMutation.kt

@@ -1,59 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.global.impl.GlobalMeta
-import suwayomi.tachidesk.global.model.table.GlobalMetaTable
-import suwayomi.tachidesk.graphql.types.GlobalMetaType
-
-class MetaMutation {
-
-    data class SetGlobalMetaInput(
-        val clientMutationId: String? = null,
-        val meta: GlobalMetaType
-    )
-    data class SetGlobalMetaPayload(
-        val clientMutationId: String?,
-        val meta: GlobalMetaType
-    )
-    fun setGlobalMeta(
-        input: SetGlobalMetaInput
-    ): SetGlobalMetaPayload {
-        val (clientMutationId, meta) = input
-
-        GlobalMeta.modifyMeta(meta.key, meta.value)
-
-        return SetGlobalMetaPayload(clientMutationId, meta)
-    }
-
-    data class DeleteGlobalMetaInput(
-        val clientMutationId: String? = null,
-        val key: String
-    )
-    data class DeleteGlobalMetaPayload(
-        val clientMutationId: String?,
-        val meta: GlobalMetaType?
-    )
-    fun deleteGlobalMeta(
-        input: DeleteGlobalMetaInput
-    ): DeleteGlobalMetaPayload {
-        val (clientMutationId, key) = input
-
-        val meta = transaction {
-            val meta = GlobalMetaTable.select { GlobalMetaTable.key eq key }
-                .firstOrNull()
-
-            GlobalMetaTable.deleteWhere { GlobalMetaTable.key eq key }
-
-            if (meta != null) {
-                GlobalMetaType(meta)
-            } else {
-                null
-            }
-        }
-
-        return DeleteGlobalMetaPayload(clientMutationId, meta)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt

@@ -1,112 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-import org.jetbrains.exposed.sql.select
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.types.MangaType
-import suwayomi.tachidesk.graphql.types.PreferenceObject
-import suwayomi.tachidesk.manga.impl.MangaList.insertOrGet
-import suwayomi.tachidesk.manga.impl.Search
-import suwayomi.tachidesk.manga.impl.Source
-import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
-import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.server.JavalinSetup.future
-import java.util.concurrent.CompletableFuture
-
-class SourceMutation {
-
-    enum class FetchSourceMangaType {
-        SEARCH,
-        POPULAR,
-        LATEST
-    }
-    data class FilterChange(
-        val position: Int,
-        val state: String
-    )
-    data class FetchSourceMangaInput(
-        val clientMutationId: String? = null,
-        val source: Long,
-        val type: FetchSourceMangaType,
-        val page: Int,
-        val query: String? = null,
-        val filters: List<FilterChange>? = null
-    )
-    data class FetchSourceMangaPayload(
-        val clientMutationId: String?,
-        val mangas: List<MangaType>,
-        val hasNextPage: Boolean
-    )
-
-    fun fetchSourceManga(
-        input: FetchSourceMangaInput
-    ): CompletableFuture<FetchSourceMangaPayload> {
-        val (clientMutationId, sourceId, type, page, query, filters) = input
-
-        return future {
-            val source = GetCatalogueSource.getCatalogueSourceOrNull(sourceId)!!
-            val mangasPage = when (type) {
-                FetchSourceMangaType.SEARCH -> {
-                    source.fetchSearchManga(
-                        page = page,
-                        query = query.orEmpty(),
-                        filters = Search.buildFilterList(
-                            sourceId = sourceId,
-                            changes = filters?.map { Search.FilterChange(it.position, it.state) }
-                                .orEmpty()
-                        )
-                    ).awaitSingle()
-                }
-                FetchSourceMangaType.POPULAR -> {
-                    source.fetchPopularManga(page).awaitSingle()
-                }
-                FetchSourceMangaType.LATEST -> {
-                    if (!source.supportsLatest) throw Exception("Source does not support latest")
-                    source.fetchLatestUpdates(page).awaitSingle()
-                }
-            }
-
-            val mangaIds = mangasPage.insertOrGet(sourceId)
-
-            val mangas = transaction {
-                MangaTable.select { MangaTable.id inList mangaIds }
-                    .map { MangaType(it) }
-            }.sortedBy {
-                mangaIds.indexOf(it.id)
-            }
-
-            FetchSourceMangaPayload(
-                clientMutationId = clientMutationId,
-                mangas = mangas,
-                hasNextPage = mangasPage.hasNextPage
-            )
-        }
-    }
-
-    data class SourcePreferenceChange(
-        val position: Int,
-        val state: String
-    )
-    data class UpdateSourcePreferenceInput(
-        val clientMutationId: String? = null,
-        val source: Long,
-        val change: SourcePreferenceChange
-    )
-    data class UpdateSourcePreferencePayload(
-        val clientMutationId: String?,
-        val preferences: List<PreferenceObject>
-    )
-
-    fun updateSourcePreference(
-        input: UpdateSourcePreferenceInput
-    ): UpdateSourcePreferencePayload {
-        val (clientMutationId, sourceId, change) = input
-
-        Source.setSourcePreference(sourceId, Source.SourcePreferenceChange(change.position, change.state))
-
-        return UpdateSourcePreferencePayload(
-            clientMutationId = clientMutationId,
-            preferences = Source.getSourcePreferences(sourceId).map { PreferenceObject(it.type, it.props) }
-        )
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt

@@ -1,200 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.queries
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
-import suwayomi.tachidesk.graphql.queries.filter.Filter
-import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
-import suwayomi.tachidesk.graphql.queries.filter.IntFilter
-import suwayomi.tachidesk.graphql.queries.filter.OpAnd
-import suwayomi.tachidesk.graphql.queries.filter.StringFilter
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
-import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.OrderBy
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.graphql.server.primitives.QueryResults
-import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
-import suwayomi.tachidesk.graphql.types.CategoryNodeList
-import suwayomi.tachidesk.graphql.types.CategoryType
-import suwayomi.tachidesk.manga.model.table.CategoryTable
-import java.util.concurrent.CompletableFuture
-
-class CategoryQuery {
-    fun category(dataFetchingEnvironment: DataFetchingEnvironment, id: Int): CompletableFuture<CategoryType?> {
-        return dataFetchingEnvironment.getValueFromDataLoader("CategoryDataLoader", id)
-    }
-
-    enum class CategoryOrderBy(override val column: Column<out Comparable<*>>) : OrderBy<CategoryType> {
-        ID(CategoryTable.id),
-        NAME(CategoryTable.name),
-        ORDER(CategoryTable.order);
-
-        override fun greater(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                ID -> CategoryTable.id greater cursor.value.toInt()
-                NAME -> greaterNotUnique(CategoryTable.name, CategoryTable.id, cursor, String::toString)
-                ORDER -> greaterNotUnique(CategoryTable.order, CategoryTable.id, cursor, String::toInt)
-            }
-        }
-
-        override fun less(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                ID -> CategoryTable.id less cursor.value.toInt()
-                NAME -> lessNotUnique(CategoryTable.name, CategoryTable.id, cursor, String::toString)
-                ORDER -> lessNotUnique(CategoryTable.order, CategoryTable.id, cursor, String::toInt)
-            }
-        }
-
-        override fun asCursor(type: CategoryType): Cursor {
-            val value = when (this) {
-                ID -> type.id.toString()
-                NAME -> type.id.toString() + "-" + type.name
-                ORDER -> type.id.toString() + "-" + type.order
-            }
-            return Cursor(value)
-        }
-    }
-
-    data class CategoryCondition(
-        val id: Int? = null,
-        val order: Int? = null,
-        val name: String? = null,
-        val default: Boolean? = null
-    ) : HasGetOp {
-        override fun getOp(): Op<Boolean>? {
-            val opAnd = OpAnd()
-            opAnd.eq(id, CategoryTable.id)
-            opAnd.eq(order, CategoryTable.order)
-            opAnd.eq(name, CategoryTable.name)
-            opAnd.eq(default, CategoryTable.isDefault)
-
-            return opAnd.op
-        }
-    }
-
-    data class CategoryFilter(
-        val id: IntFilter? = null,
-        val order: IntFilter? = null,
-        val name: StringFilter? = null,
-        val default: BooleanFilter? = null,
-        override val and: List<CategoryFilter>? = null,
-        override val or: List<CategoryFilter>? = null,
-        override val not: CategoryFilter? = null
-    ) : Filter<CategoryFilter> {
-        override fun getOpList(): List<Op<Boolean>> {
-            return listOfNotNull(
-                andFilterWithCompareEntity(CategoryTable.id, id),
-                andFilterWithCompare(CategoryTable.order, order),
-                andFilterWithCompareString(CategoryTable.name, name),
-                andFilterWithCompare(CategoryTable.isDefault, default)
-            )
-        }
-    }
-
-    fun categories(
-        condition: CategoryCondition? = null,
-        filter: CategoryFilter? = null,
-        orderBy: CategoryOrderBy? = null,
-        orderByType: SortOrder? = null,
-        before: Cursor? = null,
-        after: Cursor? = null,
-        first: Int? = null,
-        last: Int? = null,
-        offset: Int? = null
-    ): CategoryNodeList {
-        val queryResults = transaction {
-            val res = CategoryTable.selectAll()
-
-            res.applyOps(condition, filter)
-
-            if (orderBy != null || (last != null || before != null)) {
-                val orderByColumn = orderBy?.column ?: CategoryTable.id
-                val orderType = orderByType.maybeSwap(last ?: before)
-
-                if (orderBy == CategoryOrderBy.ID || orderBy == null) {
-                    res.orderBy(orderByColumn to orderType)
-                } else {
-                    res.orderBy(
-                        orderByColumn to orderType,
-                        CategoryTable.id to SortOrder.ASC
-                    )
-                }
-            }
-
-            val total = res.count()
-            val firstResult = res.firstOrNull()?.get(CategoryTable.id)?.value
-            val lastResult = res.lastOrNull()?.get(CategoryTable.id)?.value
-
-            if (after != null) {
-                res.andWhere {
-                    (orderBy ?: CategoryOrderBy.ID).greater(after)
-                }
-            } else if (before != null) {
-                res.andWhere {
-                    (orderBy ?: CategoryOrderBy.ID).less(before)
-                }
-            }
-
-            if (first != null) {
-                res.limit(first, offset?.toLong() ?: 0)
-            } else if (last != null) {
-                res.limit(last)
-            }
-
-            QueryResults(total, firstResult, lastResult, res.toList())
-        }
-
-        val getAsCursor: (CategoryType) -> Cursor = (orderBy ?: CategoryOrderBy.ID)::asCursor
-
-        val resultsAsType = queryResults.results.map { CategoryType(it) }
-
-        return CategoryNodeList(
-            resultsAsType,
-            if (resultsAsType.isEmpty()) {
-                emptyList()
-            } else {
-                listOfNotNull(
-                    resultsAsType.firstOrNull()?.let {
-                        CategoryNodeList.CategoryEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    },
-                    resultsAsType.lastOrNull()?.let {
-                        CategoryNodeList.CategoryEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    }
-                )
-            },
-            pageInfo = PageInfo(
-                hasNextPage = queryResults.lastKey != resultsAsType.lastOrNull()?.id,
-                hasPreviousPage = queryResults.firstKey != resultsAsType.firstOrNull()?.id,
-                startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(it) },
-                endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(it) }
-            ),
-            totalCount = queryResults.total.toInt()
-        )
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt

@@ -1,283 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.queries
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
-import suwayomi.tachidesk.graphql.queries.filter.Filter
-import suwayomi.tachidesk.graphql.queries.filter.FloatFilter
-import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
-import suwayomi.tachidesk.graphql.queries.filter.IntFilter
-import suwayomi.tachidesk.graphql.queries.filter.LongFilter
-import suwayomi.tachidesk.graphql.queries.filter.OpAnd
-import suwayomi.tachidesk.graphql.queries.filter.StringFilter
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
-import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.OrderBy
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.graphql.server.primitives.QueryResults
-import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
-import suwayomi.tachidesk.graphql.types.ChapterNodeList
-import suwayomi.tachidesk.graphql.types.ChapterType
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import java.util.concurrent.CompletableFuture
-
-/**
- * TODO Queries
- * - Filter in library
- * - Get page list?
- */
-class ChapterQuery {
-    fun chapter(dataFetchingEnvironment: DataFetchingEnvironment, id: Int): CompletableFuture<ChapterType?> {
-        return dataFetchingEnvironment.getValueFromDataLoader("ChapterDataLoader", id)
-    }
-
-    enum class ChapterOrderBy(override val column: Column<out Comparable<*>>) : OrderBy<ChapterType> {
-        ID(ChapterTable.id),
-        SOURCE_ORDER(ChapterTable.sourceOrder),
-        NAME(ChapterTable.name),
-        UPLOAD_DATE(ChapterTable.date_upload),
-        CHAPTER_NUMBER(ChapterTable.chapter_number),
-        LAST_READ_AT(ChapterTable.lastReadAt),
-        FETCHED_AT(ChapterTable.fetchedAt);
-
-        override fun greater(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                ID -> ChapterTable.id greater cursor.value.toInt()
-                SOURCE_ORDER -> greaterNotUnique(ChapterTable.sourceOrder, ChapterTable.id, cursor, String::toInt)
-                NAME -> greaterNotUnique(ChapterTable.name, ChapterTable.id, cursor, String::toString)
-                UPLOAD_DATE -> greaterNotUnique(ChapterTable.date_upload, ChapterTable.id, cursor, String::toLong)
-                CHAPTER_NUMBER -> greaterNotUnique(ChapterTable.chapter_number, ChapterTable.id, cursor, String::toFloat)
-                LAST_READ_AT -> greaterNotUnique(ChapterTable.lastReadAt, ChapterTable.id, cursor, String::toLong)
-                FETCHED_AT -> greaterNotUnique(ChapterTable.fetchedAt, ChapterTable.id, cursor, String::toLong)
-            }
-        }
-
-        override fun less(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                ID -> ChapterTable.id less cursor.value.toInt()
-                SOURCE_ORDER -> lessNotUnique(ChapterTable.sourceOrder, ChapterTable.id, cursor, String::toInt)
-                NAME -> lessNotUnique(ChapterTable.name, ChapterTable.id, cursor, String::toString)
-                UPLOAD_DATE -> lessNotUnique(ChapterTable.date_upload, ChapterTable.id, cursor, String::toLong)
-                CHAPTER_NUMBER -> lessNotUnique(ChapterTable.chapter_number, ChapterTable.id, cursor, String::toFloat)
-                LAST_READ_AT -> lessNotUnique(ChapterTable.lastReadAt, ChapterTable.id, cursor, String::toLong)
-                FETCHED_AT -> lessNotUnique(ChapterTable.fetchedAt, ChapterTable.id, cursor, String::toLong)
-            }
-        }
-
-        override fun asCursor(type: ChapterType): Cursor {
-            val value = when (this) {
-                ID -> type.id.toString()
-                SOURCE_ORDER -> type.id.toString() + "-" + type.sourceOrder
-                NAME -> type.id.toString() + "-" + type.name
-                UPLOAD_DATE -> type.id.toString() + "-" + type.uploadDate
-                CHAPTER_NUMBER -> type.id.toString() + "-" + type.chapterNumber
-                LAST_READ_AT -> type.id.toString() + "-" + type.lastReadAt
-                FETCHED_AT -> type.id.toString() + "-" + type.fetchedAt
-            }
-            return Cursor(value)
-        }
-    }
-
-    data class ChapterCondition(
-        val id: Int? = null,
-        val url: String? = null,
-        val name: String? = null,
-        val uploadDate: Long? = null,
-        val chapterNumber: Float? = null,
-        val scanlator: String? = null,
-        val mangaId: Int? = null,
-        val isRead: Boolean? = null,
-        val isBookmarked: Boolean? = null,
-        val lastPageRead: Int? = null,
-        val lastReadAt: Long? = null,
-        val sourceOrder: Int? = null,
-        val realUrl: String? = null,
-        val fetchedAt: Long? = null,
-        val isDownloaded: Boolean? = null,
-        val pageCount: Int? = null
-    ) : HasGetOp {
-        override fun getOp(): Op<Boolean>? {
-            val opAnd = OpAnd()
-            opAnd.eq(id, ChapterTable.id)
-            opAnd.eq(url, ChapterTable.url)
-            opAnd.eq(name, ChapterTable.name)
-            opAnd.eq(uploadDate, ChapterTable.date_upload)
-            opAnd.eq(chapterNumber, ChapterTable.chapter_number)
-            opAnd.eq(scanlator, ChapterTable.scanlator)
-            opAnd.eq(mangaId, ChapterTable.manga)
-            opAnd.eq(isRead, ChapterTable.isRead)
-            opAnd.eq(isBookmarked, ChapterTable.isBookmarked)
-            opAnd.eq(lastPageRead, ChapterTable.lastPageRead)
-            opAnd.eq(lastReadAt, ChapterTable.lastReadAt)
-            opAnd.eq(sourceOrder, ChapterTable.sourceOrder)
-            opAnd.eq(realUrl, ChapterTable.realUrl)
-            opAnd.eq(fetchedAt, ChapterTable.fetchedAt)
-            opAnd.eq(isDownloaded, ChapterTable.isDownloaded)
-            opAnd.eq(pageCount, ChapterTable.pageCount)
-
-            return opAnd.op
-        }
-    }
-
-    data class ChapterFilter(
-        val id: IntFilter? = null,
-        val url: StringFilter? = null,
-        val name: StringFilter? = null,
-        val uploadDate: LongFilter? = null,
-        val chapterNumber: FloatFilter? = null,
-        val scanlator: StringFilter? = null,
-        val mangaId: IntFilter? = null,
-        val isRead: BooleanFilter? = null,
-        val isBookmarked: BooleanFilter? = null,
-        val lastPageRead: IntFilter? = null,
-        val lastReadAt: LongFilter? = null,
-        val sourceOrder: IntFilter? = null,
-        val realUrl: StringFilter? = null,
-        val fetchedAt: LongFilter? = null,
-        val isDownloaded: BooleanFilter? = null,
-        val pageCount: IntFilter? = null,
-        val inLibrary: BooleanFilter? = null,
-        override val and: List<ChapterFilter>? = null,
-        override val or: List<ChapterFilter>? = null,
-        override val not: ChapterFilter? = null
-    ) : Filter<ChapterFilter> {
-        override fun getOpList(): List<Op<Boolean>> {
-            return listOfNotNull(
-                andFilterWithCompareEntity(ChapterTable.id, id),
-                andFilterWithCompareString(ChapterTable.url, url),
-                andFilterWithCompareString(ChapterTable.name, name),
-                andFilterWithCompare(ChapterTable.date_upload, uploadDate),
-                andFilterWithCompare(ChapterTable.chapter_number, chapterNumber),
-                andFilterWithCompareString(ChapterTable.scanlator, scanlator),
-                andFilterWithCompareEntity(ChapterTable.manga, mangaId),
-                andFilterWithCompare(ChapterTable.isRead, isRead),
-                andFilterWithCompare(ChapterTable.isBookmarked, isBookmarked),
-                andFilterWithCompare(ChapterTable.lastPageRead, lastPageRead),
-                andFilterWithCompare(ChapterTable.lastReadAt, lastReadAt),
-                andFilterWithCompare(ChapterTable.sourceOrder, sourceOrder),
-                andFilterWithCompareString(ChapterTable.realUrl, realUrl),
-                andFilterWithCompare(ChapterTable.fetchedAt, fetchedAt),
-                andFilterWithCompare(ChapterTable.isDownloaded, isDownloaded),
-                andFilterWithCompare(ChapterTable.pageCount, pageCount)
-            )
-        }
-
-        fun getLibraryOp() = andFilterWithCompare(MangaTable.inLibrary, inLibrary)
-    }
-
-    fun chapters(
-        condition: ChapterCondition? = null,
-        filter: ChapterFilter? = null,
-        orderBy: ChapterOrderBy? = null,
-        orderByType: SortOrder? = null,
-        before: Cursor? = null,
-        after: Cursor? = null,
-        first: Int? = null,
-        last: Int? = null,
-        offset: Int? = null
-    ): ChapterNodeList {
-        val queryResults = transaction {
-            val res = ChapterTable.selectAll()
-
-            val libraryOp = filter?.getLibraryOp()
-            if (libraryOp != null) {
-                res.adjustColumnSet {
-                    innerJoin(MangaTable)
-                }
-                res.andWhere { libraryOp }
-            }
-
-            res.applyOps(condition, filter)
-
-            if (orderBy != null || (last != null || before != null)) {
-                val orderByColumn = orderBy?.column ?: ChapterTable.id
-                val orderType = orderByType.maybeSwap(last ?: before)
-
-                if (orderBy == ChapterOrderBy.ID || orderBy == null) {
-                    res.orderBy(orderByColumn to orderType)
-                } else {
-                    res.orderBy(
-                        orderByColumn to orderType,
-                        ChapterTable.id to SortOrder.ASC
-                    )
-                }
-            }
-
-            val total = res.count()
-            val firstResult = res.firstOrNull()?.get(ChapterTable.id)?.value
-            val lastResult = res.lastOrNull()?.get(ChapterTable.id)?.value
-
-            if (after != null) {
-                res.andWhere {
-                    (orderBy ?: ChapterOrderBy.ID).greater(after)
-                }
-            } else if (before != null) {
-                res.andWhere {
-                    (orderBy ?: ChapterOrderBy.ID).less(before)
-                }
-            }
-
-            if (first != null) {
-                res.limit(first, offset?.toLong() ?: 0)
-            } else if (last != null) {
-                res.limit(last)
-            }
-
-            QueryResults(total, firstResult, lastResult, res.toList())
-        }
-
-        val getAsCursor: (ChapterType) -> Cursor = (orderBy ?: ChapterOrderBy.ID)::asCursor
-
-        val resultsAsType = queryResults.results.map { ChapterType(it) }
-
-        return ChapterNodeList(
-            resultsAsType,
-            if (resultsAsType.isEmpty()) {
-                emptyList()
-            } else {
-                listOfNotNull(
-                    resultsAsType.firstOrNull()?.let {
-                        ChapterNodeList.ChapterEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    },
-                    resultsAsType.lastOrNull()?.let {
-                        ChapterNodeList.ChapterEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    }
-                )
-            },
-            pageInfo = PageInfo(
-                hasNextPage = queryResults.lastKey != resultsAsType.lastOrNull()?.id,
-                hasPreviousPage = queryResults.firstKey != resultsAsType.firstOrNull()?.id,
-                startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(it) },
-                endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(it) }
-            ),
-            totalCount = queryResults.total.toInt()
-        )
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt

@@ -1,230 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.queries
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import eu.kanade.tachiyomi.source.local.LocalSource
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq
-import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
-import suwayomi.tachidesk.graphql.queries.filter.Filter
-import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
-import suwayomi.tachidesk.graphql.queries.filter.IntFilter
-import suwayomi.tachidesk.graphql.queries.filter.OpAnd
-import suwayomi.tachidesk.graphql.queries.filter.StringFilter
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
-import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.OrderBy
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.graphql.server.primitives.QueryResults
-import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
-import suwayomi.tachidesk.graphql.types.ExtensionNodeList
-import suwayomi.tachidesk.graphql.types.ExtensionType
-import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import java.util.concurrent.CompletableFuture
-
-class ExtensionQuery {
-    fun extension(dataFetchingEnvironment: DataFetchingEnvironment, pkgName: String): CompletableFuture<ExtensionType?> {
-        return dataFetchingEnvironment.getValueFromDataLoader("ExtensionDataLoader", pkgName)
-    }
-
-    enum class ExtensionOrderBy(override val column: Column<out Comparable<*>>) : OrderBy<ExtensionType> {
-        PKG_NAME(ExtensionTable.pkgName),
-        NAME(ExtensionTable.name),
-        APK_NAME(ExtensionTable.apkName);
-
-        override fun greater(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                PKG_NAME -> ExtensionTable.pkgName greater cursor.value
-                NAME -> greaterNotUnique(ExtensionTable.name, ExtensionTable.pkgName, cursor, String::toString)
-                APK_NAME -> greaterNotUnique(ExtensionTable.apkName, ExtensionTable.pkgName, cursor, String::toString)
-            }
-        }
-
-        override fun less(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                PKG_NAME -> ExtensionTable.pkgName less cursor.value
-                NAME -> lessNotUnique(ExtensionTable.name, ExtensionTable.pkgName, cursor, String::toString)
-                APK_NAME -> lessNotUnique(ExtensionTable.apkName, ExtensionTable.pkgName, cursor, String::toString)
-            }
-        }
-
-        override fun asCursor(type: ExtensionType): Cursor {
-            val value = when (this) {
-                PKG_NAME -> type.pkgName
-                NAME -> type.pkgName + "\\-" + type.name
-                APK_NAME -> type.pkgName + "\\-" + type.apkName
-            }
-            return Cursor(value)
-        }
-    }
-
-    data class ExtensionCondition(
-        val apkName: String? = null,
-        val iconUrl: String? = null,
-        val name: String? = null,
-        val pkgName: String? = null,
-        val versionName: String? = null,
-        val versionCode: Int? = null,
-        val lang: String? = null,
-        val isNsfw: Boolean? = null,
-        val isInstalled: Boolean? = null,
-        val hasUpdate: Boolean? = null,
-        val isObsolete: Boolean? = null
-    ) : HasGetOp {
-        override fun getOp(): Op<Boolean>? {
-            val opAnd = OpAnd()
-            opAnd.eq(apkName, ExtensionTable.apkName)
-            opAnd.eq(iconUrl, ExtensionTable.iconUrl)
-            opAnd.eq(name, ExtensionTable.name)
-            opAnd.eq(versionName, ExtensionTable.versionName)
-            opAnd.eq(versionCode, ExtensionTable.versionCode)
-            opAnd.eq(lang, ExtensionTable.lang)
-            opAnd.eq(isNsfw, ExtensionTable.isNsfw)
-            opAnd.eq(isInstalled, ExtensionTable.isInstalled)
-            opAnd.eq(hasUpdate, ExtensionTable.hasUpdate)
-            opAnd.eq(isObsolete, ExtensionTable.isObsolete)
-
-            return opAnd.op
-        }
-    }
-
-    data class ExtensionFilter(
-        val apkName: StringFilter? = null,
-        val iconUrl: StringFilter? = null,
-        val name: StringFilter? = null,
-        val pkgName: StringFilter? = null,
-        val versionName: StringFilter? = null,
-        val versionCode: IntFilter? = null,
-        val lang: StringFilter? = null,
-        val isNsfw: BooleanFilter? = null,
-        val isInstalled: BooleanFilter? = null,
-        val hasUpdate: BooleanFilter? = null,
-        val isObsolete: BooleanFilter? = null,
-        override val and: List<ExtensionFilter>? = null,
-        override val or: List<ExtensionFilter>? = null,
-        override val not: ExtensionFilter? = null
-    ) : Filter<ExtensionFilter> {
-        override fun getOpList(): List<Op<Boolean>> {
-            return listOfNotNull(
-                andFilterWithCompareString(ExtensionTable.apkName, apkName),
-                andFilterWithCompareString(ExtensionTable.iconUrl, iconUrl),
-                andFilterWithCompareString(ExtensionTable.name, name),
-                andFilterWithCompareString(ExtensionTable.pkgName, pkgName),
-                andFilterWithCompareString(ExtensionTable.versionName, versionName),
-                andFilterWithCompare(ExtensionTable.versionCode, versionCode),
-                andFilterWithCompareString(ExtensionTable.lang, lang),
-                andFilterWithCompare(ExtensionTable.isNsfw, isNsfw),
-                andFilterWithCompare(ExtensionTable.isInstalled, isInstalled),
-                andFilterWithCompare(ExtensionTable.hasUpdate, hasUpdate),
-                andFilterWithCompare(ExtensionTable.isObsolete, isObsolete)
-            )
-        }
-    }
-
-    fun extensions(
-        condition: ExtensionCondition? = null,
-        filter: ExtensionFilter? = null,
-        orderBy: ExtensionOrderBy? = null,
-        orderByType: SortOrder? = null,
-        before: Cursor? = null,
-        after: Cursor? = null,
-        first: Int? = null,
-        last: Int? = null,
-        offset: Int? = null
-    ): ExtensionNodeList {
-        val queryResults = transaction {
-            val res = ExtensionTable.selectAll()
-
-            res.adjustWhere { ExtensionTable.name neq LocalSource.EXTENSION_NAME }
-
-            res.applyOps(condition, filter)
-
-            if (orderBy != null || (last != null || before != null)) {
-                val orderByColumn = orderBy?.column ?: ExtensionTable.pkgName
-                val orderType = orderByType.maybeSwap(last ?: before)
-
-                if (orderBy == ExtensionOrderBy.PKG_NAME || orderBy == null) {
-                    res.orderBy(orderByColumn to orderType)
-                } else {
-                    res.orderBy(
-                        orderByColumn to orderType,
-                        ExtensionTable.pkgName to SortOrder.ASC
-                    )
-                }
-            }
-
-            val total = res.count()
-            val firstResult = res.firstOrNull()?.get(ExtensionTable.pkgName)
-            val lastResult = res.lastOrNull()?.get(ExtensionTable.pkgName)
-
-            if (after != null) {
-                res.andWhere {
-                    (orderBy ?: ExtensionOrderBy.PKG_NAME).greater(after)
-                }
-            } else if (before != null) {
-                res.andWhere {
-                    (orderBy ?: ExtensionOrderBy.PKG_NAME).less(before)
-                }
-            }
-
-            if (first != null) {
-                res.limit(first, offset?.toLong() ?: 0)
-            } else if (last != null) {
-                res.limit(last)
-            }
-
-            QueryResults(total, firstResult, lastResult, res.toList())
-        }
-
-        val getAsCursor: (ExtensionType) -> Cursor = (orderBy ?: ExtensionOrderBy.PKG_NAME)::asCursor
-
-        val resultsAsType = queryResults.results.map { ExtensionType(it) }
-
-        return ExtensionNodeList(
-            resultsAsType,
-            if (resultsAsType.isEmpty()) {
-                emptyList()
-            } else {
-                listOfNotNull(
-                    resultsAsType.firstOrNull()?.let {
-                        ExtensionNodeList.ExtensionEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    },
-                    resultsAsType.lastOrNull()?.let {
-                        ExtensionNodeList.ExtensionEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    }
-                )
-            },
-            pageInfo = PageInfo(
-                hasNextPage = queryResults.lastKey != resultsAsType.lastOrNull()?.pkgName,
-                hasPreviousPage = queryResults.firstKey != resultsAsType.firstOrNull()?.pkgName,
-                startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(it) },
-                endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(it) }
-            ),
-            totalCount = queryResults.total.toInt()
-        )
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt

@@ -1,282 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.queries
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
-import suwayomi.tachidesk.graphql.queries.filter.ComparableScalarFilter
-import suwayomi.tachidesk.graphql.queries.filter.Filter
-import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
-import suwayomi.tachidesk.graphql.queries.filter.IntFilter
-import suwayomi.tachidesk.graphql.queries.filter.LongFilter
-import suwayomi.tachidesk.graphql.queries.filter.OpAnd
-import suwayomi.tachidesk.graphql.queries.filter.StringFilter
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
-import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.OrderBy
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.graphql.server.primitives.QueryResults
-import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
-import suwayomi.tachidesk.graphql.types.MangaNodeList
-import suwayomi.tachidesk.graphql.types.MangaType
-import suwayomi.tachidesk.manga.model.table.MangaStatus
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import java.util.concurrent.CompletableFuture
-
-class MangaQuery {
-    fun manga(dataFetchingEnvironment: DataFetchingEnvironment, id: Int): CompletableFuture<MangaType?> {
-        return dataFetchingEnvironment.getValueFromDataLoader("MangaDataLoader", id)
-    }
-
-    enum class MangaOrderBy(override val column: Column<out Comparable<*>>) : OrderBy<MangaType> {
-        ID(MangaTable.id),
-        TITLE(MangaTable.title),
-        IN_LIBRARY_AT(MangaTable.inLibraryAt),
-        LAST_FETCHED_AT(MangaTable.lastFetchedAt);
-
-        override fun greater(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                ID -> MangaTable.id greater cursor.value.toInt()
-                TITLE -> greaterNotUnique(MangaTable.title, MangaTable.id, cursor, String::toString)
-                IN_LIBRARY_AT -> greaterNotUnique(MangaTable.inLibraryAt, MangaTable.id, cursor, String::toLong)
-                LAST_FETCHED_AT -> greaterNotUnique(MangaTable.lastFetchedAt, MangaTable.id, cursor, String::toLong)
-            }
-        }
-
-        override fun less(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                ID -> MangaTable.id less cursor.value.toInt()
-                TITLE -> lessNotUnique(MangaTable.title, MangaTable.id, cursor, String::toString)
-                IN_LIBRARY_AT -> lessNotUnique(MangaTable.inLibraryAt, MangaTable.id, cursor, String::toLong)
-                LAST_FETCHED_AT -> lessNotUnique(MangaTable.lastFetchedAt, MangaTable.id, cursor, String::toLong)
-            }
-        }
-
-        override fun asCursor(type: MangaType): Cursor {
-            val value = when (this) {
-                ID -> type.id.toString()
-                TITLE -> type.id.toString() + "-" + type.title
-                IN_LIBRARY_AT -> type.id.toString() + "-" + type.inLibraryAt.toString()
-                LAST_FETCHED_AT -> type.id.toString() + "-" + type.lastFetchedAt.toString()
-            }
-            return Cursor(value)
-        }
-    }
-
-    data class MangaCondition(
-        val id: Int? = null,
-        val sourceId: Long? = null,
-        val url: String? = null,
-        val title: String? = null,
-        val thumbnailUrl: String? = null,
-        val initialized: Boolean? = null,
-        val artist: String? = null,
-        val author: String? = null,
-        val description: String? = null,
-        val genre: List<String>? = null,
-        val status: MangaStatus? = null,
-        val inLibrary: Boolean? = null,
-        val inLibraryAt: Long? = null,
-        val realUrl: String? = null,
-        val lastFetchedAt: Long? = null,
-        val chaptersLastFetchedAt: Long? = null
-    ) : HasGetOp {
-        override fun getOp(): Op<Boolean>? {
-            val opAnd = OpAnd()
-            opAnd.eq(id, MangaTable.id)
-            opAnd.eq(sourceId, MangaTable.sourceReference)
-            opAnd.eq(url, MangaTable.url)
-            opAnd.eq(title, MangaTable.title)
-            opAnd.eq(thumbnailUrl, MangaTable.thumbnail_url)
-            opAnd.eq(initialized, MangaTable.initialized)
-            opAnd.eq(artist, MangaTable.artist)
-            opAnd.eq(author, MangaTable.author)
-            opAnd.eq(description, MangaTable.description)
-            opAnd.eq(genre?.joinToString(), MangaTable.genre)
-            opAnd.eq(status?.value, MangaTable.status)
-            opAnd.eq(inLibrary, MangaTable.inLibrary)
-            opAnd.eq(inLibraryAt, MangaTable.inLibraryAt)
-            opAnd.eq(realUrl, MangaTable.realUrl)
-            opAnd.eq(lastFetchedAt, MangaTable.lastFetchedAt)
-            opAnd.eq(chaptersLastFetchedAt, MangaTable.chaptersLastFetchedAt)
-
-            return opAnd.op
-        }
-    }
-
-    data class MangaStatusFilter(
-        override val isNull: Boolean? = null,
-        override val equalTo: MangaStatus? = null,
-        override val notEqualTo: MangaStatus? = null,
-        override val distinctFrom: MangaStatus? = null,
-        override val notDistinctFrom: MangaStatus? = null,
-        override val `in`: List<MangaStatus>? = null,
-        override val notIn: List<MangaStatus>? = null,
-        override val lessThan: MangaStatus? = null,
-        override val lessThanOrEqualTo: MangaStatus? = null,
-        override val greaterThan: MangaStatus? = null,
-        override val greaterThanOrEqualTo: MangaStatus? = null
-    ) : ComparableScalarFilter<MangaStatus> {
-        fun asIntFilter() = IntFilter(
-            equalTo = equalTo?.value,
-            notEqualTo = notEqualTo?.value,
-            distinctFrom = distinctFrom?.value,
-            notDistinctFrom = notDistinctFrom?.value,
-            `in` = `in`?.map { it.value },
-            notIn = notIn?.map { it.value },
-            lessThan = lessThan?.value,
-            lessThanOrEqualTo = lessThanOrEqualTo?.value,
-            greaterThan = greaterThan?.value,
-            greaterThanOrEqualTo = greaterThanOrEqualTo?.value
-
-        )
-    }
-
-    data class MangaFilter(
-        val id: IntFilter? = null,
-        val sourceId: LongFilter? = null,
-        val url: StringFilter? = null,
-        val title: StringFilter? = null,
-        val thumbnailUrl: StringFilter? = null,
-        val initialized: BooleanFilter? = null,
-        val artist: StringFilter? = null,
-        val author: StringFilter? = null,
-        val description: StringFilter? = null,
-        // val genre: List<String>? = null, // todo
-        val status: MangaStatusFilter? = null,
-        val inLibrary: BooleanFilter? = null,
-        val inLibraryAt: LongFilter? = null,
-        val realUrl: StringFilter? = null,
-        val lastFetchedAt: LongFilter? = null,
-        val chaptersLastFetchedAt: LongFilter? = null,
-        override val and: List<MangaFilter>? = null,
-        override val or: List<MangaFilter>? = null,
-        override val not: MangaFilter? = null
-    ) : Filter<MangaFilter> {
-        override fun getOpList(): List<Op<Boolean>> {
-            return listOfNotNull(
-                andFilterWithCompareEntity(MangaTable.id, id),
-                andFilterWithCompare(MangaTable.sourceReference, sourceId),
-                andFilterWithCompareString(MangaTable.url, url),
-                andFilterWithCompareString(MangaTable.title, title),
-                andFilterWithCompareString(MangaTable.thumbnail_url, thumbnailUrl),
-                andFilterWithCompare(MangaTable.initialized, initialized),
-                andFilterWithCompareString(MangaTable.artist, artist),
-                andFilterWithCompareString(MangaTable.author, author),
-                andFilterWithCompareString(MangaTable.description, description),
-                andFilterWithCompare(MangaTable.status, status?.asIntFilter()),
-                andFilterWithCompare(MangaTable.inLibrary, inLibrary),
-                andFilterWithCompare(MangaTable.inLibraryAt, inLibraryAt),
-                andFilterWithCompareString(MangaTable.realUrl, realUrl),
-                andFilterWithCompare(MangaTable.inLibraryAt, lastFetchedAt),
-                andFilterWithCompare(MangaTable.inLibraryAt, chaptersLastFetchedAt)
-            )
-        }
-    }
-
-    fun mangas(
-        condition: MangaCondition? = null,
-        filter: MangaFilter? = null,
-        orderBy: MangaOrderBy? = null,
-        orderByType: SortOrder? = null,
-        before: Cursor? = null,
-        after: Cursor? = null,
-        first: Int? = null,
-        last: Int? = null,
-        offset: Int? = null
-    ): MangaNodeList {
-        val queryResults = transaction {
-            val res = MangaTable.selectAll()
-
-            res.applyOps(condition, filter)
-
-            if (orderBy != null || (last != null || before != null)) {
-                val orderByColumn = orderBy?.column ?: MangaTable.id
-                val orderType = orderByType.maybeSwap(last ?: before)
-
-                if (orderBy == MangaOrderBy.ID || orderBy == null) {
-                    res.orderBy(orderByColumn to orderType)
-                } else {
-                    res.orderBy(
-                        orderByColumn to orderType,
-                        MangaTable.id to SortOrder.ASC
-                    )
-                }
-            }
-
-            val total = res.count()
-            val firstResult = res.firstOrNull()?.get(MangaTable.id)?.value
-            val lastResult = res.lastOrNull()?.get(MangaTable.id)?.value
-
-            if (after != null) {
-                res.andWhere {
-                    (orderBy ?: MangaOrderBy.ID).greater(after)
-                }
-            } else if (before != null) {
-                res.andWhere {
-                    (orderBy ?: MangaOrderBy.ID).less(before)
-                }
-            }
-
-            if (first != null) {
-                res.limit(first, offset?.toLong() ?: 0)
-            } else if (last != null) {
-                res.limit(last)
-            }
-
-            QueryResults(total, firstResult, lastResult, res.toList())
-        }
-
-        val getAsCursor: (MangaType) -> Cursor = (orderBy ?: MangaOrderBy.ID)::asCursor
-
-        val resultsAsType = queryResults.results.map { MangaType(it) }
-
-        return MangaNodeList(
-            resultsAsType,
-            if (resultsAsType.isEmpty()) {
-                emptyList()
-            } else {
-                listOfNotNull(
-                    resultsAsType.firstOrNull()?.let {
-                        MangaNodeList.MangaEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    },
-                    resultsAsType.lastOrNull()?.let {
-                        MangaNodeList.MangaEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    }
-                )
-            },
-            pageInfo = PageInfo(
-                hasNextPage = queryResults.lastKey != resultsAsType.lastOrNull()?.id,
-                hasPreviousPage = queryResults.firstKey != resultsAsType.firstOrNull()?.id,
-                startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(it) },
-                endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(it) }
-            ),
-            totalCount = queryResults.total.toInt()
-        )
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt

@@ -1,184 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.queries
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.global.model.table.GlobalMetaTable
-import suwayomi.tachidesk.graphql.queries.filter.Filter
-import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
-import suwayomi.tachidesk.graphql.queries.filter.OpAnd
-import suwayomi.tachidesk.graphql.queries.filter.StringFilter
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
-import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.OrderBy
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.graphql.server.primitives.QueryResults
-import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
-import suwayomi.tachidesk.graphql.types.GlobalMetaNodeList
-import suwayomi.tachidesk.graphql.types.GlobalMetaType
-import java.util.concurrent.CompletableFuture
-
-class MetaQuery {
-    fun meta(dataFetchingEnvironment: DataFetchingEnvironment, key: String): CompletableFuture<GlobalMetaType?> {
-        return dataFetchingEnvironment.getValueFromDataLoader<String, GlobalMetaType?>("GlobalMetaDataLoader", key)
-    }
-
-    enum class MetaOrderBy(override val column: Column<out Comparable<*>>) : OrderBy<GlobalMetaType> {
-        KEY(GlobalMetaTable.key),
-        VALUE(GlobalMetaTable.value);
-
-        override fun greater(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                KEY -> GlobalMetaTable.key greater cursor.value
-                VALUE -> greaterNotUnique(GlobalMetaTable.value, GlobalMetaTable.key, cursor, String::toString)
-            }
-        }
-
-        override fun less(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                KEY -> GlobalMetaTable.key less cursor.value
-                VALUE -> lessNotUnique(GlobalMetaTable.value, GlobalMetaTable.key, cursor, String::toString)
-            }
-        }
-
-        override fun asCursor(type: GlobalMetaType): Cursor {
-            val value = when (this) {
-                KEY -> type.key
-                VALUE -> type.key + "\\-" + type.value
-            }
-            return Cursor(value)
-        }
-    }
-
-    data class MetaCondition(
-        val key: String? = null,
-        val value: String? = null
-    ) : HasGetOp {
-        override fun getOp(): Op<Boolean>? {
-            val opAnd = OpAnd()
-            opAnd.eq(key, GlobalMetaTable.key)
-            opAnd.eq(value, GlobalMetaTable.value)
-
-            return opAnd.op
-        }
-    }
-
-    data class MetaFilter(
-        val key: StringFilter? = null,
-        val value: StringFilter? = null,
-        override val and: List<MetaFilter>? = null,
-        override val or: List<MetaFilter>? = null,
-        override val not: MetaFilter? = null
-    ) : Filter<MetaFilter> {
-        override fun getOpList(): List<Op<Boolean>> {
-            return listOfNotNull(
-                andFilterWithCompareString(GlobalMetaTable.key, key),
-                andFilterWithCompareString(GlobalMetaTable.value, value)
-            )
-        }
-    }
-
-    fun metas(
-        condition: MetaCondition? = null,
-        filter: MetaFilter? = null,
-        orderBy: MetaOrderBy? = null,
-        orderByType: SortOrder? = null,
-        before: Cursor? = null,
-        after: Cursor? = null,
-        first: Int? = null,
-        last: Int? = null,
-        offset: Int? = null
-    ): GlobalMetaNodeList {
-        val queryResults = transaction {
-            val res = GlobalMetaTable.selectAll()
-
-            res.applyOps(condition, filter)
-
-            if (orderBy != null || (last != null || before != null)) {
-                val orderByColumn = orderBy?.column ?: GlobalMetaTable.key
-                val orderType = orderByType.maybeSwap(last ?: before)
-
-                if (orderBy == MetaOrderBy.KEY || orderBy == null) {
-                    res.orderBy(orderByColumn to orderType)
-                } else {
-                    res.orderBy(
-                        orderByColumn to orderType,
-                        GlobalMetaTable.key to SortOrder.ASC
-                    )
-                }
-            }
-
-            val total = res.count()
-            val firstResult = res.firstOrNull()?.get(GlobalMetaTable.key)
-            val lastResult = res.lastOrNull()?.get(GlobalMetaTable.key)
-
-            if (after != null) {
-                res.andWhere {
-                    (orderBy ?: MetaOrderBy.KEY).greater(after)
-                }
-            } else if (before != null) {
-                res.andWhere {
-                    (orderBy ?: MetaOrderBy.KEY).less(before)
-                }
-            }
-
-            if (first != null) {
-                res.limit(first, offset?.toLong() ?: 0)
-            } else if (last != null) {
-                res.limit(last)
-            }
-
-            QueryResults(total, firstResult, lastResult, res.toList())
-        }
-
-        val getAsCursor: (GlobalMetaType) -> Cursor = (orderBy ?: MetaOrderBy.KEY)::asCursor
-
-        val resultsAsType = queryResults.results.map { GlobalMetaType(it) }
-
-        return GlobalMetaNodeList(
-            resultsAsType,
-            if (resultsAsType.isEmpty()) {
-                emptyList()
-            } else {
-                listOfNotNull(
-                    resultsAsType.firstOrNull()?.let {
-                        GlobalMetaNodeList.MetaEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    },
-                    resultsAsType.lastOrNull()?.let {
-                        GlobalMetaNodeList.MetaEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    }
-                )
-            },
-            pageInfo = PageInfo(
-                hasNextPage = queryResults.lastKey != resultsAsType.lastOrNull()?.key,
-                hasPreviousPage = queryResults.firstKey != resultsAsType.firstOrNull()?.key,
-                startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(it) },
-                endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(it) }
-            ),
-            totalCount = queryResults.total.toInt()
-        )
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt

@@ -1,200 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.queries
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
-import suwayomi.tachidesk.graphql.queries.filter.Filter
-import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
-import suwayomi.tachidesk.graphql.queries.filter.LongFilter
-import suwayomi.tachidesk.graphql.queries.filter.OpAnd
-import suwayomi.tachidesk.graphql.queries.filter.StringFilter
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
-import suwayomi.tachidesk.graphql.queries.filter.applyOps
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.OrderBy
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.graphql.server.primitives.QueryResults
-import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
-import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
-import suwayomi.tachidesk.graphql.types.SourceNodeList
-import suwayomi.tachidesk.graphql.types.SourceType
-import suwayomi.tachidesk.manga.model.table.SourceTable
-import java.util.concurrent.CompletableFuture
-
-class SourceQuery {
-    fun source(dataFetchingEnvironment: DataFetchingEnvironment, id: Long): CompletableFuture<SourceType?> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Long, SourceType?>("SourceDataLoader", id)
-    }
-
-    enum class SourceOrderBy(override val column: Column<out Comparable<*>>) : OrderBy<SourceType> {
-        ID(SourceTable.id),
-        NAME(SourceTable.name),
-        LANG(SourceTable.lang);
-
-        override fun greater(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                ID -> SourceTable.id greater cursor.value.toLong()
-                NAME -> greaterNotUnique(SourceTable.name, SourceTable.id, cursor, String::toString)
-                LANG -> greaterNotUnique(SourceTable.lang, SourceTable.id, cursor, String::toString)
-            }
-        }
-
-        override fun less(cursor: Cursor): Op<Boolean> {
-            return when (this) {
-                ID -> SourceTable.id less cursor.value.toLong()
-                NAME -> lessNotUnique(SourceTable.name, SourceTable.id, cursor, String::toString)
-                LANG -> lessNotUnique(SourceTable.lang, SourceTable.id, cursor, String::toString)
-            }
-        }
-
-        override fun asCursor(type: SourceType): Cursor {
-            val value = when (this) {
-                ID -> type.id.toString()
-                NAME -> type.id.toString() + "-" + type.name
-                LANG -> type.id.toString() + "-" + type.lang
-            }
-            return Cursor(value)
-        }
-    }
-
-    data class SourceCondition(
-        val id: Long? = null,
-        val name: String? = null,
-        val lang: String? = null,
-        val isNsfw: Boolean? = null
-    ) : HasGetOp {
-        override fun getOp(): Op<Boolean>? {
-            val opAnd = OpAnd()
-            opAnd.eq(id, SourceTable.id)
-            opAnd.eq(name, SourceTable.name)
-            opAnd.eq(lang, SourceTable.lang)
-            opAnd.eq(isNsfw, SourceTable.isNsfw)
-
-            return opAnd.op
-        }
-    }
-
-    data class SourceFilter(
-        val id: LongFilter? = null,
-        val name: StringFilter? = null,
-        val lang: StringFilter? = null,
-        val isNsfw: BooleanFilter? = null,
-        override val and: List<SourceFilter>? = null,
-        override val or: List<SourceFilter>? = null,
-        override val not: SourceFilter? = null
-    ) : Filter<SourceFilter> {
-        override fun getOpList(): List<Op<Boolean>> {
-            return listOfNotNull(
-                andFilterWithCompareEntity(SourceTable.id, id),
-                andFilterWithCompareString(SourceTable.name, name),
-                andFilterWithCompareString(SourceTable.lang, lang),
-                andFilterWithCompare(SourceTable.isNsfw, isNsfw)
-            )
-        }
-    }
-
-    fun sources(
-        condition: SourceCondition? = null,
-        filter: SourceFilter? = null,
-        orderBy: SourceOrderBy? = null,
-        orderByType: SortOrder? = null,
-        before: Cursor? = null,
-        after: Cursor? = null,
-        first: Int? = null,
-        last: Int? = null,
-        offset: Int? = null
-    ): SourceNodeList {
-        val (queryResults, resultsAsType) = transaction {
-            val res = SourceTable.selectAll()
-
-            res.applyOps(condition, filter)
-
-            if (orderBy != null || (last != null || before != null)) {
-                val orderByColumn = orderBy?.column ?: SourceTable.id
-                val orderType = orderByType.maybeSwap(last ?: before)
-
-                if (orderBy == SourceOrderBy.ID || orderBy == null) {
-                    res.orderBy(orderByColumn to orderType)
-                } else {
-                    res.orderBy(
-                        orderByColumn to orderType,
-                        SourceTable.id to SortOrder.ASC
-                    )
-                }
-            }
-
-            val total = res.count()
-            val firstResult = res.firstOrNull()?.get(SourceTable.id)?.value
-            val lastResult = res.lastOrNull()?.get(SourceTable.id)?.value
-
-            if (after != null) {
-                res.andWhere {
-                    (orderBy ?: SourceOrderBy.ID).greater(after)
-                }
-            } else if (before != null) {
-                res.andWhere {
-                    (orderBy ?: SourceOrderBy.ID).less(before)
-                }
-            }
-
-            if (first != null) {
-                res.limit(first, offset?.toLong() ?: 0)
-            } else if (last != null) {
-                res.limit(last)
-            }
-
-            QueryResults(total, firstResult, lastResult, res.toList()).let {
-                it to it.results.mapNotNull { SourceType(it) }
-            }
-        }
-
-        val getAsCursor: (SourceType) -> Cursor = (orderBy ?: SourceOrderBy.ID)::asCursor
-
-        return SourceNodeList(
-            resultsAsType,
-            if (resultsAsType.isEmpty()) {
-                emptyList()
-            } else {
-                listOfNotNull(
-                    resultsAsType.firstOrNull()?.let {
-                        SourceNodeList.SourceEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    },
-                    resultsAsType.lastOrNull()?.let {
-                        SourceNodeList.SourceEdge(
-                            getAsCursor(it),
-                            it
-                        )
-                    }
-                )
-            },
-            pageInfo = PageInfo(
-                hasNextPage = queryResults.lastKey != resultsAsType.lastOrNull()?.id,
-                hasPreviousPage = queryResults.firstKey != resultsAsType.firstOrNull()?.id,
-                startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(it) },
-                endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(it) }
-            ),
-            totalCount = queryResults.total.toInt()
-        )
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt

@@ -1,22 +0,0 @@
-package suwayomi.tachidesk.graphql.queries
-
-import suwayomi.tachidesk.graphql.types.TrackServiceType
-import suwayomi.tachidesk.server.trackManager
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-class TrackQuery {
-    fun trackService(id: Long): TrackServiceType? =
-        trackManager.services.find { it.id == id }?.let {
-            TrackServiceType(it)
-        }
-
-    fun trackServices(): List<TrackServiceType> = trackManager.services.map {
-        TrackServiceType(it)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt

@@ -1,397 +0,0 @@
-package suwayomi.tachidesk.graphql.queries.filter
-
-import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.ComparisonOp
-import org.jetbrains.exposed.sql.Expression
-import org.jetbrains.exposed.sql.ExpressionWithColumnType
-import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.sql.Query
-import org.jetbrains.exposed.sql.QueryBuilder
-import org.jetbrains.exposed.sql.SqlExpressionBuilder
-import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.sql.not
-import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.sql.stringParam
-import org.jetbrains.exposed.sql.upperCase
-
-class ILikeEscapeOp(expr1: Expression<*>, expr2: Expression<*>, like: Boolean, val escapeChar: Char?) : ComparisonOp(expr1, expr2, if (like) "ILIKE" else "NOT ILIKE") {
-    override fun toQueryBuilder(queryBuilder: QueryBuilder) {
-        super.toQueryBuilder(queryBuilder)
-        if (escapeChar != null) {
-            with(queryBuilder) {
-                +" ESCAPE "
-                +stringParam(escapeChar.toString())
-            }
-        }
-    }
-
-    companion object {
-        fun <T : String?> iLike(expression: Expression<T>, pattern: String): ILikeEscapeOp = iLike(expression, LikePattern(pattern))
-        fun <T : String?> iNotLike(expression: Expression<T>, pattern: String): ILikeEscapeOp = iNotLike(expression, LikePattern(pattern))
-        fun <T : String?> iLike(expression: Expression<T>, pattern: LikePattern): ILikeEscapeOp = ILikeEscapeOp(expression, stringParam(pattern.pattern), true, pattern.escapeChar)
-        fun <T : String?> iNotLike(expression: Expression<T>, pattern: LikePattern): ILikeEscapeOp = ILikeEscapeOp(expression, stringParam(pattern.pattern), false, pattern.escapeChar)
-    }
-}
-
-class DistinctFromOp(expr1: Expression<*>, expr2: Expression<*>, not: Boolean) : ComparisonOp(expr1, expr2, if (not) "IS NOT DISTINCT FROM" else "IS DISTINCT FROM") {
-    companion object {
-        fun <T> distinctFrom(expression: ExpressionWithColumnType<T>, t: T): DistinctFromOp = DistinctFromOp(
-            expression,
-            with(SqlExpressionBuilder) {
-                expression.wrap(t)
-            },
-            false
-        )
-        fun <T> notDistinctFrom(expression: ExpressionWithColumnType<T>, t: T): DistinctFromOp = DistinctFromOp(
-            expression,
-            with(SqlExpressionBuilder) {
-                expression.wrap(t)
-            },
-            true
-        )
-        fun <T : Comparable<T>> distinctFrom(expression: ExpressionWithColumnType<EntityID<T>>, t: T): DistinctFromOp = DistinctFromOp(
-            expression,
-            with(SqlExpressionBuilder) {
-                expression.wrap(t)
-            },
-            false
-        )
-        fun <T : Comparable<T>> notDistinctFrom(expression: ExpressionWithColumnType<EntityID<T>>, t: T): DistinctFromOp = DistinctFromOp(
-            expression,
-            with(SqlExpressionBuilder) {
-                expression.wrap(t)
-            },
-            true
-        )
-    }
-}
-
-interface HasGetOp {
-    fun getOp(): Op<Boolean>?
-}
-
-fun Query.applyOps(vararg ops: HasGetOp?) {
-    ops.mapNotNull { it?.getOp() }.forEach {
-        andWhere { it }
-    }
-}
-
-interface Filter<T : Filter<T>> : HasGetOp {
-    val and: List<T>?
-    val or: List<T>?
-    val not: T?
-
-    fun getOpList(): List<Op<Boolean>>
-
-    override fun getOp(): Op<Boolean>? {
-        var op: Op<Boolean>? = null
-        fun newOp(
-            otherOp: Op<Boolean>?,
-            operator: (Op<Boolean>, Op<Boolean>) -> Op<Boolean>
-        ) {
-            when {
-                op == null && otherOp == null -> Unit
-                op == null && otherOp != null -> op = otherOp
-                op != null && otherOp == null -> Unit
-                op != null && otherOp != null -> op = operator(op!!, otherOp)
-            }
-        }
-        fun andOp(andOp: Op<Boolean>?) {
-            newOp(andOp, Op<Boolean>::and)
-        }
-        fun orOp(orOp: Op<Boolean>?) {
-            newOp(orOp, Op<Boolean>::or)
-        }
-        getOpList().forEach {
-            andOp(it)
-        }
-        and?.forEach {
-            andOp(it.getOp())
-        }
-        or?.forEach {
-            orOp(it.getOp())
-        }
-        if (not != null) {
-            andOp(not!!.getOp()?.let(::not))
-        }
-        return op
-    }
-}
-
-interface ScalarFilter<T> {
-    val isNull: Boolean?
-    val equalTo: T?
-    val notEqualTo: T?
-    val distinctFrom: T?
-    val notDistinctFrom: T?
-    val `in`: List<T>?
-    val notIn: List<T>?
-}
-
-interface ComparableScalarFilter<T : Comparable<T>?> : ScalarFilter<T> {
-    val lessThan: T?
-    val lessThanOrEqualTo: T?
-    val greaterThan: T?
-    val greaterThanOrEqualTo: T?
-}
-
-interface ListScalarFilter<T, R : List<T>> : ScalarFilter<T> {
-    val hasAny: List<T>?
-    val hasAll: List<T>?
-    val hasNone: List<T>?
-}
-
-data class LongFilter(
-    override val isNull: Boolean? = null,
-    override val equalTo: Long? = null,
-    override val notEqualTo: Long? = null,
-    override val distinctFrom: Long? = null,
-    override val notDistinctFrom: Long? = null,
-    override val `in`: List<Long>? = null,
-    override val notIn: List<Long>? = null,
-    override val lessThan: Long? = null,
-    override val lessThanOrEqualTo: Long? = null,
-    override val greaterThan: Long? = null,
-    override val greaterThanOrEqualTo: Long? = null
-) : ComparableScalarFilter<Long>
-
-data class BooleanFilter(
-    override val isNull: Boolean? = null,
-    override val equalTo: Boolean? = null,
-    override val notEqualTo: Boolean? = null,
-    override val distinctFrom: Boolean? = null,
-    override val notDistinctFrom: Boolean? = null,
-    override val `in`: List<Boolean>? = null,
-    override val notIn: List<Boolean>? = null,
-    override val lessThan: Boolean? = null,
-    override val lessThanOrEqualTo: Boolean? = null,
-    override val greaterThan: Boolean? = null,
-    override val greaterThanOrEqualTo: Boolean? = null
-) : ComparableScalarFilter<Boolean>
-
-data class IntFilter(
-    override val isNull: Boolean? = null,
-    override val equalTo: Int? = null,
-    override val notEqualTo: Int? = null,
-    override val distinctFrom: Int? = null,
-    override val notDistinctFrom: Int? = null,
-    override val `in`: List<Int>? = null,
-    override val notIn: List<Int>? = null,
-    override val lessThan: Int? = null,
-    override val lessThanOrEqualTo: Int? = null,
-    override val greaterThan: Int? = null,
-    override val greaterThanOrEqualTo: Int? = null
-) : ComparableScalarFilter<Int>
-
-data class FloatFilter(
-    override val isNull: Boolean? = null,
-    override val equalTo: Float? = null,
-    override val notEqualTo: Float? = null,
-    override val distinctFrom: Float? = null,
-    override val notDistinctFrom: Float? = null,
-    override val `in`: List<Float>? = null,
-    override val notIn: List<Float>? = null,
-    override val lessThan: Float? = null,
-    override val lessThanOrEqualTo: Float? = null,
-    override val greaterThan: Float? = null,
-    override val greaterThanOrEqualTo: Float? = null
-) : ComparableScalarFilter<Float>
-
-data class StringFilter(
-    override val isNull: Boolean? = null,
-    override val equalTo: String? = null,
-    override val notEqualTo: String? = null,
-    override val distinctFrom: String? = null,
-    override val notDistinctFrom: String? = null,
-    override val `in`: List<String>? = null,
-    override val notIn: List<String>? = null,
-    override val lessThan: String? = null,
-    override val lessThanOrEqualTo: String? = null,
-    override val greaterThan: String? = null,
-    override val greaterThanOrEqualTo: String? = null,
-    val includes: String? = null,
-    val notIncludes: String? = null,
-    val includesInsensitive: String? = null,
-    val notIncludesInsensitive: String? = null,
-    val startsWith: String? = null,
-    val notStartsWith: String? = null,
-    val startsWithInsensitive: String? = null,
-    val notStartsWithInsensitive: String? = null,
-    val endsWith: String? = null,
-    val notEndsWith: String? = null,
-    val endsWithInsensitive: String? = null,
-    val notEndsWithInsensitive: String? = null,
-    val like: String? = null,
-    val notLike: String? = null,
-    val likeInsensitive: String? = null,
-    val notLikeInsensitive: String? = null,
-    val distinctFromInsensitive: String? = null,
-    val notDistinctFromInsensitive: String? = null,
-    val inInsensitive: List<String>? = null,
-    val notInInsensitive: List<String>? = null,
-    val lessThanInsensitive: String? = null,
-    val lessThanOrEqualToInsensitive: String? = null,
-    val greaterThanInsensitive: String? = null,
-    val greaterThanOrEqualToInsensitive: String? = null
-) : ComparableScalarFilter<String>
-
-data class StringListFilter(
-    override val isNull: Boolean? = null,
-    override val equalTo: String? = null,
-    override val notEqualTo: String? = null,
-    override val distinctFrom: String? = null,
-    override val notDistinctFrom: String? = null,
-    override val `in`: List<String>? = null,
-    override val notIn: List<String>? = null,
-    override val hasAny: List<String>? = null,
-    override val hasAll: List<String>? = null,
-    override val hasNone: List<String>? = null,
-    val hasAnyInsensitive: List<String>? = null,
-    val hasAllInsensitive: List<String>? = null,
-    val hasNoneInsensitive: List<String>? = null
-) : ListScalarFilter<String, List<String>>
-
-@Suppress("UNCHECKED_CAST")
-fun <T : String, S : T?> andFilterWithCompareString(
-    column: Column<S>,
-    filter: StringFilter?
-): Op<Boolean>? {
-    filter ?: return null
-    val opAnd = OpAnd()
-
-    opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
-    opAnd.andWhere(filter.equalTo) { column eq it as S }
-    opAnd.andWhere(filter.notEqualTo) { column neq it as S }
-    opAnd.andWhere(filter.distinctFrom) { DistinctFromOp.distinctFrom(column, it as S) }
-    opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it as S) }
-    if (!filter.`in`.isNullOrEmpty()) {
-        opAnd.andWhere(filter.`in`) { column inList it as List<S> }
-    }
-    if (!filter.notIn.isNullOrEmpty()) {
-        opAnd.andWhere(filter.notIn) { column notInList it as List<S> }
-    }
-
-    opAnd.andWhere(filter.lessThan) { column less it }
-    opAnd.andWhere(filter.lessThanOrEqualTo) { column lessEq it }
-    opAnd.andWhere(filter.greaterThan) { column greater it }
-    opAnd.andWhere(filter.greaterThanOrEqualTo) { column greaterEq it }
-
-    opAnd.andWhere(filter.includes) { column like "%$it%" }
-    opAnd.andWhere(filter.notIncludes) { column notLike "%$it%" }
-    opAnd.andWhere(filter.includesInsensitive) { ILikeEscapeOp.iLike(column, "%$it%") }
-    opAnd.andWhere(filter.notIncludesInsensitive) { ILikeEscapeOp.iNotLike(column, "%$it%") }
-
-    opAnd.andWhere(filter.startsWith) { column like "$it%" }
-    opAnd.andWhere(filter.notStartsWith) { column notLike "$it%" }
-    opAnd.andWhere(filter.startsWithInsensitive) { ILikeEscapeOp.iLike(column, "$it%") }
-    opAnd.andWhere(filter.notStartsWithInsensitive) { ILikeEscapeOp.iNotLike(column, "$it%") }
-
-    opAnd.andWhere(filter.endsWith) { column like "%$it" }
-    opAnd.andWhere(filter.notEndsWith) { column notLike "%$it" }
-    opAnd.andWhere(filter.endsWithInsensitive) { ILikeEscapeOp.iLike(column, "%$it") }
-    opAnd.andWhere(filter.notEndsWithInsensitive) { ILikeEscapeOp.iNotLike(column, "%$it") }
-
-    opAnd.andWhere(filter.like) { column like it }
-    opAnd.andWhere(filter.notLike) { column notLike it }
-    opAnd.andWhere(filter.likeInsensitive) { ILikeEscapeOp.iLike(column, it) }
-    opAnd.andWhere(filter.notLikeInsensitive) { ILikeEscapeOp.iNotLike(column, it) }
-
-    opAnd.andWhere(filter.distinctFromInsensitive) { DistinctFromOp.distinctFrom(column.upperCase(), it.uppercase() as S) }
-    opAnd.andWhere(filter.notDistinctFromInsensitive) { DistinctFromOp.notDistinctFrom(column.upperCase(), it.uppercase() as S) }
-
-    opAnd.andWhere(filter.inInsensitive) { column.upperCase() inList (it.map { it.uppercase() } as List<S>) }
-    opAnd.andWhere(filter.notInInsensitive) { column.upperCase() notInList (it.map { it.uppercase() } as List<S>) }
-
-    opAnd.andWhere(filter.lessThanInsensitive) { column.upperCase() less it.uppercase() }
-    opAnd.andWhere(filter.lessThanOrEqualToInsensitive) { column.upperCase() lessEq it.uppercase() }
-    opAnd.andWhere(filter.greaterThanInsensitive) { column.upperCase() greater it.uppercase() }
-    opAnd.andWhere(filter.greaterThanOrEqualToInsensitive) { column.upperCase() greaterEq it.uppercase() }
-
-    return opAnd.op
-}
-
-class OpAnd(var op: Op<Boolean>? = null) {
-    fun <T> andWhere(value: T?, andPart: SqlExpressionBuilder.(T & Any) -> Op<Boolean>) {
-        value ?: return
-        val expr = Op.build { andPart(value) }
-        op = if (op == null) expr else (op!! and expr)
-    }
-
-    fun <T> eq(value: T?, column: Column<T>) = andWhere(value) { column eq it }
-    fun <T : Comparable<T>> eq(value: T?, column: Column<EntityID<T>>) = andWhere(value) { column eq it }
-}
-
-fun <T : Comparable<T>> andFilterWithCompare(
-    column: Column<T>,
-    filter: ComparableScalarFilter<T>?
-): Op<Boolean>? {
-    filter ?: return null
-    val opAnd = OpAnd(andFilter(column, filter))
-
-    opAnd.andWhere(filter.lessThan) { column less it }
-    opAnd.andWhere(filter.lessThanOrEqualTo) { column lessEq it }
-    opAnd.andWhere(filter.greaterThan) { column greater it }
-    opAnd.andWhere(filter.greaterThanOrEqualTo) { column greaterEq it }
-
-    return opAnd.op
-}
-
-fun <T : Comparable<T>> andFilterWithCompareEntity(
-    column: Column<EntityID<T>>,
-    filter: ComparableScalarFilter<T>?
-): Op<Boolean>? {
-    filter ?: return null
-    val opAnd = OpAnd(andFilterEntity(column, filter))
-
-    opAnd.andWhere(filter.lessThan) { column less it }
-    opAnd.andWhere(filter.lessThanOrEqualTo) { column lessEq it }
-    opAnd.andWhere(filter.greaterThan) { column greater it }
-    opAnd.andWhere(filter.greaterThanOrEqualTo) { column greaterEq it }
-
-    return opAnd.op
-}
-
-fun <T : Comparable<T>> andFilter(
-    column: Column<T>,
-    filter: ScalarFilter<T>?
-): Op<Boolean>? {
-    filter ?: return null
-    val opAnd = OpAnd()
-
-    opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
-    opAnd.andWhere(filter.equalTo) { column eq it }
-    opAnd.andWhere(filter.notEqualTo) { column neq it }
-    opAnd.andWhere(filter.distinctFrom) { DistinctFromOp.distinctFrom(column, it) }
-    opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it) }
-    if (!filter.`in`.isNullOrEmpty()) {
-        opAnd.andWhere(filter.`in`) { column inList it }
-    }
-    if (!filter.notIn.isNullOrEmpty()) {
-        opAnd.andWhere(filter.notIn) { column notInList it }
-    }
-    return opAnd.op
-}
-
-fun <T : Comparable<T>> andFilterEntity(
-    column: Column<EntityID<T>>,
-    filter: ScalarFilter<T>?
-): Op<Boolean>? {
-    filter ?: return null
-    val opAnd = OpAnd()
-
-    opAnd.andWhere(filter.isNull) { if (filter.isNull!!) column.isNull() else column.isNotNull() }
-    opAnd.andWhere(filter.equalTo) { column eq filter.equalTo!! }
-    opAnd.andWhere(filter.notEqualTo) { column neq filter.notEqualTo!! }
-    opAnd.andWhere(filter.distinctFrom) { DistinctFromOp.distinctFrom(column, it) }
-    opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it) }
-    if (!filter.`in`.isNullOrEmpty()) {
-        opAnd.andWhere(filter.`in`) { column inList filter.`in`!! }
-    }
-    if (!filter.notIn.isNullOrEmpty()) {
-        opAnd.andWhere(filter.notIn) { column notInList filter.notIn!! }
-    }
-    return opAnd.op
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/JavalinGraphQLRequestParser.kt

@@ -1,23 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server
-
-import com.expediagroup.graphql.server.execution.GraphQLRequestParser
-import com.expediagroup.graphql.server.types.GraphQLServerRequest
-import io.javalin.http.Context
-import java.io.IOException
-
-class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
-
-    @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
-    override suspend fun parseRequest(context: Context): GraphQLServerRequest? = try {
-        context.bodyAsClass(GraphQLServerRequest::class.java)
-    } catch (e: IOException) {
-        null
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskDataLoaderRegistryFactory.kt

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoaderRegistryFactory
-import suwayomi.tachidesk.graphql.dataLoaders.CategoriesForMangaDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.CategoryDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.CategoryMetaDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.ChapterDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.ChapterMetaDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.ChaptersForMangaDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.ExtensionDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.ExtensionForSourceDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.GlobalMetaDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.MangaDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.MangaForCategoryDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.MangaMetaDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.SourceDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.SourcesForExtensionDataLoader
-
-class TachideskDataLoaderRegistryFactory {
-    companion object {
-        fun create(): KotlinDataLoaderRegistryFactory {
-            return KotlinDataLoaderRegistryFactory(
-                MangaDataLoader(),
-                ChapterDataLoader(),
-                ChaptersForMangaDataLoader(),
-                GlobalMetaDataLoader(),
-                ChapterMetaDataLoader(),
-                MangaMetaDataLoader(),
-                MangaForCategoryDataLoader(),
-                CategoryDataLoader(),
-                CategoryMetaDataLoader(),
-                CategoriesForMangaDataLoader(),
-                SourceDataLoader(),
-                SourcesForExtensionDataLoader(),
-                ExtensionDataLoader(),
-                ExtensionForSourceDataLoader()
-            )
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLContextFactory.kt

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server
-
-import com.expediagroup.graphql.generator.execution.GraphQLContext
-import com.expediagroup.graphql.server.execution.GraphQLContextFactory
-import io.javalin.http.Context
-import io.javalin.websocket.WsContext
-
-/**
- * Custom logic for how Tachidesk should create its context given the [Context]
- */
-class TachideskGraphQLContextFactory : GraphQLContextFactory<GraphQLContext, Context> {
-    override suspend fun generateContextMap(request: Context): Map<*, Any> = emptyMap<Any, Any>()
-//        mutableMapOf<Any, Any>(
-//            "user" to User(
-//                email = "fake@site.com",
-//                firstName = "Someone",
-//                lastName = "You Don't know",
-//                universityId = 4
-//            )
-//        ).also { map ->
-//            request.headers["my-custom-header"]?.let { customHeader ->
-//                map["customHeader"] = customHeader
-//            }
-//        }
-
-    fun generateContextMap(request: WsContext): Map<*, Any> = emptyMap<Any, Any>()
-}
-
-/**
- * Create a [GraphQLContext] from [this] map
- * @return a new [GraphQLContext]
- */
-fun Map<*, Any?>.toGraphQLContext(): graphql.GraphQLContext =
-    graphql.GraphQLContext.of(this)

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLSchema.kt

@@ -1,71 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server
-
-import com.expediagroup.graphql.generator.SchemaGeneratorConfig
-import com.expediagroup.graphql.generator.TopLevelObject
-import com.expediagroup.graphql.generator.hooks.FlowSubscriptionSchemaGeneratorHooks
-import com.expediagroup.graphql.generator.toSchema
-import graphql.scalars.ExtendedScalars
-import graphql.schema.GraphQLType
-import suwayomi.tachidesk.graphql.mutations.CategoryMutation
-import suwayomi.tachidesk.graphql.mutations.ChapterMutation
-import suwayomi.tachidesk.graphql.mutations.ExtensionMutation
-import suwayomi.tachidesk.graphql.mutations.MangaMutation
-import suwayomi.tachidesk.graphql.mutations.MetaMutation
-import suwayomi.tachidesk.graphql.mutations.SourceMutation
-import suwayomi.tachidesk.graphql.queries.CategoryQuery
-import suwayomi.tachidesk.graphql.queries.ChapterQuery
-import suwayomi.tachidesk.graphql.queries.ExtensionQuery
-import suwayomi.tachidesk.graphql.queries.MangaQuery
-import suwayomi.tachidesk.graphql.queries.MetaQuery
-import suwayomi.tachidesk.graphql.queries.SourceQuery
-import suwayomi.tachidesk.graphql.queries.TrackQuery
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.GraphQLCursor
-import suwayomi.tachidesk.graphql.server.primitives.GraphQLLongAsString
-import suwayomi.tachidesk.graphql.subscriptions.DownloadSubscription
-import kotlin.reflect.KClass
-import kotlin.reflect.KType
-
-class CustomSchemaGeneratorHooks : FlowSubscriptionSchemaGeneratorHooks() {
-    override fun willGenerateGraphQLType(type: KType): GraphQLType? = when (type.classifier as? KClass<*>) {
-        Long::class -> GraphQLLongAsString // encode to string for JS
-        Cursor::class -> GraphQLCursor
-        Any::class -> ExtendedScalars.Json
-        else -> super.willGenerateGraphQLType(type)
-    }
-}
-
-val schema = toSchema(
-    config = SchemaGeneratorConfig(
-        supportedPackages = listOf("suwayomi.tachidesk.graphql"),
-        introspectionEnabled = true,
-        hooks = CustomSchemaGeneratorHooks()
-    ),
-    queries = listOf(
-        TopLevelObject(CategoryQuery()),
-        TopLevelObject(ChapterQuery()),
-        TopLevelObject(ExtensionQuery()),
-        TopLevelObject(MangaQuery()),
-        TopLevelObject(MetaQuery()),
-        TopLevelObject(SourceQuery()),
-        TopLevelObject(TrackQuery())
-    ),
-    mutations = listOf(
-        TopLevelObject(CategoryMutation()),
-        TopLevelObject(ChapterMutation()),
-        TopLevelObject(ExtensionMutation()),
-        TopLevelObject(MangaMutation()),
-        TopLevelObject(MetaMutation()),
-        TopLevelObject(SourceMutation())
-    ),
-    subscriptions = listOf(
-        TopLevelObject(DownloadSubscription())
-    )
-)

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLServer.kt

@@ -1,60 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server
-
-import com.expediagroup.graphql.generator.execution.FlowSubscriptionExecutionStrategy
-import com.expediagroup.graphql.server.execution.GraphQLRequestHandler
-import com.expediagroup.graphql.server.execution.GraphQLServer
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import graphql.GraphQL
-import io.javalin.http.Context
-import io.javalin.websocket.WsCloseContext
-import io.javalin.websocket.WsMessageContext
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
-import suwayomi.tachidesk.graphql.server.subscriptions.ApolloSubscriptionProtocolHandler
-import suwayomi.tachidesk.graphql.server.subscriptions.GraphQLSubscriptionHandler
-
-class TachideskGraphQLServer(
-    requestParser: JavalinGraphQLRequestParser,
-    contextFactory: TachideskGraphQLContextFactory,
-    requestHandler: GraphQLRequestHandler,
-    subscriptionHandler: GraphQLSubscriptionHandler
-) : GraphQLServer<Context>(requestParser, contextFactory, requestHandler) {
-    private val objectMapper = jacksonObjectMapper()
-    private val subscriptionProtocolHandler = ApolloSubscriptionProtocolHandler(contextFactory, subscriptionHandler, objectMapper)
-
-    fun handleSubscriptionMessage(context: WsMessageContext) {
-        subscriptionProtocolHandler.handleMessage(context)
-            .map { objectMapper.writeValueAsString(it) }
-            .map { context.send(it) }
-            .launchIn(GlobalScope)
-    }
-
-    fun handleSubscriptionDisconnect(context: WsCloseContext) {
-        subscriptionProtocolHandler.handleDisconnect(context)
-    }
-
-    companion object {
-        private fun getGraphQLObject(): GraphQL = GraphQL.newGraphQL(schema)
-            .subscriptionExecutionStrategy(FlowSubscriptionExecutionStrategy())
-            .build()
-
-        fun create(): TachideskGraphQLServer {
-            val graphQL = getGraphQLObject()
-
-            val requestParser = JavalinGraphQLRequestParser()
-            val contextFactory = TachideskGraphQLContextFactory()
-            val requestHandler = GraphQLRequestHandler(graphQL, TachideskDataLoaderRegistryFactory.create())
-            val subscriptionHandler = GraphQLSubscriptionHandler(graphQL, TachideskDataLoaderRegistryFactory.create())
-
-            return TachideskGraphQLServer(requestParser, contextFactory, requestHandler, subscriptionHandler)
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/Cursor.kt

@@ -1,119 +0,0 @@
-package suwayomi.tachidesk.graphql.server.primitives
-
-import graphql.GraphQLContext
-import graphql.execution.CoercedVariables
-import graphql.language.StringValue
-import graphql.language.Value
-import graphql.scalar.CoercingUtil
-import graphql.schema.Coercing
-import graphql.schema.CoercingParseLiteralException
-import graphql.schema.CoercingParseValueException
-import graphql.schema.CoercingSerializeException
-import graphql.schema.GraphQLScalarType
-import java.util.Locale
-
-data class Cursor(val value: String)
-
-val GraphQLCursor: GraphQLScalarType = GraphQLScalarType.newScalar()
-    .name("Cursor").description("A location in a connection that can be used for resuming pagination.").coercing(GraphqlCursorCoercing()).build()
-
-private class GraphqlCursorCoercing : Coercing<Cursor, String> {
-    private fun toStringImpl(input: Any): String? {
-        return (input as? Cursor)?.value
-    }
-
-    private fun parseValueImpl(input: Any, locale: Locale): Cursor {
-        if (input !is String) {
-            throw CoercingParseValueException(
-                CoercingUtil.i18nMsg(
-                    locale,
-                    "String.unexpectedRawValueType",
-                    CoercingUtil.typeName(input)
-                )
-            )
-        }
-        return Cursor(input)
-    }
-
-    private fun parseLiteralImpl(input: Any, locale: Locale): Cursor {
-        if (input !is StringValue) {
-            throw CoercingParseLiteralException(
-                CoercingUtil.i18nMsg(
-                    locale,
-                    "Scalar.unexpectedAstType",
-                    "StringValue",
-                    CoercingUtil.typeName(input)
-                )
-            )
-        }
-        return Cursor(input.value)
-    }
-
-    private fun valueToLiteralImpl(input: Any): StringValue {
-        return StringValue.newStringValue(input.toString()).build()
-    }
-
-    @Deprecated("")
-    override fun serialize(dataFetcherResult: Any): String {
-        return toStringImpl(dataFetcherResult) ?: throw CoercingSerializeException(
-            CoercingUtil.i18nMsg(
-                Locale.getDefault(),
-                "String.unexpectedRawValueType",
-                CoercingUtil.typeName(dataFetcherResult)
-            )
-        )
-    }
-
-    @Throws(CoercingSerializeException::class)
-    override fun serialize(
-        dataFetcherResult: Any,
-        graphQLContext: GraphQLContext,
-        locale: Locale
-    ): String {
-        return toStringImpl(dataFetcherResult) ?: throw CoercingSerializeException(
-            CoercingUtil.i18nMsg(
-                locale,
-                "String.unexpectedRawValueType",
-                CoercingUtil.typeName(dataFetcherResult)
-            )
-        )
-    }
-
-    @Deprecated("")
-    override fun parseValue(input: Any): Cursor {
-        return parseValueImpl(input, Locale.getDefault())
-    }
-
-    @Throws(CoercingParseValueException::class)
-    override fun parseValue(input: Any, graphQLContext: GraphQLContext, locale: Locale): Cursor {
-        return parseValueImpl(input, locale)
-    }
-
-    @Deprecated("")
-    override fun parseLiteral(input: Any): Cursor {
-        return parseLiteralImpl(input, Locale.getDefault())
-    }
-
-    @Throws(CoercingParseLiteralException::class)
-    override fun parseLiteral(
-        input: Value<*>,
-        variables: CoercedVariables,
-        graphQLContext: GraphQLContext,
-        locale: Locale
-    ): Cursor {
-        return parseLiteralImpl(input, locale)
-    }
-
-    @Deprecated("")
-    override fun valueToLiteral(input: Any): Value<*> {
-        return valueToLiteralImpl(input)
-    }
-
-    override fun valueToLiteral(
-        input: Any,
-        graphQLContext: GraphQLContext,
-        locale: Locale
-    ): Value<*> {
-        return valueToLiteralImpl(input)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/LongAsString.kt

@@ -1,105 +0,0 @@
-package suwayomi.tachidesk.graphql.server.primitives
-
-import graphql.GraphQLContext
-import graphql.execution.CoercedVariables
-import graphql.language.StringValue
-import graphql.language.Value
-import graphql.scalar.CoercingUtil
-import graphql.schema.Coercing
-import graphql.schema.CoercingParseLiteralException
-import graphql.schema.CoercingParseValueException
-import graphql.schema.CoercingSerializeException
-import graphql.schema.GraphQLScalarType
-import java.util.Locale
-
-val GraphQLLongAsString: GraphQLScalarType = GraphQLScalarType.newScalar()
-    .name("LongString").description("A 64-bit signed integer as a String").coercing(GraphqlLongAsStringCoercing()).build()
-
-private class GraphqlLongAsStringCoercing : Coercing<Long, String> {
-    private fun toStringImpl(input: Any): String {
-        return input.toString()
-    }
-
-    private fun parseValueImpl(input: Any, locale: Locale): Long {
-        if (input !is String) {
-            throw CoercingParseValueException(
-                CoercingUtil.i18nMsg(
-                    locale,
-                    "String.unexpectedRawValueType",
-                    CoercingUtil.typeName(input)
-                )
-            )
-        }
-        return input.toLong()
-    }
-
-    private fun parseLiteralImpl(input: Any, locale: Locale): Long {
-        if (input !is StringValue) {
-            throw CoercingParseLiteralException(
-                CoercingUtil.i18nMsg(
-                    locale,
-                    "Scalar.unexpectedAstType",
-                    "StringValue",
-                    CoercingUtil.typeName(input)
-                )
-            )
-        }
-        return input.value.toLong()
-    }
-
-    private fun valueToLiteralImpl(input: Any): StringValue {
-        return StringValue.newStringValue(input.toString()).build()
-    }
-
-    @Deprecated("")
-    override fun serialize(dataFetcherResult: Any): String {
-        return toStringImpl(dataFetcherResult)
-    }
-
-    @Throws(CoercingSerializeException::class)
-    override fun serialize(
-        dataFetcherResult: Any,
-        graphQLContext: GraphQLContext,
-        locale: Locale
-    ): String {
-        return toStringImpl(dataFetcherResult)
-    }
-
-    @Deprecated("")
-    override fun parseValue(input: Any): Long {
-        return parseValueImpl(input, Locale.getDefault())
-    }
-
-    @Throws(CoercingParseValueException::class)
-    override fun parseValue(input: Any, graphQLContext: GraphQLContext, locale: Locale): Long {
-        return parseValueImpl(input, locale)
-    }
-
-    @Deprecated("")
-    override fun parseLiteral(input: Any): Long {
-        return parseLiteralImpl(input, Locale.getDefault())
-    }
-
-    @Throws(CoercingParseLiteralException::class)
-    override fun parseLiteral(
-        input: Value<*>,
-        variables: CoercedVariables,
-        graphQLContext: GraphQLContext,
-        locale: Locale
-    ): Long {
-        return parseLiteralImpl(input, locale)
-    }
-
-    @Deprecated("")
-    override fun valueToLiteral(input: Any): Value<*> {
-        return valueToLiteralImpl(input)
-    }
-
-    override fun valueToLiteral(
-        input: Any,
-        graphQLContext: GraphQLContext,
-        locale: Locale
-    ): Value<*> {
-        return valueToLiteralImpl(input)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/NodeList.kt

@@ -1,38 +0,0 @@
-package suwayomi.tachidesk.graphql.server.primitives
-
-import com.expediagroup.graphql.generator.annotations.GraphQLDescription
-
-interface Node
-
-abstract class NodeList {
-    @GraphQLDescription("A list of [T] objects.")
-    abstract val nodes: List<Node>
-
-    @GraphQLDescription("A list of edges which contains the [T] and cursor to aid in pagination.")
-    abstract val edges: List<Edge>
-
-    @GraphQLDescription("Information to aid in pagination.")
-    abstract val pageInfo: PageInfo
-
-    @GraphQLDescription("The count of all nodes you could get from the connection.")
-    abstract val totalCount: Int
-}
-
-data class PageInfo(
-    @GraphQLDescription("When paginating forwards, are there more items?")
-    val hasNextPage: Boolean,
-    @GraphQLDescription("When paginating backwards, are there more items?")
-    val hasPreviousPage: Boolean,
-    @GraphQLDescription("When paginating backwards, the cursor to continue.")
-    val startCursor: Cursor?,
-    @GraphQLDescription("When paginating forwards, the cursor to continue.")
-    val endCursor: Cursor?
-)
-
-abstract class Edge {
-    @GraphQLDescription("A cursor for use in pagination.")
-    abstract val cursor: Cursor
-
-    @GraphQLDescription("The [T] at the end of the edge.")
-    abstract val node: Node
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/OrderBy.kt

@@ -1,125 +0,0 @@
-package suwayomi.tachidesk.graphql.server.primitives
-
-import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.or
-
-interface OrderBy<T> {
-    val column: Column<out Comparable<*>>
-
-    fun asCursor(type: T): Cursor
-
-    fun greater(cursor: Cursor): Op<Boolean>
-
-    fun less(cursor: Cursor): Op<Boolean>
-}
-
-fun SortOrder?.maybeSwap(value: Any?): SortOrder {
-    return if (value != null) {
-        when (this) {
-            SortOrder.ASC -> SortOrder.DESC
-            SortOrder.DESC -> SortOrder.ASC
-            SortOrder.ASC_NULLS_FIRST -> SortOrder.DESC_NULLS_LAST
-            SortOrder.DESC_NULLS_FIRST -> SortOrder.ASC_NULLS_LAST
-            SortOrder.ASC_NULLS_LAST -> SortOrder.DESC_NULLS_FIRST
-            SortOrder.DESC_NULLS_LAST -> SortOrder.ASC_NULLS_FIRST
-            null -> SortOrder.DESC
-        }
-    } else {
-        this ?: SortOrder.ASC
-    }
-}
-
-@JvmName("greaterNotUniqueIntKey")
-fun <T : Comparable<T>> greaterNotUnique(
-    column: Column<T>,
-    idColumn: Column<EntityID<Int>>,
-    cursor: Cursor,
-    toValue: (String) -> T
-): Op<Boolean> {
-    return greaterNotUniqueImpl(column, idColumn, cursor, String::toInt, toValue)
-}
-
-@JvmName("greaterNotUniqueLongKey")
-fun <T : Comparable<T>> greaterNotUnique(
-    column: Column<T>,
-    idColumn: Column<EntityID<Long>>,
-    cursor: Cursor,
-    toValue: (String) -> T
-): Op<Boolean> {
-    return greaterNotUniqueImpl(column, idColumn, cursor, String::toLong, toValue)
-}
-
-private fun <K : Comparable<K>, V : Comparable<V>> greaterNotUniqueImpl(
-    column: Column<V>,
-    idColumn: Column<EntityID<K>>,
-    cursor: Cursor,
-    toKey: (String) -> K,
-    toValue: (String) -> V
-): Op<Boolean> {
-    val id = toKey(cursor.value.substringBefore('-'))
-    val value = toValue(cursor.value.substringAfter('-'))
-    return (column greater value) or ((column eq value) and (idColumn greater id))
-}
-
-@JvmName("greaterNotUniqueStringKey")
-fun <T : Comparable<T>> greaterNotUnique(
-    column: Column<T>,
-    idColumn: Column<String>,
-    cursor: Cursor,
-    toValue: (String) -> T
-): Op<Boolean> {
-    val id = cursor.value.substringBefore("\\-")
-    val value = toValue(cursor.value.substringAfter("\\-"))
-    return (column greater value) or ((column eq value) and (idColumn greater id))
-}
-
-@JvmName("lessNotUniqueIntKey")
-fun <T : Comparable<T>> lessNotUnique(
-    column: Column<T>,
-    idColumn: Column<EntityID<Int>>,
-    cursor: Cursor,
-    toValue: (String) -> T
-): Op<Boolean> {
-    return lessNotUniqueImpl(column, idColumn, cursor, String::toInt, toValue)
-}
-
-@JvmName("lessNotUniqueLongKey")
-fun <T : Comparable<T>> lessNotUnique(
-    column: Column<T>,
-    idColumn: Column<EntityID<Long>>,
-    cursor: Cursor,
-    toValue: (String) -> T
-): Op<Boolean> {
-    return lessNotUniqueImpl(column, idColumn, cursor, String::toLong, toValue)
-}
-
-private fun <K : Comparable<K>, V : Comparable<V>> lessNotUniqueImpl(
-    column: Column<V>,
-    idColumn: Column<EntityID<K>>,
-    cursor: Cursor,
-    toKey: (String) -> K,
-    toValue: (String) -> V
-): Op<Boolean> {
-    val id = toKey(cursor.value.substringBefore('-'))
-    val value = toValue(cursor.value.substringAfter('-'))
-    return (column less value) or ((column eq value) and (idColumn less id))
-}
-
-@JvmName("lessNotUniqueStringKey")
-fun <T : Comparable<T>> lessNotUnique(
-    column: Column<T>,
-    idColumn: Column<String>,
-    cursor: Cursor,
-    toValue: (String) -> T
-): Op<Boolean> {
-    val id = cursor.value.substringBefore("\\-")
-    val value = toValue(cursor.value.substringAfter("\\-"))
-    return (column less value) or ((column eq value) and (idColumn less id))
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/QueryResults.kt

@@ -1,5 +0,0 @@
-package suwayomi.tachidesk.graphql.server.primitives
-
-import org.jetbrains.exposed.sql.ResultRow
-
-data class QueryResults<T>(val total: Long, val firstKey: T, val lastKey: T, val results: List<ResultRow>)

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt

@@ -1,207 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server.subscriptions
-
-import com.expediagroup.graphql.server.types.GraphQLRequest
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.convertValue
-import com.fasterxml.jackson.module.kotlin.readValue
-import io.javalin.websocket.WsContext
-import io.javalin.websocket.WsMessageContext
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.emptyFlow
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onCompletion
-import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.sample
-import kotlinx.coroutines.job
-import kotlinx.coroutines.runBlocking
-import mu.KotlinLogging
-import suwayomi.tachidesk.graphql.server.TachideskGraphQLContextFactory
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ClientMessages.GQL_CONNECTION_INIT
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ClientMessages.GQL_CONNECTION_TERMINATE
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ClientMessages.GQL_START
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ClientMessages.GQL_STOP
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ServerMessages.GQL_CONNECTION_ACK
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ServerMessages.GQL_CONNECTION_ERROR
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ServerMessages.GQL_CONNECTION_KEEP_ALIVE
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ServerMessages.GQL_DATA
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ServerMessages.GQL_ERROR
-import suwayomi.tachidesk.graphql.server.toGraphQLContext
-
-/**
- * Implementation of the `graphql-ws` protocol defined by Apollo
- * https://github.com/apollographql/subscriptions-transport-ws/blob/master/PROTOCOL.md
- * ported for Javalin
- */
-class ApolloSubscriptionProtocolHandler(
-    private val contextFactory: TachideskGraphQLContextFactory,
-    private val subscriptionHandler: GraphQLSubscriptionHandler,
-    private val objectMapper: ObjectMapper
-) {
-    private val sessionState = ApolloSubscriptionSessionState()
-    private val logger = KotlinLogging.logger {}
-    private val keepAliveMessage = SubscriptionOperationMessage(type = GQL_CONNECTION_KEEP_ALIVE.type)
-    private val basicConnectionErrorMessage = SubscriptionOperationMessage(type = GQL_CONNECTION_ERROR.type)
-    private val acknowledgeMessage = SubscriptionOperationMessage(GQL_CONNECTION_ACK.type)
-
-    fun handleMessage(context: WsMessageContext): Flow<SubscriptionOperationMessage> {
-        val operationMessage = convertToMessageOrNull(context.message()) ?: return flowOf(basicConnectionErrorMessage)
-        logger.debug { "GraphQL subscription client message, sessionId=${context.sessionId} operationMessage=$operationMessage" }
-
-        return try {
-            when (operationMessage.type) {
-                GQL_CONNECTION_INIT.type -> onInit(operationMessage, context)
-                GQL_START.type -> startSubscription(operationMessage, context)
-                GQL_STOP.type -> onStop(operationMessage, context)
-                GQL_CONNECTION_TERMINATE.type -> onDisconnect(context)
-                else -> onUnknownOperation(operationMessage, context)
-            }
-        } catch (exception: Exception) {
-            onException(exception)
-        }
-    }
-
-    fun handleDisconnect(context: WsContext) {
-        onDisconnect(context)
-    }
-
-    private fun convertToMessageOrNull(payload: String): SubscriptionOperationMessage? {
-        return try {
-            objectMapper.readValue(payload)
-        } catch (exception: Exception) {
-            logger.error("Error parsing the subscription message", exception)
-            null
-        }
-    }
-
-    /**
-     * If the keep alive configuration is set, send a message back to client at every interval until the session is terminated.
-     * Otherwise just return empty flux to append to the acknowledge message.
-     */
-    @OptIn(FlowPreview::class)
-    private fun getKeepAliveFlow(context: WsContext): Flow<SubscriptionOperationMessage> {
-        val keepAliveInterval: Long? = 2000
-        if (keepAliveInterval != null) {
-            return flowOf(keepAliveMessage).sample(keepAliveInterval)
-                .onStart {
-                    sessionState.saveKeepAliveSubscription(context, currentCoroutineContext().job)
-                }
-        }
-
-        return emptyFlow()
-    }
-
-    @Suppress("Detekt.TooGenericExceptionCaught")
-    private fun startSubscription(
-        operationMessage: SubscriptionOperationMessage,
-        context: WsContext
-    ): Flow<SubscriptionOperationMessage> {
-        val graphQLContext = sessionState.getGraphQLContext(context)
-
-        if (operationMessage.id == null) {
-            logger.error("GraphQL subscription operation id is required")
-            return flowOf(basicConnectionErrorMessage)
-        }
-
-        if (sessionState.doesOperationExist(context, operationMessage)) {
-            logger.info("Already subscribed to operation ${operationMessage.id} for session ${context.sessionId}")
-            return emptyFlow()
-        }
-
-        val payload = operationMessage.payload
-
-        if (payload == null) {
-            logger.error("GraphQL subscription payload was null instead of a GraphQLRequest object")
-            sessionState.stopOperation(context, operationMessage)
-            return flowOf(SubscriptionOperationMessage(type = GQL_CONNECTION_ERROR.type, id = operationMessage.id))
-        }
-
-        try {
-            val request = objectMapper.convertValue<GraphQLRequest>(payload)
-            return subscriptionHandler.executeSubscription(request, graphQLContext)
-                .map {
-                    if (it.errors?.isNotEmpty() == true) {
-                        SubscriptionOperationMessage(type = GQL_ERROR.type, id = operationMessage.id, payload = it)
-                    } else {
-                        SubscriptionOperationMessage(type = GQL_DATA.type, id = operationMessage.id, payload = it)
-                    }
-                }
-                .onCompletion { if (it == null) emitAll(onComplete(operationMessage, context)) }
-                .onStart { sessionState.saveOperation(context, operationMessage, currentCoroutineContext().job) }
-        } catch (exception: Exception) {
-            logger.error("Error running graphql subscription", exception)
-            // Do not terminate the session, just stop the operation messages
-            sessionState.stopOperation(context, operationMessage)
-            return flowOf(SubscriptionOperationMessage(type = GQL_CONNECTION_ERROR.type, id = operationMessage.id))
-        }
-    }
-
-    private fun onInit(operationMessage: SubscriptionOperationMessage, context: WsContext): Flow<SubscriptionOperationMessage> {
-        saveContext(operationMessage, context)
-        val acknowledgeMessage = flowOf(acknowledgeMessage)
-        val keepAliveFlux = getKeepAliveFlow(context)
-        return acknowledgeMessage.onCompletion { if (it == null) emitAll(keepAliveFlux) }
-            .catch { emit(getConnectionErrorMessage(operationMessage)) }
-    }
-
-    /**
-     * Generate the context and save it for all future messages.
-     */
-    private fun saveContext(operationMessage: SubscriptionOperationMessage, context: WsContext) {
-        runBlocking {
-            val graphQLContext = contextFactory.generateContextMap(context).toGraphQLContext()
-            sessionState.saveContext(context, graphQLContext)
-        }
-    }
-
-    /**
-     * Called with the publisher has completed on its own.
-     */
-    private fun onComplete(
-        operationMessage: SubscriptionOperationMessage,
-        context: WsContext
-    ): Flow<SubscriptionOperationMessage> {
-        return sessionState.completeOperation(context, operationMessage)
-    }
-
-    /**
-     * Called with the client has called stop manually, or on error, and we need to cancel the publisher
-     */
-    private fun onStop(
-        operationMessage: SubscriptionOperationMessage,
-        context: WsContext
-    ): Flow<SubscriptionOperationMessage> {
-        return sessionState.stopOperation(context, operationMessage)
-    }
-
-    private fun onDisconnect(context: WsContext): Flow<SubscriptionOperationMessage> {
-        sessionState.terminateSession(context)
-        return emptyFlow()
-    }
-
-    private fun onUnknownOperation(operationMessage: SubscriptionOperationMessage, context: WsContext): Flow<SubscriptionOperationMessage> {
-        logger.error("Unknown subscription operation $operationMessage")
-        sessionState.stopOperation(context, operationMessage)
-        return flowOf(getConnectionErrorMessage(operationMessage))
-    }
-
-    private fun onException(exception: Exception): Flow<SubscriptionOperationMessage> {
-        logger.error("Error parsing the subscription message", exception)
-        return flowOf(basicConnectionErrorMessage)
-    }
-
-    private fun getConnectionErrorMessage(operationMessage: SubscriptionOperationMessage): SubscriptionOperationMessage {
-        return SubscriptionOperationMessage(type = GQL_CONNECTION_ERROR.type, id = operationMessage.id)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionSessionState.kt

@@ -1,128 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server.subscriptions
-
-import graphql.GraphQLContext
-import io.javalin.websocket.WsContext
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emptyFlow
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.onCompletion
-import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ServerMessages.GQL_COMPLETE
-import suwayomi.tachidesk.graphql.server.toGraphQLContext
-import java.util.concurrent.ConcurrentHashMap
-
-internal class ApolloSubscriptionSessionState {
-
-    // Sessions are saved by web socket session id
-    internal val activeKeepAliveSessions = ConcurrentHashMap<String, Job>()
-
-    // Operations are saved by web socket session id, then operation id
-    internal val activeOperations = ConcurrentHashMap<String, ConcurrentHashMap<String, Job>>()
-
-    // The graphQL context is saved by web socket session id
-    private val cachedGraphQLContext = ConcurrentHashMap<String, GraphQLContext>()
-
-    /**
-     * Save the context created from the factory and possibly updated in the onConnect hook.
-     * This allows us to include some initial state to be used when handling all the messages.
-     * This will be removed in [terminateSession].
-     */
-    fun saveContext(context: WsContext, graphQLContext: GraphQLContext) {
-        cachedGraphQLContext[context.sessionId] = graphQLContext
-    }
-
-    /**
-     * Return the graphQL context for this session.
-     */
-    fun getGraphQLContext(context: WsContext): GraphQLContext = cachedGraphQLContext[context.sessionId] ?: emptyMap<Any, Any>().toGraphQLContext()
-
-    /**
-     * Save the session that is sending keep alive messages.
-     * This will override values without cancelling the subscription, so it is the responsibility of the consumer to cancel.
-     * These messages will be stopped on [terminateSession].
-     */
-    fun saveKeepAliveSubscription(context: WsContext, subscription: Job) {
-        activeKeepAliveSessions[context.sessionId] = subscription
-    }
-
-    /**
-     * Save the operation that is sending data to the client.
-     * This will override values without cancelling the subscription so it is the responsibility of the consumer to cancel.
-     * These messages will be stopped on [stopOperation].
-     */
-    fun saveOperation(context: WsContext, operationMessage: SubscriptionOperationMessage, subscription: Job) {
-        val id = operationMessage.id
-        if (id != null) {
-            val operationsForSession: ConcurrentHashMap<String, Job> = activeOperations.getOrPut(context.sessionId) { ConcurrentHashMap() }
-            operationsForSession[id] = subscription
-        }
-    }
-
-    /**
-     * Send the [GQL_COMPLETE] message.
-     * This can happen when the publisher finishes or if the client manually sends the stop message.
-     */
-    fun completeOperation(context: WsContext, operationMessage: SubscriptionOperationMessage): Flow<SubscriptionOperationMessage> {
-        return getCompleteMessage(operationMessage)
-            .onCompletion { removeActiveOperation(context, operationMessage.id, cancelSubscription = false) }
-    }
-
-    /**
-     * Stop the subscription sending data and send the [GQL_COMPLETE] message.
-     * Does NOT terminate the session.
-     */
-    fun stopOperation(context: WsContext, operationMessage: SubscriptionOperationMessage): Flow<SubscriptionOperationMessage> {
-        return getCompleteMessage(operationMessage)
-            .onCompletion { removeActiveOperation(context, operationMessage.id, cancelSubscription = true) }
-    }
-
-    private fun getCompleteMessage(operationMessage: SubscriptionOperationMessage): Flow<SubscriptionOperationMessage> {
-        val id = operationMessage.id
-        if (id != null) {
-            return flowOf(SubscriptionOperationMessage(type = GQL_COMPLETE.type, id = id))
-        }
-        return emptyFlow()
-    }
-
-    /**
-     * Remove active running subscription from the cache and cancel if needed
-     */
-    private fun removeActiveOperation(context: WsContext, id: String?, cancelSubscription: Boolean) {
-        val operationsForSession = activeOperations[context.sessionId]
-        val subscription = operationsForSession?.get(id)
-        if (subscription != null) {
-            if (cancelSubscription) {
-                subscription.cancel()
-            }
-            operationsForSession.remove(id)
-            if (operationsForSession.isEmpty()) {
-                activeOperations.remove(context.sessionId)
-            }
-        }
-    }
-
-    /**
-     * Terminate the session, cancelling the keep alive messages and all operations active for this session.
-     */
-    fun terminateSession(context: WsContext) {
-        activeOperations[context.sessionId]?.forEach { (_, subscription) -> subscription.cancel() }
-        activeOperations.remove(context.sessionId)
-        cachedGraphQLContext.remove(context.sessionId)
-        activeKeepAliveSessions[context.sessionId]?.cancel()
-        activeKeepAliveSessions.remove(context.sessionId)
-        context.closeSession()
-    }
-
-    /**
-     * Looks up the operation for the client, to check if it already exists
-     */
-    fun doesOperationExist(context: WsContext, operationMessage: SubscriptionOperationMessage): Boolean =
-        activeOperations[context.sessionId]?.containsKey(operationMessage.id) ?: false
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/FlowSubscriptionSource.kt

@@ -1,20 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server.subscriptions
-
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-
-class FlowSubscriptionSource<T : Any> {
-    private val mutableSharedFlow = MutableSharedFlow<T>()
-    val emitter = mutableSharedFlow.asSharedFlow()
-
-    fun publish(value: T) {
-        mutableSharedFlow.tryEmit(value)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/GraphQLSubscriptionHandler.kt

@@ -1,43 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server.subscriptions
-
-import com.expediagroup.graphql.dataloader.KotlinDataLoaderRegistryFactory
-import com.expediagroup.graphql.server.extensions.toExecutionInput
-import com.expediagroup.graphql.server.extensions.toGraphQLError
-import com.expediagroup.graphql.server.extensions.toGraphQLKotlinType
-import com.expediagroup.graphql.server.extensions.toGraphQLResponse
-import com.expediagroup.graphql.server.types.GraphQLRequest
-import com.expediagroup.graphql.server.types.GraphQLResponse
-import graphql.ExecutionResult
-import graphql.GraphQL
-import graphql.GraphQLContext
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
-
-open class GraphQLSubscriptionHandler(
-    private val graphQL: GraphQL,
-    private val dataLoaderRegistryFactory: KotlinDataLoaderRegistryFactory? = null
-) {
-    open fun executeSubscription(
-        graphQLRequest: GraphQLRequest,
-        graphQLContext: GraphQLContext = GraphQLContext.of(emptyMap<Any, Any>())
-    ): Flow<GraphQLResponse<*>> {
-        val dataLoaderRegistry = dataLoaderRegistryFactory?.generate()
-        val input = graphQLRequest.toExecutionInput(dataLoaderRegistry, graphQLContext)
-
-        val res = graphQL.execute(input)
-        val data = res.getData<Flow<ExecutionResult>>()
-        val mapped = data.map { result -> result.toGraphQLResponse() }
-        return mapped.catch { throwable ->
-            val error = throwable.toGraphQLError()
-            emit(GraphQLResponse<Any?>(errors = listOf(error.toGraphQLKotlinType())))
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/SubscriptionOperationMessage.kt

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.server.subscriptions
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-
-/**
- * The `graphql-ws` protocol from Apollo Client has some special text messages to signal events.
- * Along with the HTTP WebSocket event handling we need to have some extra logic
- *
- * https://github.com/apollographql/subscriptions-transport-ws/blob/master/PROTOCOL.md
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-data class SubscriptionOperationMessage(
-    val type: String,
-    val id: String? = null,
-    val payload: Any? = null
-) {
-    enum class ClientMessages(val type: String) {
-        GQL_CONNECTION_INIT("connection_init"),
-        GQL_START("start"),
-        GQL_STOP("stop"),
-        GQL_CONNECTION_TERMINATE("connection_terminate")
-    }
-
-    enum class ServerMessages(val type: String) {
-        GQL_CONNECTION_ACK("connection_ack"),
-        GQL_CONNECTION_ERROR("connection_error"),
-        GQL_DATA("data"),
-        GQL_ERROR("error"),
-        GQL_COMPLETE("complete"),
-        GQL_CONNECTION_KEEP_ALIVE("ka")
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/subscriptions/DownloadSubscription.kt

@@ -1,25 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.subscriptions
-
-import graphql.schema.DataFetchingEnvironment
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import suwayomi.tachidesk.graphql.server.subscriptions.FlowSubscriptionSource
-import suwayomi.tachidesk.graphql.types.DownloadType
-import suwayomi.tachidesk.manga.impl.download.model.DownloadChapter
-
-val downloadSubscriptionSource = FlowSubscriptionSource<DownloadChapter>()
-
-class DownloadSubscription {
-    fun downloadChanged(dataFetchingEnvironment: DataFetchingEnvironment): Flow<DownloadType> {
-        return downloadSubscriptionSource.emitter.map { downloadChapter ->
-            DownloadType(downloadChapter)
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/CategoryType.kt

@@ -1,86 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.types
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Edge
-import suwayomi.tachidesk.graphql.server.primitives.Node
-import suwayomi.tachidesk.graphql.server.primitives.NodeList
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.manga.model.dataclass.IncludeInUpdate
-import suwayomi.tachidesk.manga.model.table.CategoryTable
-import java.util.concurrent.CompletableFuture
-
-class CategoryType(
-    val id: Int,
-    val order: Int,
-    val name: String,
-    val default: Boolean,
-    val includeInUpdate: IncludeInUpdate
-) : Node {
-    constructor(row: ResultRow) : this(
-        row[CategoryTable.id].value,
-        row[CategoryTable.order],
-        row[CategoryTable.name],
-        row[CategoryTable.isDefault],
-        IncludeInUpdate.fromValue(row[CategoryTable.includeInUpdate])
-    )
-
-    fun mangas(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<MangaNodeList> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, MangaNodeList>("MangaForCategoryDataLoader", id)
-    }
-
-    fun meta(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<List<CategoryMetaType>> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, List<CategoryMetaType>>("CategoryMetaDataLoader", id)
-    }
-}
-
-data class CategoryNodeList(
-    override val nodes: List<CategoryType>,
-    override val edges: List<CategoryEdge>,
-    override val pageInfo: PageInfo,
-    override val totalCount: Int
-) : NodeList() {
-    data class CategoryEdge(
-        override val cursor: Cursor,
-        override val node: CategoryType
-    ) : Edge()
-
-    companion object {
-        fun List<CategoryType>.toNodeList(): CategoryNodeList {
-            return CategoryNodeList(
-                nodes = this,
-                edges = getEdges(),
-                pageInfo = PageInfo(
-                    hasNextPage = false,
-                    hasPreviousPage = false,
-                    startCursor = Cursor(0.toString()),
-                    endCursor = Cursor(lastIndex.toString())
-                ),
-                totalCount = size
-            )
-        }
-
-        private fun List<CategoryType>.getEdges(): List<CategoryEdge> {
-            if (isEmpty()) return emptyList()
-            return listOf(
-                CategoryEdge(
-                    cursor = Cursor("0"),
-                    node = first()
-                ),
-                CategoryEdge(
-                    cursor = Cursor(lastIndex.toString()),
-                    node = last()
-                )
-            )
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ChapterType.kt

@@ -1,129 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.types
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Edge
-import suwayomi.tachidesk.graphql.server.primitives.Node
-import suwayomi.tachidesk.graphql.server.primitives.NodeList
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import java.util.concurrent.CompletableFuture
-
-class ChapterType(
-    val id: Int,
-    val url: String,
-    val name: String,
-    val uploadDate: Long,
-    val chapterNumber: Float,
-    val scanlator: String?,
-    val mangaId: Int,
-    val isRead: Boolean,
-    val isBookmarked: Boolean,
-    val lastPageRead: Int,
-    val lastReadAt: Long,
-    val sourceOrder: Int,
-    val realUrl: String?,
-    val fetchedAt: Long,
-    val isDownloaded: Boolean,
-    val pageCount: Int
-//    val chapterCount: Int?,
-) : Node {
-    constructor(row: ResultRow) : this(
-        row[ChapterTable.id].value,
-        row[ChapterTable.url],
-        row[ChapterTable.name],
-        row[ChapterTable.date_upload],
-        row[ChapterTable.chapter_number],
-        row[ChapterTable.scanlator],
-        row[ChapterTable.manga].value,
-        row[ChapterTable.isRead],
-        row[ChapterTable.isBookmarked],
-        row[ChapterTable.lastPageRead],
-        row[ChapterTable.lastReadAt],
-        row[ChapterTable.sourceOrder],
-        row[ChapterTable.realUrl],
-        row[ChapterTable.fetchedAt],
-        row[ChapterTable.isDownloaded],
-        row[ChapterTable.pageCount]
-//        transaction { ChapterTable.select { manga eq chapterEntry[manga].value }.count().toInt() },
-    )
-
-    constructor(dataClass: ChapterDataClass) : this(
-        dataClass.id,
-        dataClass.url,
-        dataClass.name,
-        dataClass.uploadDate,
-        dataClass.chapterNumber,
-        dataClass.scanlator,
-        dataClass.mangaId,
-        dataClass.read,
-        dataClass.bookmarked,
-        dataClass.lastPageRead,
-        dataClass.lastReadAt,
-        dataClass.index,
-        dataClass.realUrl,
-        dataClass.fetchedAt,
-        dataClass.downloaded,
-        dataClass.pageCount
-    )
-
-    fun manga(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<MangaType> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, MangaType>("MangaDataLoader", mangaId)
-    }
-
-    fun meta(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<List<ChapterMetaType>> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, List<ChapterMetaType>>("ChapterMetaDataLoader", id)
-    }
-}
-
-data class ChapterNodeList(
-    override val nodes: List<ChapterType>,
-    override val edges: List<ChapterEdge>,
-    override val pageInfo: PageInfo,
-    override val totalCount: Int
-) : NodeList() {
-    data class ChapterEdge(
-        override val cursor: Cursor,
-        override val node: ChapterType
-    ) : Edge()
-
-    companion object {
-        fun List<ChapterType>.toNodeList(): ChapterNodeList {
-            return ChapterNodeList(
-                nodes = this,
-                edges = getEdges(),
-                pageInfo = PageInfo(
-                    hasNextPage = false,
-                    hasPreviousPage = false,
-                    startCursor = Cursor(0.toString()),
-                    endCursor = Cursor(lastIndex.toString())
-                ),
-                totalCount = size
-            )
-        }
-
-        private fun List<ChapterType>.getEdges(): List<ChapterEdge> {
-            if (isEmpty()) return emptyList()
-            return listOf(
-                ChapterEdge(
-                    cursor = Cursor("0"),
-                    node = first()
-                ),
-                ChapterEdge(
-                    cursor = Cursor(lastIndex.toString()),
-                    node = last()
-                )
-            )
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/DownloadType.kt

@@ -1,85 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.types
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Edge
-import suwayomi.tachidesk.graphql.server.primitives.Node
-import suwayomi.tachidesk.graphql.server.primitives.NodeList
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.manga.impl.download.model.DownloadChapter
-import suwayomi.tachidesk.manga.impl.download.model.DownloadState
-import java.util.concurrent.CompletableFuture
-
-class DownloadType(
-    val chapterId: Int,
-    val mangaId: Int,
-    var state: DownloadState = DownloadState.Queued,
-    var progress: Float = 0f,
-    var tries: Int = 0
-) : Node {
-    constructor(downloadChapter: DownloadChapter) : this(
-        downloadChapter.chapter.id,
-        downloadChapter.mangaId,
-        downloadChapter.state,
-        downloadChapter.progress,
-        downloadChapter.tries
-    )
-
-    fun manga(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<MangaType> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, MangaType>("MangaDataLoader", mangaId)
-    }
-
-    fun chapter(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ChapterType> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, ChapterType>("ChapterDataLoader", chapterId)
-    }
-}
-
-data class DownloadNodeList(
-    override val nodes: List<DownloadType>,
-    override val edges: List<DownloadEdge>,
-    override val pageInfo: PageInfo,
-    override val totalCount: Int
-) : NodeList() {
-    data class DownloadEdge(
-        override val cursor: Cursor,
-        override val node: DownloadType
-    ) : Edge()
-
-    companion object {
-        fun List<DownloadType>.toNodeList(): DownloadNodeList {
-            return DownloadNodeList(
-                nodes = this,
-                edges = getEdges(),
-                pageInfo = PageInfo(
-                    hasNextPage = false,
-                    hasPreviousPage = false,
-                    startCursor = Cursor(0.toString()),
-                    endCursor = Cursor(lastIndex.toString())
-                ),
-                totalCount = size
-            )
-        }
-
-        private fun List<DownloadType>.getEdges(): List<DownloadEdge> {
-            if (isEmpty()) return emptyList()
-            return listOf(
-                DownloadEdge(
-                    cursor = Cursor("0"),
-                    node = first()
-                ),
-                DownloadEdge(
-                    cursor = Cursor(lastIndex.toString()),
-                    node = last()
-                )
-            )
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionType.kt

@@ -1,95 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.types
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Edge
-import suwayomi.tachidesk.graphql.server.primitives.Node
-import suwayomi.tachidesk.graphql.server.primitives.NodeList
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import java.util.concurrent.CompletableFuture
-
-class ExtensionType(
-    val apkName: String,
-    val iconUrl: String,
-
-    val name: String,
-    val pkgName: String,
-    val versionName: String,
-    val versionCode: Int,
-    val lang: String,
-    val isNsfw: Boolean,
-
-    val isInstalled: Boolean,
-    val hasUpdate: Boolean,
-    val isObsolete: Boolean
-) : Node {
-    constructor(row: ResultRow) : this(
-        apkName = row[ExtensionTable.apkName],
-        iconUrl = row[ExtensionTable.iconUrl],
-        name = row[ExtensionTable.name],
-        pkgName = row[ExtensionTable.pkgName],
-        versionName = row[ExtensionTable.versionName],
-        versionCode = row[ExtensionTable.versionCode],
-        lang = row[ExtensionTable.lang],
-        isNsfw = row[ExtensionTable.isNsfw],
-        isInstalled = row[ExtensionTable.isInstalled],
-        hasUpdate = row[ExtensionTable.hasUpdate],
-        isObsolete = row[ExtensionTable.isObsolete]
-    )
-
-    fun source(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<SourceNodeList> {
-        return dataFetchingEnvironment.getValueFromDataLoader<String, SourceNodeList>("SourcesForExtensionDataLoader", pkgName)
-    }
-}
-
-data class ExtensionNodeList(
-    override val nodes: List<ExtensionType>,
-    override val edges: List<ExtensionEdge>,
-    override val pageInfo: PageInfo,
-    override val totalCount: Int
-) : NodeList() {
-    data class ExtensionEdge(
-        override val cursor: Cursor,
-        override val node: ExtensionType
-    ) : Edge()
-
-    companion object {
-        fun List<ExtensionType>.toNodeList(): ExtensionNodeList {
-            return ExtensionNodeList(
-                nodes = this,
-                edges = getEdges(),
-                pageInfo = PageInfo(
-                    hasNextPage = false,
-                    hasPreviousPage = false,
-                    startCursor = Cursor(0.toString()),
-                    endCursor = Cursor(lastIndex.toString())
-                ),
-                totalCount = size
-            )
-        }
-
-        private fun List<ExtensionType>.getEdges(): List<ExtensionEdge> {
-            if (isEmpty()) return emptyList()
-            return listOf(
-                ExtensionEdge(
-                    cursor = Cursor("0"),
-                    node = first()
-                ),
-                ExtensionEdge(
-                    cursor = Cursor(lastIndex.toString()),
-                    node = last()
-                )
-            )
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/MangaType.kt

@@ -1,149 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.types
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Edge
-import suwayomi.tachidesk.graphql.server.primitives.Node
-import suwayomi.tachidesk.graphql.server.primitives.NodeList
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.manga.model.dataclass.toGenreList
-import suwayomi.tachidesk.manga.model.table.MangaStatus
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import java.time.Instant
-import java.util.concurrent.CompletableFuture
-
-class MangaType(
-    val id: Int,
-    val sourceId: Long,
-    val url: String,
-    val title: String,
-    val thumbnailUrl: String?,
-    val initialized: Boolean,
-    val artist: String?,
-    val author: String?,
-    val description: String?,
-    val genre: List<String>,
-    val status: MangaStatus,
-    val inLibrary: Boolean,
-    val inLibraryAt: Long,
-    val realUrl: String?,
-    var lastFetchedAt: Long?, // todo
-    var chaptersLastFetchedAt: Long? // todo
-) : Node {
-    constructor(row: ResultRow) : this(
-        row[MangaTable.id].value,
-        row[MangaTable.sourceReference],
-        row[MangaTable.url],
-        row[MangaTable.title],
-        row[MangaTable.thumbnail_url],
-        row[MangaTable.initialized],
-        row[MangaTable.artist],
-        row[MangaTable.author],
-        row[MangaTable.description],
-        row[MangaTable.genre].toGenreList(),
-        MangaStatus.valueOf(row[MangaTable.status]),
-        row[MangaTable.inLibrary],
-        row[MangaTable.inLibraryAt],
-        row[MangaTable.realUrl],
-        row[MangaTable.lastFetchedAt],
-        row[MangaTable.chaptersLastFetchedAt]
-    )
-
-    constructor(dataClass: MangaDataClass) : this(
-        dataClass.id,
-        dataClass.sourceId.toLong(),
-        dataClass.url,
-        dataClass.title,
-        dataClass.thumbnailUrl,
-        dataClass.initialized,
-        dataClass.artist,
-        dataClass.author,
-        dataClass.description,
-        dataClass.genre,
-        MangaStatus.valueOf(dataClass.status),
-        dataClass.inLibrary,
-        dataClass.inLibraryAt,
-        dataClass.realUrl,
-        dataClass.lastFetchedAt,
-        dataClass.chaptersLastFetchedAt
-    )
-
-    fun chapters(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ChapterNodeList> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, ChapterNodeList>("ChaptersForMangaDataLoader", id)
-    }
-
-    fun age(): Long? {
-        if (lastFetchedAt == null) return null
-        return Instant.now().epochSecond.minus(lastFetchedAt!!)
-    }
-
-    fun chaptersAge(): Long? {
-        if (chaptersLastFetchedAt == null) return null
-
-        return Instant.now().epochSecond.minus(chaptersLastFetchedAt!!)
-    }
-
-    fun meta(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<List<MangaMetaType>> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, List<MangaMetaType>>("MangaMetaDataLoader", id)
-    }
-
-    fun categories(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<CategoryNodeList> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, CategoryNodeList>("CategoriesForMangaDataLoader", id)
-    }
-
-    fun source(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<SourceType?> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Long, SourceType?>("SourceDataLoader", sourceId)
-    }
-}
-
-data class MangaNodeList(
-    override val nodes: List<MangaType>,
-    override val edges: List<MangaEdge>,
-    override val pageInfo: PageInfo,
-    override val totalCount: Int
-) : NodeList() {
-    data class MangaEdge(
-        override val cursor: Cursor,
-        override val node: MangaType
-    ) : Edge()
-
-    companion object {
-        fun List<MangaType>.toNodeList(): MangaNodeList {
-            return MangaNodeList(
-                nodes = this,
-                edges = getEdges(),
-                pageInfo = PageInfo(
-                    hasNextPage = false,
-                    hasPreviousPage = false,
-                    startCursor = Cursor(0.toString()),
-                    endCursor = Cursor(lastIndex.toString())
-                ),
-                totalCount = size
-            )
-        }
-
-        private fun List<MangaType>.getEdges(): List<MangaEdge> {
-            if (isEmpty()) return emptyList()
-            return listOf(
-                MangaEdge(
-                    cursor = Cursor("0"),
-                    node = first()
-                ),
-                MangaEdge(
-                    cursor = Cursor(lastIndex.toString()),
-                    node = last()
-                )
-            )
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/MetaType.kt

@@ -1,120 +0,0 @@
-package suwayomi.tachidesk.graphql.types
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.global.model.table.GlobalMetaTable
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Edge
-import suwayomi.tachidesk.graphql.server.primitives.Node
-import suwayomi.tachidesk.graphql.server.primitives.NodeList
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.manga.model.table.CategoryMetaTable
-import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
-import suwayomi.tachidesk.manga.model.table.MangaMetaTable
-import java.util.concurrent.CompletableFuture
-
-interface MetaType : Node {
-    val key: String
-    val value: String
-}
-
-class ChapterMetaType(
-    override val key: String,
-    override val value: String,
-    val chapterId: Int
-) : MetaType {
-    constructor(row: ResultRow) : this(
-        key = row[ChapterMetaTable.key],
-        value = row[ChapterMetaTable.value],
-        chapterId = row[ChapterMetaTable.ref].value
-    )
-
-    fun chapter(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ChapterType> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, ChapterType>("ChapterDataLoader", chapterId)
-    }
-}
-
-class MangaMetaType(
-    override val key: String,
-    override val value: String,
-    val mangaId: Int
-) : MetaType {
-    constructor(row: ResultRow) : this(
-        key = row[MangaMetaTable.key],
-        value = row[MangaMetaTable.value],
-        mangaId = row[MangaMetaTable.ref].value
-    )
-
-    fun manga(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<MangaType> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, MangaType>("MangaDataLoader", mangaId)
-    }
-}
-
-class CategoryMetaType(
-    override val key: String,
-    override val value: String,
-    val categoryId: Int
-) : MetaType {
-    constructor(row: ResultRow) : this(
-        key = row[CategoryMetaTable.key],
-        value = row[CategoryMetaTable.value],
-        categoryId = row[CategoryMetaTable.ref].value
-    )
-
-    fun category(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<CategoryType> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Int, CategoryType>("CategoryDataLoader", categoryId)
-    }
-}
-
-class GlobalMetaType(
-    override val key: String,
-    override val value: String
-) : MetaType {
-    constructor(row: ResultRow) : this(
-        key = row[GlobalMetaTable.key],
-        value = row[GlobalMetaTable.value]
-    )
-}
-
-data class GlobalMetaNodeList(
-    override val nodes: List<GlobalMetaType>,
-    override val edges: List<MetaEdge>,
-    override val pageInfo: PageInfo,
-    override val totalCount: Int
-) : NodeList() {
-    data class MetaEdge(
-        override val cursor: Cursor,
-        override val node: GlobalMetaType
-    ) : Edge()
-
-    companion object {
-        fun List<GlobalMetaType>.toNodeList(): GlobalMetaNodeList {
-            return GlobalMetaNodeList(
-                nodes = this,
-                edges = getEdges(),
-                pageInfo = PageInfo(
-                    hasNextPage = false,
-                    hasPreviousPage = false,
-                    startCursor = Cursor(0.toString()),
-                    endCursor = Cursor(lastIndex.toString())
-                ),
-                totalCount = size
-            )
-        }
-
-        private fun List<GlobalMetaType>.getEdges(): List<MetaEdge> {
-            if (isEmpty()) return emptyList()
-            return listOf(
-                MetaEdge(
-                    cursor = Cursor("0"),
-                    node = first()
-                ),
-                MetaEdge(
-                    cursor = Cursor(lastIndex.toString()),
-                    node = last()
-                )
-            )
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SourceType.kt

@@ -1,144 +0,0 @@
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package suwayomi.tachidesk.graphql.types
-
-import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.ConfigurableSource
-import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.sql.select
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Edge
-import suwayomi.tachidesk.graphql.server.primitives.Node
-import suwayomi.tachidesk.graphql.server.primitives.NodeList
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-import suwayomi.tachidesk.manga.impl.Search
-import suwayomi.tachidesk.manga.impl.Source
-import suwayomi.tachidesk.manga.impl.extension.Extension
-import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
-import suwayomi.tachidesk.manga.model.dataclass.SourceDataClass
-import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.manga.model.table.SourceTable
-import java.util.concurrent.CompletableFuture
-
-class SourceType(
-    val id: Long,
-    val name: String,
-    val lang: String,
-    val iconUrl: String,
-    val supportsLatest: Boolean,
-    val isConfigurable: Boolean,
-    val isNsfw: Boolean,
-    val displayName: String
-) : Node {
-    constructor(source: SourceDataClass) : this(
-        id = source.id.toLong(),
-        name = source.name,
-        lang = source.lang,
-        iconUrl = source.iconUrl,
-        supportsLatest = source.supportsLatest,
-        isConfigurable = source.isConfigurable,
-        isNsfw = source.isNsfw,
-        displayName = source.displayName
-    )
-
-    constructor(row: ResultRow, sourceExtension: ResultRow, catalogueSource: CatalogueSource) : this(
-        id = row[SourceTable.id].value,
-        name = row[SourceTable.name],
-        lang = row[SourceTable.lang],
-        iconUrl = Extension.getExtensionIconUrl(sourceExtension[ExtensionTable.apkName]),
-        supportsLatest = catalogueSource.supportsLatest,
-        isConfigurable = catalogueSource is ConfigurableSource,
-        isNsfw = row[SourceTable.isNsfw],
-        displayName = catalogueSource.toString()
-    )
-
-    fun manga(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<MangaNodeList> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Long, MangaNodeList>("MangaForSourceDataLoader", id)
-    }
-
-    fun extension(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ExtensionType> {
-        return dataFetchingEnvironment.getValueFromDataLoader<Long, ExtensionType>("ExtensionForSourceDataLoader", id)
-    }
-
-    fun preferences(): List<PreferenceObject> {
-        return Source.getSourcePreferences(id).map { PreferenceObject(it.type, it.props) }
-    }
-
-    fun filters(): List<FilterObject> {
-        return Search.getFilterList(id, false).map { FilterObject(it.type, it.filter) }
-    }
-}
-
-fun SourceType(row: ResultRow): SourceType? {
-    val catalogueSource = GetCatalogueSource
-        .getCatalogueSourceOrNull(row[SourceTable.id].value)
-        ?: return null
-    val sourceExtension = if (row.hasValue(ExtensionTable.id)) {
-        row
-    } else {
-        ExtensionTable
-            .select { ExtensionTable.id eq row[SourceTable.extension] }
-            .first()
-    }
-
-    return SourceType(row, sourceExtension, catalogueSource)
-}
-
-data class SourceNodeList(
-    override val nodes: List<SourceType>,
-    override val edges: List<SourceEdge>,
-    override val pageInfo: PageInfo,
-    override val totalCount: Int
-) : NodeList() {
-    data class SourceEdge(
-        override val cursor: Cursor,
-        override val node: SourceType
-    ) : Edge()
-
-    companion object {
-        fun List<SourceType>.toNodeList(): SourceNodeList {
-            return SourceNodeList(
-                nodes = this,
-                edges = getEdges(),
-                pageInfo = PageInfo(
-                    hasNextPage = false,
-                    hasPreviousPage = false,
-                    startCursor = Cursor(0.toString()),
-                    endCursor = Cursor(lastIndex.toString())
-                ),
-                totalCount = size
-            )
-        }
-
-        private fun List<SourceType>.getEdges(): List<SourceEdge> {
-            if (isEmpty()) return emptyList()
-            return listOf(
-                SourceEdge(
-                    cursor = Cursor("0"),
-                    node = first()
-                ),
-                SourceEdge(
-                    cursor = Cursor(lastIndex.toString()),
-                    node = last()
-                )
-            )
-        }
-    }
-}
-
-data class PreferenceObject(
-    val type: String,
-    val props: Any
-)
-
-data class FilterObject(
-    val type: String,
-    val filter: Any
-)

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/TrackType.kt

@@ -1,37 +0,0 @@
-package suwayomi.tachidesk.graphql.types
-
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import eu.kanade.tachiyomi.data.track.TrackService
-import suwayomi.tachidesk.graphql.server.primitives.Cursor
-import suwayomi.tachidesk.graphql.server.primitives.Edge
-import suwayomi.tachidesk.graphql.server.primitives.Node
-import suwayomi.tachidesk.graphql.server.primitives.NodeList
-import suwayomi.tachidesk.graphql.server.primitives.PageInfo
-
-data class TrackServiceType(
-    val id: Long,
-    val name: String
-) : Node {
-    constructor(trackService: TrackService) : this(
-        trackService.id,
-        trackService.name
-    )
-}
-
-data class TrackServiceNodeList(
-    override val nodes: List<TrackServiceType>,
-    override val edges: List<TrackServiceEdge>,
-    override val pageInfo: PageInfo,
-    override val totalCount: Int
-) : NodeList() {
-    data class TrackServiceEdge(
-        override val cursor: Cursor,
-        override val node: TrackServiceType
-    ) : Edge()
-}

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/UpdateController.kt

@@ -1,5 +1,12 @@
 package suwayomi.tachidesk.manga.controller
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import io.javalin.http.HttpCode
 import io.javalin.websocket.WsConfig
@@ -13,24 +20,13 @@ import suwayomi.tachidesk.manga.impl.Chapter
 import suwayomi.tachidesk.manga.impl.update.IUpdater
 import suwayomi.tachidesk.manga.impl.update.UpdateStatus
 import suwayomi.tachidesk.manga.impl.update.UpdaterSocket
-import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
-import suwayomi.tachidesk.manga.model.dataclass.IncludeInUpdate
-import suwayomi.tachidesk.manga.model.dataclass.MangaChapterDataClass
-import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.manga.model.dataclass.PaginatedList
+import suwayomi.tachidesk.manga.model.dataclass.*
 import suwayomi.tachidesk.server.JavalinSetup.future
 import suwayomi.tachidesk.server.util.formParam
 import suwayomi.tachidesk.server.util.handler
 import suwayomi.tachidesk.server.util.pathParam
 import suwayomi.tachidesk.server.util.withOperation
 
-/*
- * Copyright (C) Contributors to the Suwayomi project
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 object UpdateController {
     private val logger = KotlinLogging.logger { }
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt

@@ -10,7 +10,6 @@ package suwayomi.tachidesk.manga.impl
 import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.sql.andWhere
 import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.insertAndGetId
@@ -18,7 +17,9 @@ import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
+import suwayomi.tachidesk.manga.impl.CategoryManga.removeMangaFromCategory
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
+import suwayomi.tachidesk.manga.model.dataclass.IncludeInUpdate
 import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.CategoryMetaTable
 import suwayomi.tachidesk.manga.model.table.CategoryTable
@@ -52,8 +53,8 @@ object Category {
     fun updateCategory(categoryId: Int, name: String?, isDefault: Boolean?, includeInUpdate: Int?) {
         transaction {
             CategoryTable.update({ CategoryTable.id eq categoryId }) {
-                if (categoryId != DEFAULT_CATEGORY_ID && name != null && !name.equals(DEFAULT_CATEGORY_NAME, ignoreCase = true)) it[CategoryTable.name] = name
-                if (categoryId != DEFAULT_CATEGORY_ID && isDefault != null) it[CategoryTable.isDefault] = isDefault
+                if (name != null && !name.equals(DEFAULT_CATEGORY_NAME, ignoreCase = true)) it[CategoryTable.name] = name
+                if (isDefault != null) it[CategoryTable.isDefault] = isDefault
                 if (includeInUpdate != null) it[CategoryTable.includeInUpdate] = includeInUpdate
             }
         }
@@ -63,7 +64,6 @@ object Category {
      * Move the category from order number `from` to `to`
      */
     fun reorderCategory(from: Int, to: Int) {
-        if (from == 0 || to == 0) return
         transaction {
             val categories = CategoryTable.selectAll().orderBy(CategoryTable.order to SortOrder.ASC).toMutableList()
             categories.add(to - 1, categories.removeAt(from - 1))
@@ -76,53 +76,45 @@ object Category {
     }
 
     fun removeCategory(categoryId: Int) {
-        if (categoryId == DEFAULT_CATEGORY_ID) return
         transaction {
+            CategoryMangaTable.select { CategoryMangaTable.category eq categoryId }.forEach {
+                removeMangaFromCategory(it[CategoryMangaTable.manga].value, categoryId)
+            }
             CategoryTable.deleteWhere { CategoryTable.id eq categoryId }
             normalizeCategories()
         }
     }
 
     /** make sure category order numbers starts from 1 and is consecutive */
-    fun normalizeCategories() {
+    private fun normalizeCategories() {
         transaction {
-            CategoryTable.selectAll()
-                .orderBy(CategoryTable.order to SortOrder.ASC)
-                .sortedWith(compareBy({ it[CategoryTable.id].value != 0 }, { it[CategoryTable.order] }))
-                .forEachIndexed { index, cat ->
-                    CategoryTable.update({ CategoryTable.id eq cat[CategoryTable.id].value }) {
-                        it[CategoryTable.order] = index
-                    }
+            val categories = CategoryTable.selectAll().orderBy(CategoryTable.order to SortOrder.ASC)
+            categories.forEachIndexed { index, cat ->
+                CategoryTable.update({ CategoryTable.id eq cat[CategoryTable.id].value }) {
+                    it[CategoryTable.order] = index + 1
                 }
+            }
         }
     }
 
-    private fun needsDefaultCategory() = transaction {
-        MangaTable
-            .leftJoin(CategoryMangaTable)
-            .select { MangaTable.inLibrary eq true }
-            .andWhere { CategoryMangaTable.manga.isNull() }
-            .empty()
-            .not()
-    }
-
     const val DEFAULT_CATEGORY_ID = 0
     const val DEFAULT_CATEGORY_NAME = "Default"
+    private fun addDefaultIfNecessary(categories: List<CategoryDataClass>): List<CategoryDataClass> {
+        val defaultCategorySize = MangaTable.select { (MangaTable.inLibrary eq true) and (MangaTable.defaultCategory eq true) }.count().toInt()
+        return if (defaultCategorySize > 0) {
+            listOf(CategoryDataClass(DEFAULT_CATEGORY_ID, 0, DEFAULT_CATEGORY_NAME, true, defaultCategorySize, IncludeInUpdate.UNSET)) + categories
+        } else {
+            categories
+        }
+    }
 
     fun getCategoryList(): List<CategoryDataClass> {
         return transaction {
-            CategoryTable.selectAll()
-                .orderBy(CategoryTable.order to SortOrder.ASC)
-                .let {
-                    if (needsDefaultCategory()) {
-                        it
-                    } else {
-                        it.andWhere { CategoryTable.id neq DEFAULT_CATEGORY_ID }
-                    }
-                }
-                .map {
-                    CategoryTable.toDataClass(it)
-                }
+            val categories = CategoryTable.selectAll().orderBy(CategoryTable.order to SortOrder.ASC).map {
+                CategoryTable.toDataClass(it)
+            }
+
+            addDefaultIfNecessary(categories)
         }
     }
 
@@ -136,15 +128,8 @@ object Category {
 
     fun getCategorySize(categoryId: Int): Int {
         return transaction {
-            if (categoryId == DEFAULT_CATEGORY_ID) {
-                MangaTable
-                    .leftJoin(CategoryMangaTable)
-                    .select { MangaTable.inLibrary eq true }
-                    .andWhere { CategoryMangaTable.manga.isNull() }
-            } else {
-                CategoryMangaTable.select {
-                    CategoryMangaTable.category eq categoryId
-                }
+            CategoryMangaTable.select {
+                CategoryMangaTable.category eq categoryId
             }.count().toInt()
         }
     }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt

@@ -19,6 +19,7 @@ import org.jetbrains.exposed.sql.leftJoin
 import org.jetbrains.exposed.sql.max
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
+import org.jetbrains.exposed.sql.update
 import org.jetbrains.exposed.sql.wrapAsExpression
 import suwayomi.tachidesk.manga.impl.Category.DEFAULT_CATEGORY_ID
 import suwayomi.tachidesk.manga.impl.util.lang.isEmpty
@@ -32,7 +33,6 @@ import suwayomi.tachidesk.manga.model.table.toDataClass
 
 object CategoryManga {
     fun addMangaToCategory(mangaId: Int, categoryId: Int) {
-        if (categoryId == DEFAULT_CATEGORY_ID) return
         fun notAlreadyInCategory() = CategoryMangaTable.select { (CategoryMangaTable.category eq categoryId) and (CategoryMangaTable.manga eq mangaId) }.isEmpty()
 
         transaction {
@@ -41,14 +41,22 @@ object CategoryManga {
                     it[CategoryMangaTable.category] = categoryId
                     it[CategoryMangaTable.manga] = mangaId
                 }
+
+                MangaTable.update({ MangaTable.id eq mangaId }) {
+                    it[MangaTable.defaultCategory] = false
+                }
             }
         }
     }
 
     fun removeMangaFromCategory(mangaId: Int, categoryId: Int) {
-        if (categoryId == DEFAULT_CATEGORY_ID) return
         transaction {
             CategoryMangaTable.deleteWhere { (CategoryMangaTable.category eq categoryId) and (CategoryMangaTable.manga eq mangaId) }
+            if (CategoryMangaTable.select { CategoryMangaTable.manga eq mangaId }.count() == 0L) {
+                MangaTable.update({ MangaTable.id eq mangaId }) {
+                    it[MangaTable.defaultCategory] = true
+                }
+            }
         }
     }
 
@@ -83,9 +91,8 @@ object CategoryManga {
             val query = if (categoryId == DEFAULT_CATEGORY_ID) {
                 MangaTable
                     .leftJoin(ChapterTable, { MangaTable.id }, { ChapterTable.manga })
-                    .leftJoin(CategoryMangaTable)
                     .slice(columns = selectedColumns)
-                    .select { (MangaTable.inLibrary eq true) and CategoryMangaTable.category.isNull() }
+                    .select { (MangaTable.inLibrary eq true) and (MangaTable.defaultCategory eq true) }
             } else {
                 MangaTable
                     .innerJoin(CategoryMangaTable)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt

@@ -7,7 +7,6 @@ package suwayomi.tachidesk.manga.impl
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.chapter.ChapterRecognition
@@ -32,6 +31,7 @@ import suwayomi.tachidesk.manga.model.dataclass.PaginatedList
 import suwayomi.tachidesk.manga.model.dataclass.paginatedFrom
 import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
 import suwayomi.tachidesk.manga.model.table.ChapterTable
+import suwayomi.tachidesk.manga.model.table.ChapterTable.scanlator
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.PageTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
@@ -56,48 +56,6 @@ object Chapter {
     }
 
     private suspend fun getSourceChapters(mangaId: Int): List<ChapterDataClass> {
-        val chapterList = fetchChapterList(mangaId)
-
-        val dbChapterMap = transaction {
-            ChapterTable.select { ChapterTable.manga eq mangaId }
-                .associateBy({ it[ChapterTable.url] }, { it })
-        }
-
-        val chapterIds = chapterList.map { dbChapterMap.getValue(it.url)[ChapterTable.id] }
-        val chapterMetas = getChaptersMetaMaps(chapterIds)
-
-        return chapterList.mapIndexed { index, it ->
-
-            val dbChapter = dbChapterMap.getValue(it.url)
-
-            ChapterDataClass(
-                id = dbChapter[ChapterTable.id].value,
-                url = it.url,
-                name = it.name,
-                uploadDate = it.date_upload,
-                chapterNumber = it.chapter_number,
-                scanlator = it.scanlator,
-                mangaId = mangaId,
-
-                read = dbChapter[ChapterTable.isRead],
-                bookmarked = dbChapter[ChapterTable.isBookmarked],
-                lastPageRead = dbChapter[ChapterTable.lastPageRead],
-                lastReadAt = dbChapter[ChapterTable.lastReadAt],
-
-                index = chapterList.size - index,
-                fetchedAt = dbChapter[ChapterTable.fetchedAt],
-                realUrl = dbChapter[ChapterTable.realUrl],
-                downloaded = dbChapter[ChapterTable.isDownloaded],
-
-                pageCount = dbChapter[ChapterTable.pageCount],
-
-                chapterCount = chapterList.size,
-                meta = chapterMetas.getValue(dbChapter[ChapterTable.id])
-            )
-        }
-    }
-
-    suspend fun fetchChapterList(mangaId: Int): List<SChapter> {
         val manga = getManga(mangaId)
         val source = getCatalogueSourceOrStub(manga.sourceId.toLong())
 
@@ -114,6 +72,7 @@ object Chapter {
             ChapterRecognition.parseChapterNumber(it, sManga)
         }
 
+        val chapterCount = chapterList.count()
         var now = Instant.now().epochSecond
 
         transaction {
@@ -159,10 +118,9 @@ object Chapter {
 
         // clear any orphaned/duplicate chapters that are in the db but not in `chapterList`
         val dbChapterCount = transaction { ChapterTable.select { ChapterTable.manga eq mangaId }.count() }
-        if (dbChapterCount > chapterList.size) { // we got some clean up due
+        if (dbChapterCount > chapterCount) { // we got some clean up due
             val dbChapterList = transaction {
-                ChapterTable.select { ChapterTable.manga eq mangaId }
-                    .orderBy(ChapterTable.url to ASC).toList()
+                ChapterTable.select { ChapterTable.manga eq mangaId }.orderBy(ChapterTable.url to ASC).toList()
             }
             val chapterUrls = chapterList.map { it.url }.toSet()
 
@@ -179,7 +137,43 @@ object Chapter {
             }
         }
 
-        return chapterList
+        val dbChapterMap = transaction {
+            ChapterTable.select { ChapterTable.manga eq mangaId }
+                .associateBy({ it[ChapterTable.url] }, { it })
+        }
+
+        val chapterIds = chapterList.map { dbChapterMap.getValue(it.url)[ChapterTable.id] }
+        val chapterMetas = getChaptersMetaMaps(chapterIds)
+
+        return chapterList.mapIndexed { index, it ->
+
+            val dbChapter = dbChapterMap.getValue(it.url)
+
+            ChapterDataClass(
+                id = dbChapter[ChapterTable.id].value,
+                url = it.url,
+                name = it.name,
+                uploadDate = it.date_upload,
+                chapterNumber = it.chapter_number,
+                scanlator = it.scanlator,
+                mangaId = mangaId,
+
+                read = dbChapter[ChapterTable.isRead],
+                bookmarked = dbChapter[ChapterTable.isBookmarked],
+                lastPageRead = dbChapter[ChapterTable.lastPageRead],
+                lastReadAt = dbChapter[ChapterTable.lastReadAt],
+
+                index = chapterCount - index,
+                fetchedAt = dbChapter[ChapterTable.fetchedAt],
+                realUrl = dbChapter[ChapterTable.realUrl],
+                downloaded = dbChapter[ChapterTable.isDownloaded],
+
+                pageCount = dbChapter[ChapterTable.pageCount],
+
+                chapterCount = chapterList.size,
+                meta = chapterMetas.getValue(dbChapter[ChapterTable.id])
+            )
+        }
     }
 
     fun modifyChapter(
@@ -307,12 +301,6 @@ object Chapter {
             val chapterId =
                 ChapterTable.select { (ChapterTable.manga eq mangaId) and (ChapterTable.sourceOrder eq chapterIndex) }
                     .first()[ChapterTable.id].value
-            modifyChapterMeta(chapterId, key, value)
-        }
-    }
-
-    fun modifyChapterMeta(chapterId: Int, key: String, value: String) {
-        transaction {
             val meta =
                 ChapterMetaTable.select { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
                     .firstOrNull()

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Library.kt

@@ -7,7 +7,6 @@ package suwayomi.tachidesk.manga.impl
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -23,14 +22,13 @@ object Library {
         val manga = getManga(mangaId)
         if (!manga.inLibrary) {
             transaction {
-                val defaultCategories = CategoryTable.select {
-                    (CategoryTable.isDefault eq true) and (CategoryTable.id neq Category.DEFAULT_CATEGORY_ID)
-                }.toList()
+                val defaultCategories = CategoryTable.select { CategoryTable.isDefault eq true }.toList()
                 val existingCategories = CategoryMangaTable.select { CategoryMangaTable.manga eq mangaId }.toList()
 
                 MangaTable.update({ MangaTable.id eq manga.id }) {
                     it[inLibrary] = true
                     it[inLibraryAt] = Instant.now().epochSecond
+                    it[defaultCategory] = defaultCategories.isEmpty() && existingCategories.isEmpty()
                 }
 
                 if (existingCategories.isEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt

@@ -60,10 +60,49 @@ object Manga {
     suspend fun getManga(mangaId: Int, onlineFetch: Boolean = false): MangaDataClass {
         var mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.first() }
 
-        return if (!onlineFetch && mangaEntry[MangaTable.initialized]) {
+        return if (mangaEntry[MangaTable.initialized] && !onlineFetch) {
             getMangaDataClass(mangaId, mangaEntry)
         } else { // initialize manga
-            val sManga = fetchManga(mangaId) ?: return getMangaDataClass(mangaId, mangaEntry)
+            val source = getCatalogueSourceOrNull(mangaEntry[MangaTable.sourceReference])
+                ?: return getMangaDataClass(mangaId, mangaEntry)
+            val sManga = SManga.create().apply {
+                url = mangaEntry[MangaTable.url]
+                title = mangaEntry[MangaTable.title]
+            }
+            val networkManga = source.fetchMangaDetails(sManga).awaitSingle()
+            sManga.copyFrom(networkManga)
+
+            transaction {
+                MangaTable.update({ MangaTable.id eq mangaId }) {
+                    if (sManga.title != mangaEntry[MangaTable.title]) {
+                        val canUpdateTitle = updateMangaDownloadDir(mangaId, sManga.title)
+
+                        if (canUpdateTitle) {
+                            it[MangaTable.title] = sManga.title
+                        }
+                    }
+                    it[MangaTable.initialized] = true
+
+                    it[MangaTable.artist] = sManga.artist
+                    it[MangaTable.author] = sManga.author
+                    it[MangaTable.description] = truncate(sManga.description, 4096)
+                    it[MangaTable.genre] = sManga.genre
+                    it[MangaTable.status] = sManga.status
+                    if (!sManga.thumbnail_url.isNullOrEmpty() && sManga.thumbnail_url != mangaEntry[MangaTable.thumbnail_url]) {
+                        it[MangaTable.thumbnail_url] = sManga.thumbnail_url
+                        it[MangaTable.thumbnailUrlLastFetched] = Instant.now().epochSecond
+                        clearMangaThumbnailCache(mangaId)
+                    }
+
+                    it[MangaTable.realUrl] = runCatching {
+                        (source as? HttpSource)?.getMangaUrl(sManga)
+                    }.getOrNull()
+
+                    it[MangaTable.lastFetchedAt] = Instant.now().epochSecond
+
+                    it[MangaTable.updateStrategy] = sManga.update_strategy.name
+                }
+            }
 
             mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.first() }
 
@@ -96,53 +135,6 @@ object Manga {
         }
     }
 
-    suspend fun fetchManga(mangaId: Int): SManga? {
-        val mangaEntry = transaction { MangaTable.select { MangaTable.id eq mangaId }.first() }
-
-        val source = getCatalogueSourceOrNull(mangaEntry[MangaTable.sourceReference])
-            ?: return null
-        val sManga = SManga.create().apply {
-            url = mangaEntry[MangaTable.url]
-            title = mangaEntry[MangaTable.title]
-        }
-        val networkManga = source.fetchMangaDetails(sManga).awaitSingle()
-        sManga.copyFrom(networkManga)
-
-        transaction {
-            MangaTable.update({ MangaTable.id eq mangaId }) {
-                if (sManga.title != mangaEntry[MangaTable.title]) {
-                    val canUpdateTitle = updateMangaDownloadDir(mangaId, sManga.title)
-
-                    if (canUpdateTitle) {
-                        it[MangaTable.title] = sManga.title
-                    }
-                }
-                it[MangaTable.initialized] = true
-
-                it[MangaTable.artist] = sManga.artist
-                it[MangaTable.author] = sManga.author
-                it[MangaTable.description] = truncate(sManga.description, 4096)
-                it[MangaTable.genre] = sManga.genre
-                it[MangaTable.status] = sManga.status
-                if (!sManga.thumbnail_url.isNullOrEmpty() && sManga.thumbnail_url != mangaEntry[MangaTable.thumbnail_url]) {
-                    it[MangaTable.thumbnail_url] = sManga.thumbnail_url
-                    it[MangaTable.thumbnailUrlLastFetched] = Instant.now().epochSecond
-                    clearMangaThumbnailCache(mangaId)
-                }
-
-                it[MangaTable.realUrl] = runCatching {
-                    (source as? HttpSource)?.getMangaUrl(sManga)
-                }.getOrNull()
-
-                it[MangaTable.lastFetchedAt] = Instant.now().epochSecond
-
-                it[MangaTable.updateStrategy] = sManga.update_strategy.name
-            }
-        }
-
-        return sManga
-    }
-
     suspend fun getMangaFull(mangaId: Int, onlineFetch: Boolean = false): MangaDataClass {
         val mangaDaaClass = getManga(mangaId, onlineFetch)
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/MangaList.kt

@@ -44,34 +44,6 @@ object MangaList {
         return mangasPage.processEntries(sourceId)
     }
 
-    fun MangasPage.insertOrGet(sourceId: Long): List<Int> {
-        return transaction {
-            mangas.map { manga ->
-                val mangaEntry = MangaTable.select {
-                    (MangaTable.url eq manga.url) and (MangaTable.sourceReference eq sourceId)
-                }.firstOrNull()
-                if (mangaEntry == null) { // create manga entry
-                    MangaTable.insertAndGetId {
-                        it[url] = manga.url
-                        it[title] = manga.title
-
-                        it[artist] = manga.artist
-                        it[author] = manga.author
-                        it[description] = manga.description
-                        it[genre] = manga.genre
-                        it[status] = manga.status
-                        it[thumbnail_url] = manga.thumbnail_url
-                        it[updateStrategy] = manga.update_strategy.name
-
-                        it[sourceReference] = sourceId
-                    }.value
-                } else {
-                    mangaEntry[MangaTable.id].value
-                }
-            }
-        }
-    }
-
     fun MangasPage.processEntries(sourceId: Long): PagedMangaListDataClass {
         val mangasPage = this
         val mangaList = transaction {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Search.kt

@@ -125,7 +125,7 @@ object Search {
         return filterList
     }
 
-    fun buildFilterList(sourceId: Long, changes: List<FilterChange>): FilterList {
+    private fun buildFilterList(sourceId: Long, changes: List<FilterChange>): FilterList {
         val source = getCatalogueSourceOrStub(sourceId)
         val filterList = source.getFilterList()
         return updateFilterList(filterList, changes)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/ArchiveProvider.kt

@@ -3,21 +3,21 @@ package suwayomi.tachidesk.manga.impl.download
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
-import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream
-import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
-import org.apache.commons.compress.archivers.zip.ZipFile
 import suwayomi.tachidesk.manga.impl.download.model.DownloadChapter
 import suwayomi.tachidesk.manga.impl.util.getChapterCbzPath
 import suwayomi.tachidesk.manga.impl.util.getChapterDownloadPath
 import java.io.File
 import java.io.InputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
 
 class ArchiveProvider(mangaId: Int, chapterId: Int) : DownloadedFilesProvider(mangaId, chapterId) {
     override fun getImage(index: Int): Pair<InputStream, String> {
         val cbzPath = getChapterCbzPath(mangaId, chapterId)
         val zipFile = ZipFile(cbzPath)
-        val zipEntry = zipFile.entries.toList().sortedWith(compareBy({ it.name }, { it.name }))[index]
+        val zipEntry = zipFile.entries().toList().sortedWith(compareBy({ it.name }, { it.name }))[index]
         val inputStream = zipFile.getInputStream(zipEntry)
         val fileType = zipEntry.name.substringAfterLast(".")
         return Pair(inputStream.buffered(), "image/$fileType")
@@ -39,17 +39,17 @@ class ArchiveProvider(mangaId: Int, chapterId: Int) : DownloadedFilesProvider(ma
             outputFile.createNewFile()
         }
 
-        ZipArchiveOutputStream(outputFile.outputStream()).use { zipOut ->
+        ZipOutputStream(outputFile.outputStream()).use { zipOut ->
             if (chapterFolder.isDirectory) {
                 chapterFolder.listFiles()?.sortedBy { it.name }?.forEach {
-                    val entry = ZipArchiveEntry(it.name)
+                    val entry = ZipEntry(it.name)
                     try {
-                        zipOut.putArchiveEntry(entry)
+                        zipOut.putNextEntry(entry)
                         it.inputStream().use { inputStream ->
                             inputStream.copyTo(zipOut)
                         }
                     } finally {
-                        zipOut.closeArchiveEntry()
+                        zipOut.closeEntry()
                     }
                 }
             }
@@ -70,7 +70,7 @@ class ArchiveProvider(mangaId: Int, chapterId: Int) : DownloadedFilesProvider(ma
 
     private fun handleExistingCbzFile(cbzFile: File, chapterFolder: File) {
         if (!chapterFolder.exists()) chapterFolder.mkdirs()
-        ZipArchiveInputStream(cbzFile.inputStream()).use { zipInputStream ->
+        ZipInputStream(cbzFile.inputStream()).use { zipInputStream ->
             var zipEntry = zipInputStream.nextEntry
             while (zipEntry != null) {
                 val file = File(chapterFolder, zipEntry.name)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt

@@ -24,7 +24,6 @@ import mu.KotlinLogging
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.subscriptions.downloadSubscriptionSource
 import suwayomi.tachidesk.manga.impl.download.model.DownloadChapter
 import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Downloading
 import suwayomi.tachidesk.manga.impl.download.model.DownloadStatus
@@ -101,9 +100,6 @@ object DownloadManager {
                 notifyFlow.emit(Unit)
             }
         }
-        /*if (downloadChapter != null) { TODO GRAPHQL
-            downloadSubscriptionSource.publish(downloadChapter)
-        }*/
     }
 
     private fun getStatus(): DownloadStatus {
@@ -238,7 +234,6 @@ object DownloadManager {
                 manga
             )
             downloadQueue.add(downloadChapter)
-            downloadSubscriptionSource.publish(downloadChapter)
             logger.debug { "Added chapter ${chapter.id} to download queue (${manga.title} | ${chapter.name})" }
             return downloadChapter
         }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt

@@ -30,7 +30,7 @@ object ExtensionsList {
     var lastUpdateCheck: Long = 0
     var updateMap = ConcurrentHashMap<String, OnlineExtension>()
 
-    suspend fun fetchExtensions() {
+    suspend fun getExtensionList(): List<ExtensionDataClass> {
         // update if 60 seconds has passed or requested offline and database is empty
         if (lastUpdateCheck + 60.seconds.inWholeMilliseconds < System.currentTimeMillis()) {
             logger.debug("Getting extensions list from the internet")
@@ -41,10 +41,7 @@ object ExtensionsList {
         } else {
             logger.debug("used cached extension list")
         }
-    }
 
-    suspend fun getExtensionList(): List<ExtensionDataClass> {
-        fetchExtensions()
         return extensionTableAsDataClass()
     }
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/lang/ExposedExtensions.kt

@@ -9,6 +9,6 @@ package suwayomi.tachidesk.manga.impl.util.lang
 
 import org.jetbrains.exposed.sql.Query
 
-fun Query.isEmpty() = this.empty()
+fun Query.isEmpty() = this.count() == 0L
 
 fun Query.isNotEmpty() = !this.isEmpty()

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryMangaTable.kt

@@ -8,9 +8,8 @@ package suwayomi.tachidesk.manga.model.table
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.ReferenceOption
 
 object CategoryMangaTable : IntIdTable() {
-    val category = reference("category", CategoryTable, ReferenceOption.CASCADE)
-    val manga = reference("manga", MangaTable, ReferenceOption.CASCADE)
+    val category = reference("category", CategoryTable)
+    val manga = reference("manga", MangaTable)
 }

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt

@@ -8,7 +8,6 @@ package suwayomi.tachidesk.manga.model.table
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.ReferenceOption
 import org.jetbrains.exposed.sql.ResultRow
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -38,7 +37,7 @@ object ChapterTable : IntIdTable() {
 
     val pageCount = integer("page_count").default(-1)
 
-    val manga = reference("manga", MangaTable, ReferenceOption.CASCADE)
+    val manga = reference("manga", MangaTable)
 }
 
 fun ChapterTable.toDataClass(chapterEntry: ResultRow) =

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt

@@ -32,6 +32,7 @@ object MangaTable : IntIdTable() {
     val thumbnailUrlLastFetched = long("thumbnail_url_last_fetched").default(0)
 
     val inLibrary = bool("in_library").default(false)
+    val defaultCategory = bool("default_category").default(true)
     val inLibraryAt = long("in_library_at").default(0)
 
     // the [source] field name is used by some ancestor of IntIdTable

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/PageTable.kt

@@ -8,12 +8,11 @@ package suwayomi.tachidesk.manga.model.table
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.ReferenceOption
 
 object PageTable : IntIdTable() {
     val index = integer("index")
     val url = varchar("url", 2048)
     val imageUrl = varchar("imageUrl", 2048).nullable()
 
-    val chapter = reference("chapter", ChapterTable, ReferenceOption.CASCADE)
+    val chapter = reference("chapter", ChapterTable)
 }

server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt

@@ -24,7 +24,6 @@ import org.kodein.di.DI
 import org.kodein.di.conf.global
 import org.kodein.di.instance
 import suwayomi.tachidesk.global.GlobalAPI
-import suwayomi.tachidesk.graphql.GraphQL
 import suwayomi.tachidesk.manga.MangaAPI
 import suwayomi.tachidesk.server.util.Browser
 import suwayomi.tachidesk.server.util.setupWebInterface
@@ -106,12 +105,9 @@ object JavalinSetup {
         }
 
         app.routes {
-            path("api/") {
-                path("v1/") {
-                    GlobalAPI.defineEndpoints()
-                    MangaAPI.defineEndpoints()
-                }
-                GraphQL.defineEndpoints()
+            path("api/v1/") {
+                GlobalAPI.defineEndpoints()
+                MangaAPI.defineEndpoints()
             }
         }
     }