0.1.0: Refactoring

.gitignore

@@ -1,23 +1,4 @@
-# Compiled class file
-*.class
+.idea
+.gradle
 
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+media

Dockerfile

@@ -15,7 +15,6 @@ FROM gradle:jdk8 AS build
 WORKDIR /app
 COPY --from=cache /app/gradle /home/gradle/.gradle
 COPY *.gradle.kts gradle.properties /app/
-COPY src/commonMain/ /app/src/commonMain/
 COPY src/jvmMain/ /app/src/jvmMain/
 # Stop printing Welcome
 RUN gradle -version > /dev/null \
@@ -24,6 +23,7 @@ RUN gradle -version > /dev/null \
 # Final Stage
 FROM openjdk:17-jdk-alpine
 COPY --from=build /app/build/libs/stella-all.jar /app/stella.jar
+COPY docs/ /app/docs/
 
 WORKDIR /app
 ENTRYPOINT ["java", "-jar", "/app/stella.jar"]

README.md

@@ -74,8 +74,7 @@ services:
       TWITTER_CS: xxx
       TWITTER_AT: xxx
       TWITTER_ATS: xxx
-      PIXIV_EMAIL: xxx
-      PIXIV_PASSWORD: xxx
+      PIXIV_REFRESH_TOKEN: xxx
       NIJIE_EMAIL: xxx
       NIJIE_PASSWORD: xxx
 

build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     kotlin("multiplatform") version "1.4.30"
+    kotlin("plugin.serialization") version "1.4.30"
     id("com.github.johnrengelman.shadow") version "6.1.0"
 
     id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
