release 1.9.2: convert from java to kotlin (some source code)

- apply ktlint

.editorconfig

@@ -0,0 +1,2 @@
+[*.{kt, kts}]
+disabled_rules = no-wildcard-imports

README.md

@@ -8,7 +8,7 @@
 ### Gradle
 
 ```gradle
-compile 'be.zvz:KotlinInside:1.9.1'
+compile 'be.zvz:KotlinInside:1.9.2'
 ```
 
 ### Maven
@@ -17,7 +17,7 @@ compile 'be.zvz:KotlinInside:1.9.1'
 <dependency>
   <groupId>be.zvz</groupId>
   <artifactId>KotlinInside</artifactId>
-  <version>1.9.1</version>
+  <version>1.9.2</version>
 </dependency>
 ```
 

build.gradle

@@ -1,15 +1,18 @@
+import org.jmailen.gradle.kotlinter.tasks.*
+
 plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm' version '1.5.10'
     id 'org.jetbrains.dokka' version '1.4.32'
     id 'maven-publish'
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
     id 'signing'
+    id 'org.jmailen.kotlinter' version '3.4.5'
 }
 
 def libName = 'KotlinInside'
 def libDevVersion = ''
-def libVersion = "1.9.1$libDevVersion"
+def libVersion = "1.9.2$libDevVersion"
 def libDesc = 'Unofficial DCInside API written in Kotlin'
 
 group = 'be.zvz'
@@ -88,6 +91,16 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource
 }
 
+task ktLint(type: LintTask, group: 'verification') {
+    source files('src')
+}
+
+task ktFormat(type: FormatTask, group: 'formatting') {
+    source files('src')
+    report = file('build/format-report.txt')
+    disabledRules = ["import-ordering"]
+}
+
 signing {
     useGpgCmd()
     sign publishing.publications

src/main/kotlin/be/zvz/kotlininside/KotlinInside.kt

@@ -26,18 +26,21 @@ class KotlinInside private constructor(
         if (sessionAutoRefresh) {
             val timer = Timer()
 
-            timer.schedule(object : TimerTask() {
-                override fun run() {
-                    if (user is LoginUser) {
-                        synchronized(instance) {
-                            instance.hashedAppKey = instance.auth.generateHashedAppKey()
-                            instance.app =
-                                App(instance.hashedAppKey, instance.auth.fetchAppId(getInstance().hashedAppKey))
-                            instance.session = instance.auth.login(user)
+            timer.schedule(
+                object : TimerTask() {
+                    override fun run() {
+                        if (user is LoginUser) {
+                            synchronized(instance) {
+                                instance.hashedAppKey = instance.auth.generateHashedAppKey()
+                                instance.app =
+                                    App(instance.hashedAppKey, instance.auth.fetchAppId(getInstance().hashedAppKey))
+                                instance.session = instance.auth.login(user)
+                            }
                         }
                     }
-                }
-            }, 43200 * 1000, 43200 * 1000)
+                },
+                43200 * 1000, 43200 * 1000
+            )
         }
     }
 
@@ -69,5 +72,4 @@ class KotlinInside private constructor(
             return instance
         }
     }
-
 }

src/main/kotlin/be/zvz/kotlininside/api/article/ArticleList.kt

@@ -120,24 +120,24 @@ class ArticleList @JvmOverloads constructor(
     @Throws(HttpException::class)
     fun request() {
         val url = "${ApiUrl.Article.LIST}?id=$gallId&page=$page&app_id=${KotlinInside.getInstance().auth.getAppId()}" +
-                StringBuilder().apply {
-                    if (searchKeyword.isNotEmpty()) {
-                        append("&s_type=")
-                        append(searchType.type)
-                        append("&serVal=").append(URLEncoder.encode(searchKeyword, "UTF-8").replace("+", "%20"))
-                    }
-                    if (recommend)
-                        append("&recommend=1")
-                    if (notice)
-                        append("&notice=1")
-                    if (headId > 0)
-                        append("&headid=").append(headId)
-                    session?.let {
-                        if (it.user !is Anonymous) {
-                            append("&confirm_id=").append(it.detail!!.userId)
-                        }
+            StringBuilder().apply {
+                if (searchKeyword.isNotEmpty()) {
+                    append("&s_type=")
+                    append(searchType.type)
+                    append("&serVal=").append(URLEncoder.encode(searchKeyword, "UTF-8").replace("+", "%20"))
+                }
+                if (recommend)
+                    append("&recommend=1")
+                if (notice)
+                    append("&notice=1")
+                if (headId > 0)
+                    append("&headid=").append(headId)
+                session?.let {
+                    if (it.user !is Anonymous) {
+                        append("&confirm_id=").append(it.detail!!.userId)
                     }
-                }.toString()
+                }
+            }.toString()
         json = KotlinInside.getInstance().httpInterface.get(Request.redirectUrl(url), Request.getDefaultOption())!!
     }
 

src/main/kotlin/be/zvz/kotlininside/api/article/ArticleModify.kt

@@ -14,7 +14,6 @@ import org.apache.commons.text.StringEscapeUtils
 import java.io.BufferedInputStream
 import java.net.URL
 
-
 class ArticleModify(
     private val gallId: String,
     private val articleId: Int,
@@ -154,4 +153,4 @@ class ArticleModify(
 
         return articleWrite.write()
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/article/ArticleRead.kt

@@ -69,13 +69,13 @@ class ArticleRead @JvmOverloads constructor(
     fun request() {
         val url =
             "${ApiUrl.Article.READ}?id=$gallId&no=$articleId&app_id=${KotlinInside.getInstance().auth.getAppId()}" +
-                    StringBuilder().apply {
-                        session?.let {
-                            if (it.user !is Anonymous) {
-                                append("&confirm_id=").append(it.detail!!.userId)
-                            }
+                StringBuilder().apply {
+                    session?.let {
+                        if (it.user !is Anonymous) {
+                            append("&confirm_id=").append(it.detail!!.userId)
                         }
-                    }.toString()
+                    }
+                }.toString()
 
         json = KotlinInside.getInstance().httpInterface.get(Request.redirectUrl(url), Request.getDefaultOption())!!
     }

src/main/kotlin/be/zvz/kotlininside/api/article/ArticleWrite.kt

@@ -99,7 +99,6 @@ class ArticleWrite internal constructor(
             option
         )!!.index(0)
 
-
         return WriteResult(
             result = json.get("result").asBoolean(),
             articleId = json.get("cause").asNullableInteger(),

src/main/kotlin/be/zvz/kotlininside/api/async/article/AsyncArticleDelete.kt

@@ -20,4 +20,4 @@ class AsyncArticleDelete @JvmOverloads constructor(
             articleDelete.delete()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/article/AsyncArticleHitUpvote.kt

@@ -18,4 +18,4 @@ class AsyncArticleHitUpvote(
             articleHitUpvote.upvote()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/article/AsyncArticleList.kt

@@ -82,4 +82,4 @@ class AsyncArticleList @JvmOverloads constructor(
             articleList.getGallList()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/article/AsyncArticleModify.kt

@@ -25,4 +25,4 @@ class AsyncArticleModify(
             articleModify.modify(article, fcmToken)
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/article/AsyncArticleRead.kt

@@ -30,4 +30,4 @@ class AsyncArticleRead @JvmOverloads constructor(
             articleRead.getViewMain()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/article/AsyncArticleReport.kt

@@ -18,4 +18,4 @@ class AsyncArticleReport(
             articleReport.getLink()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/article/AsyncArticleVote.kt

@@ -24,4 +24,4 @@ class AsyncArticleVote(
             articleVote.downvote()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/article/AsyncArticleWrite.kt

@@ -21,4 +21,4 @@ class AsyncArticleWrite @JvmOverloads constructor(
             articleWrite.write()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/comment/AsyncCommentDelete.kt

@@ -21,4 +21,4 @@ class AsyncCommentDelete @JvmOverloads constructor(
             commentDelete.delete()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/comment/AsyncCommentRead.kt

@@ -17,4 +17,4 @@ class AsyncCommentRead(
             commentRead.request()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/comment/AsyncCommentWrite.kt

@@ -28,4 +28,4 @@ class AsyncCommentWrite @JvmOverloads constructor(
             commentWrite.reply(commentId)
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/dccon/AsyncDCConBuy.kt

@@ -18,4 +18,4 @@ class AsyncDCConBuy(
             dcConBuy.buy()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/dccon/AsyncDCConDetail.kt

@@ -16,4 +16,4 @@ class AsyncDCConDetail(
             dcConDetail.request()
         }
     }
-}
+}

src/main/kotlin/be/zvz/kotlininside/api/async/dccon/AsyncDCConList.kt

@@ -16,4 +16,4 @@ class AsyncDCConList(
             dcConList.request()
         }
     }
-}
+}