Update datatype V0.19 (#11)

MV-GH · Dec 15, 2023 · 161c575 · 161c575
1 parent 900323d
commit 161c575
Show file tree

Hide file tree

Showing 20 changed files with 18 additions and 38 deletions.
diff --git a/GeneratorScripts/src/main/kotlin/autogenscripts/GenTypes.kt b/GeneratorScripts/src/main/kotlin/autogenscripts/GenTypes.kt
@@ -21,7 +21,7 @@ fun getTypesPath(
     temp: Boolean = true,
 ) = "$ROOT_PATH$ROOT_PACKAGE_PATH$version/datatypes" + if (temp) "/temp" else ""
 
-fun isInteger(_l: String) = true
+fun isInteger(@Suppress("UNUSED_PARAMETER") _l: String) = true
 
 fun getDownloadLink(tag: String) = "https://github.com/LemmyNet/lemmy-js-client/archive/refs/tags/$tag.zip"
 
@@ -41,6 +41,10 @@ suspend fun downloadTypes(
         .copyAndClose(lemmyJsClient.writeChannel())
 
     val dest = File(getTypesPath(vShort))
+
+    for (typeFile in dest.listFiles() ?: emptyArray<File>()) {
+        typeFile.delete()
+    }
     dest.mkdirs()
 
     withContext(Dispatchers.IO) {
@@ -79,7 +83,7 @@ suspend fun downloadTypes(
         println(String(proc.inputStream.readAllBytes()))
 
         for (typeFile in datatypes.listFiles()!!) {
-            if (typeFile.name.startsWith("lib")) {
+            if (typeFile.name.startsWith("lib") || !typeFile.name.contains("module")) {
                 typeFile.delete()
             } else if (typeFile.name.endsWith(".kt") && typeFile.isFile()) {
                 val fileName = typeFile.name.substringBefore(".")
@@ -217,5 +221,5 @@ suspend fun downloadTypes(
 }
 
 suspend fun main() {
-    downloadTypes("0.19.0-rc.14", "v0x19")
+    downloadTypes("0.19.0", "v0x19")
 }
diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/Constants.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/Constants.kt
@@ -11,7 +11,7 @@ const val TIMEOUT_MS = 20000L
 // TODO think about this
 val ktorJson =
     Json {
-        // ignoreUnknownKeys = true
+        ignoreUnknownKeys = true
     }
 
 val lenientJson =

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x18/Transformer.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x18/Transformer.kt
@@ -802,7 +802,6 @@ internal class Transformer(var auth: String) : DatatypesMapper {
 
     override fun toV0x19(d: V0x18DatatypesCustomEmojiKeyword): V0x19DatatypesCustomEmojiKeyword =
         it.vercruysse.lemmyapi.v0x19.datatypes.CustomEmojiKeyword(
-            id = d.id,
             custom_emoji_id = d.custom_emoji_id,
             keyword = d.keyword,
         )

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/CommunityBlockId.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/CommunityBlockId.kt
diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/CreateSite.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/CreateSite.kt
@@ -1,7 +1,7 @@
 package it.vercruysse.lemmyapi.v0x19.datatypes
 
-import it.vercruysse.lemmyapi.dto.ListingType
 import it.vercruysse.lemmyapi.dto.RegistrationMode
+import it.vercruysse.lemmyapi.dto.ListingType
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/CustomEmojiKeyword.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/CustomEmojiKeyword.kt
@@ -4,7 +4,6 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class CustomEmojiKeyword(
-    val id: Int,
     val custom_emoji_id: CustomEmojiId,
     val keyword: String,
 )
diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/EditSite.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/EditSite.kt
@@ -1,7 +1,7 @@
 package it.vercruysse.lemmyapi.v0x19.datatypes
 
-import it.vercruysse.lemmyapi.dto.ListingType
 import it.vercruysse.lemmyapi.dto.RegistrationMode
+import it.vercruysse.lemmyapi.dto.ListingType
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/GetPosts.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/GetPosts.kt
@@ -1,7 +1,7 @@
 package it.vercruysse.lemmyapi.v0x19.datatypes
 
-import it.vercruysse.lemmyapi.dto.ListingType
 import it.vercruysse.lemmyapi.dto.SortType
+import it.vercruysse.lemmyapi.dto.ListingType
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/ImageUpload.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/ImageUpload.kt
diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/ImageUploadId.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/ImageUploadId.kt
diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/ListCommunities.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/ListCommunities.kt
@@ -1,7 +1,7 @@
 package it.vercruysse.lemmyapi.v0x19.datatypes
 
-import it.vercruysse.lemmyapi.dto.ListingType
 import it.vercruysse.lemmyapi.dto.SortType
+import it.vercruysse.lemmyapi.dto.ListingType
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/LocalSite.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/LocalSite.kt
@@ -1,7 +1,7 @@
 package it.vercruysse.lemmyapi.v0x19.datatypes
 
-import it.vercruysse.lemmyapi.dto.ListingType
 import it.vercruysse.lemmyapi.dto.RegistrationMode
+import it.vercruysse.lemmyapi.dto.ListingType
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/LocalUser.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/LocalUser.kt
@@ -1,7 +1,7 @@
 package it.vercruysse.lemmyapi.v0x19.datatypes
 
-import it.vercruysse.lemmyapi.dto.ListingType
 import it.vercruysse.lemmyapi.dto.PostListingMode
+import it.vercruysse.lemmyapi.dto.ListingType
 import it.vercruysse.lemmyapi.dto.SortType
 import kotlinx.serialization.Serializable
 

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/LocalUserView.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/LocalUserView.kt
@@ -7,5 +7,4 @@ data class LocalUserView(
     val local_user: LocalUser,
     val person: Person,
     val counts: PersonAggregates,
-
 )
diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/LoginToken.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/LoginToken.kt
@@ -4,7 +4,6 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class LoginToken(
-    val id: Int,
     val user_id: LocalUserId,
     val published: String,
     val ip: String? = null,

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/ReadableFederationState.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/ReadableFederationState.kt
@@ -2,13 +2,12 @@ package it.vercruysse.lemmyapi.v0x19.datatypes
 
 import kotlinx.serialization.Serializable
 
-
 @Serializable
 data class ReadableFederationState(
     val instance_id: InstanceId,
     val last_successful_id: ActivityId? = null,
     val last_successful_published_time: String? = null,
-    val fail_count: Long,
+    val fail_count: Int,
     val last_retry: String? = null,
     val next_retry: String? = null,
 )
diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/Register.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/Register.kt
@@ -13,5 +13,4 @@ data class Register(
     val captcha_answer: String? = null,
     val honeypot: String? = null,
     val answer: String? = null,
-    val collapse_bot_comments: Boolean? = null,
 )
diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/SaveUserSettings.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/SaveUserSettings.kt
@@ -1,7 +1,7 @@
 package it.vercruysse.lemmyapi.v0x19.datatypes
 
-import it.vercruysse.lemmyapi.dto.ListingType
 import it.vercruysse.lemmyapi.dto.PostListingMode
+import it.vercruysse.lemmyapi.dto.ListingType
 import it.vercruysse.lemmyapi.dto.SortType
 import kotlinx.serialization.Serializable
 

diff --git a/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/Search.kt b/app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0x19/datatypes/Search.kt
@@ -1,8 +1,8 @@
 package it.vercruysse.lemmyapi.v0x19.datatypes
 
 import it.vercruysse.lemmyapi.dto.ListingType
-import it.vercruysse.lemmyapi.dto.SearchType
 import it.vercruysse.lemmyapi.dto.SortType
+import it.vercruysse.lemmyapi.dto.SearchType
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ POM_DEVELOPER_URL=https://github.com/MV-GH
 
 POM_ARTIFACT_ID=lemmy-api
 GROUP=it.vercruysse.lemmyapi
-VERSION_NAME=0.1.0-SNAPSHOT
+VERSION_NAME=0.2.0-SNAPSHOT