@@ -8,11 +9,10 @@ plugins {
 }
 
 object Versions {
-    const val Ktor = "1.5.1"
+    const val Ktor = "1.5.2"
     const val Penicillin = "6.0.5"
     const val KMongo = "4.2.3"
     const val Jsoup = "1.13.1"
-    const val CommonsLang = "3.8.1"
 
     const val JUnit = "5.7.0"
 
@@ -22,15 +22,15 @@ object Versions {
 }
 
 object Libraries {
-    const val Penicillin = "blue.starry:penicillin:${Versions.Penicillin}"
-
     const val KtorServerCIO = "io.ktor:ktor-server-cio:${Versions.Ktor}"
     const val KtorLocations = "io.ktor:ktor-locations:${Versions.Ktor}"
+    const val KtorSerialization = "io.ktor:ktor-serialization:${Versions.Ktor}"
     const val KtorClientCIO = "io.ktor:ktor-client-cio:${Versions.Ktor}"
+    const val KtorClientLogging = "io.ktor:ktor-client-logging:${Versions.Ktor}"
 
-    const val KMongoCoroutine = "org.litote.kmongo:kmongo-coroutine:${Versions.KMongo}"
-    const val CommonsLang3 = "org.apache.commons:commons-lang3:${Versions.CommonsLang}"
-
+    const val KMongoCoroutineSerialization = "org.litote.kmongo:kmongo-coroutine-serialization:${Versions.KMongo}"
+    const val KMongoIdSerialization = "org.litote.kmongo:kmongo-id-serialization:${Versions.KMongo}"
+    const val Penicillin = "blue.starry:penicillin:${Versions.Penicillin}"
     const val Jsoup = "org.jsoup:jsoup:${Versions.Jsoup}"
 
     const val KotlinLogging = "io.github.microutils:kotlin-logging:${Versions.KotlinLogging}"
@@ -48,13 +48,14 @@ object Libraries {
         "kotlin.time.ExperimentalTime",
         "kotlinx.coroutines.ExperimentalCoroutinesApi",
         "io.ktor.util.KtorExperimentalAPI",
-        "io.ktor.locations.KtorExperimentalLocationsAPI"
+        "io.ktor.locations.KtorExperimentalLocationsAPI",
+        "kotlinx.coroutines.FlowPreview"
     )
 }
 
 repositories {
     mavenCentral()
-    // jcenter()
+
     maven(url = "https://kotlin.bintray.com/kotlinx")
 }
 
@@ -70,6 +71,10 @@ kotlin {
 
     sourceSets {
         commonMain {
+            dependencies {
+                implementation(Libraries.Penicillin)
+                implementation(Libraries.KotlinLogging)
+            }
         }
         commonTest {
             dependencies {
@@ -80,20 +85,16 @@ kotlin {
 
         named("jvmMain") {
             dependencies {
-                implementation(kotlin("reflect"))
-
-                implementation(Libraries.Penicillin)
-
                 implementation(Libraries.KtorServerCIO)
                 implementation(Libraries.KtorLocations)
+                implementation(Libraries.KtorSerialization)
                 implementation(Libraries.KtorClientCIO)
+                implementation(Libraries.KtorClientLogging)
 
-                implementation(Libraries.KMongoCoroutine)
-                implementation(Libraries.CommonsLang3)
-
+                implementation(Libraries.KMongoCoroutineSerialization)
+                implementation(Libraries.KMongoIdSerialization)
                 implementation(Libraries.Jsoup)
 
-                implementation(Libraries.KotlinLogging)
                 implementation(Libraries.LogbackCore)
                 implementation(Libraries.LogbackClassic)
                 implementation(Libraries.Jansi)

docs/static/script.js

@@ -89,7 +89,7 @@
     };
 
     const App = {
-        mediaBaseUrl: "https://stella-api.starry.blue/media/",
+        mediaBaseUrl: "/api/media/",
         mobileWarningArea: document.getElementById("mobile-warning"),
         isMobile: navigator.userAgent.includes("iPhone OS") || navigator.userAgent.includes("Android") || navigator.userAgent.includes("Mobile"),
         countEntriesArea: document.getElementById("count-entries"),
@@ -104,15 +104,15 @@
                     parameters.count = 10;
                     const query = API.buildParameterString(parameters);
 
-                    return `https://stella-api.starry.blue/query${query !== null ? "?" + query : ""}`;
+                    return `/api/query${query !== null ? "?" + query : ""}`;
                 },
                 responseType: "text",
                 status: ".page-load-status",
                 history: false
             });
 
             App.infiniteScroll.on("load", response => {
-                JSON.parse(response).result.map(t => (new PicElementBuilder(t)).build());
+                JSON.parse(response).map(t => (new PicElementBuilder(t)).build());
 
                 const items = Container.element.querySelectorAll(".direction-reveal__card");
                 App.infiniteScroll.appendItems(items);
@@ -481,7 +481,7 @@
         createMediaItem() {
             const a = document.createElement("a");
             a.classList.add("direction-reveal__card", "media-item");
-            a.setAttribute("data-id", this.pic.id);
+            a.setAttribute("data-id", this.pic._id);
             return a;
         }
 
@@ -1153,7 +1153,7 @@
             this.pic.tags.push({user: null, locked: false, value: tagValue});
             this.tagCurrentResult.appendChild(this.createDeleteTagEach({user: null, locked: false, value: tagValue}));
 
-            for (const element of Array.from(Container.element.querySelectorAll(`a.media-item[data-id="${this.pic.id}"] .overlay-tags`))) {
+            for (const element of Array.from(Container.element.querySelectorAll(`a.media-item[data-id="${this.pic._id}"] .overlay-tags`))) {
                 element.insertBefore(PicOverlayBuilder.createTagEach({user: null, locked: false, value: tagValue}), element.lastChild);
             }
 
@@ -1164,7 +1164,7 @@
             this.pic.tags = this.pic.tags.filter(e => e.value !== tagValue);
             this.tagRelationalResult.appendChild(this.createAddTagEach(tagValue));
 
-            for (const element of Array.from(Container.element.querySelector(`a.media-item[data-id="${this.pic.id}"] a[data-tag=\"${tagValue}\"]`))) {
+            for (const element of Array.from(Container.element.querySelector(`a.media-item[data-id="${this.pic._id}"] a[data-tag=\"${tagValue}\"]`))) {
                 element.remove();
             }
 
@@ -1215,15 +1215,11 @@
             return new Promise((resolve, reject) => {
                 const xhr = new XMLHttpRequest();
                 const query = API.buildParameterString(params);
-                xhr.open(method, `https://stella-api.starry.blue${path}${query !== null ? "?" + query : ""}`, true);
+                xhr.open(method, `/api${path}${query !== null ? "?" + query : ""}`, true);
                 xhr.onload = () => {
                     try {
                         const json = JSON.parse(xhr.responseText);
-                        if (json.success && xhr.status === 200) {
-                            resolve(json.result);
-                        } else {
-                            reject(new Error(json.error));
-                        }
+                        resolve(json);
                     } catch (e) {
                         reject(e);
                     }
@@ -1252,12 +1248,12 @@
             }).map(value => `${encodeURIComponent(value[0])}=${encodeURIComponent(value[1])}`).join("&");
         },
         summary: () => API.asyncRequest("GET", "/summary", null, null),
-        refreshEntry: pic => API.asyncRequest("PUT", `/refresh/${pic.id}`, null, null),
-        addTag: (pic, tag) => API.asyncRequest("PUT", `/edit/${pic.id}/tag`, null, {tag: tag}),
-        deleteTag: (pic, tag) => API.asyncRequest("DELETE", `/edit/${pic.id}/tag`, null, {tag: tag}),
-        updateSensitiveLevel: (pic, level) => API.asyncRequest("PATCH", `/edit/${pic.id}/sensitive_level`, null, {sensitive_level: level}),
-        relationalTags: pic => API.asyncRequest("GET", "/query/tags", {id: pic.id, sensitive_level: pic.sensitive_level, count: 20}, null),
-        searchTags: (pic, name) => API.asyncRequest("GET", "/query/tags", {id: pic.id, name: name, sensitive_level: pic.sensitive_level, count: 30}, null)
+        refreshEntry: pic => API.asyncRequest("PUT", `/pic/${pic._id}/refresh`, null, null),
+        addTag: (pic, tag) => API.asyncRequest("PUT", `/pic/${pic._id}/tag`, null, {tag: tag}),
+        deleteTag: (pic, tag) => API.asyncRequest("DELETE", `/pic/${pic._id}/tag`, null, {tag: tag}),
+        updateSensitiveLevel: (pic, level) => API.asyncRequest("PATCH", `/pic/${pic._id}/sensitive_level`, null, {sensitive_level: level}),
+        relationalTags: pic => API.asyncRequest("GET", "/query/tags", {id: pic._id, sensitive_level: pic.sensitive_level, count: 20}, null),
+        searchTags: (pic, name) => API.asyncRequest("GET", "/query/tags", {id: pic._id, name: name, sensitive_level: pic.sensitive_level, count: 30}, null)
     };
 
     if (App.isMobile) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Thu Jul 16 01:27:03 JST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists