From 8ec8889e151cc9b12de437adeee93e7ed8ea6859 Mon Sep 17 00:00:00 2001 From: Wizard Date: Sat, 24 Aug 2024 12:07:58 -0400 Subject: [PATCH 1/4] chore: change `guideUrl` to nullable type --- .../org/retroachivements/api/data/pojo/game/GetGameExtended.kt | 2 +- .../api/data/pojo/game/GetGameInfoAndUserProgress.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameExtended.kt b/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameExtended.kt index 8b8eb8c..c8a823e 100644 --- a/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameExtended.kt +++ b/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameExtended.kt @@ -63,7 +63,7 @@ class GetGameExtended { val pointsTotal: Long, @SerializedName("GuideUrl") - val guideUrl: String, + val guideUrl: String?, @SerializedName("Updated") val updated: String, diff --git a/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameInfoAndUserProgress.kt b/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameInfoAndUserProgress.kt index 169cea3..da4edb1 100644 --- a/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameInfoAndUserProgress.kt +++ b/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameInfoAndUserProgress.kt @@ -54,7 +54,7 @@ class GetGameInfoAndUserProgress { val playersTotal: Int, @SerializedName("GuideUrl") - val guideUrl: String, + val guideUrl: String?, @SerializedName("ConsoleName") val consoleName: String, From c930b9baffef6ad413ed2b18a5d8426114a7a60b Mon Sep 17 00:00:00 2001 From: Wizard Date: Sat, 24 Aug 2024 12:10:25 -0400 Subject: [PATCH 2/4] version change --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a248902..6898161 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.retroachievements api-kotlin - 1.0.8 + 1.0.9 From 74a2a56d0b173d1f0ce350809bd7172f8217e5ba Mon Sep 17 00:00:00 2001 From: Wizard Date: Sat, 24 Aug 2024 12:16:26 -0400 Subject: [PATCH 3/4] chore: fix nullables --- src/main/kotlin/org/retroachivements/api/RetroInterface.kt | 2 +- .../retroachivements/api/data/pojo/game/GetGameExtended.kt | 2 +- .../api/data/pojo/ticket/GetMostRecentTickets.kt | 4 ++-- .../retroachivements/api/data/pojo/ticket/GetTicketData.kt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/org/retroachivements/api/RetroInterface.kt b/src/main/kotlin/org/retroachivements/api/RetroInterface.kt index ca73a03..9252e09 100644 --- a/src/main/kotlin/org/retroachivements/api/RetroInterface.kt +++ b/src/main/kotlin/org/retroachivements/api/RetroInterface.kt @@ -136,7 +136,7 @@ interface RetroInterface { @POST("/API/API_GetUserProgress.php") suspend fun getUserProgress( @Query("u") username: String, - @Query("i") gameId: Long + @Query("i") gameId: String ): NetworkResponse /** diff --git a/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameExtended.kt b/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameExtended.kt index c8a823e..3096988 100644 --- a/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameExtended.kt +++ b/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameExtended.kt @@ -72,7 +72,7 @@ class GetGameExtended { val consoleName: String, @SerializedName("ParentGameID") - val parentGameId: String, + val parentGameId: String?, @SerializedName("NumDistinctPlayers") val numDistinctPlayers: Long, diff --git a/src/main/kotlin/org/retroachivements/api/data/pojo/ticket/GetMostRecentTickets.kt b/src/main/kotlin/org/retroachivements/api/data/pojo/ticket/GetMostRecentTickets.kt index 2b8f77d..8acae07 100644 --- a/src/main/kotlin/org/retroachivements/api/data/pojo/ticket/GetMostRecentTickets.kt +++ b/src/main/kotlin/org/retroachivements/api/data/pojo/ticket/GetMostRecentTickets.kt @@ -70,10 +70,10 @@ class GetMostRecentTickets { val reportedBy: String, @SerializedName("ResolvedAt") - val resolvedAt: String, + val resolvedAt: String?, @SerializedName("ResolvedBy") - val resolvedBy: String, + val resolvedBy: String?, @SerializedName("ReportStateDescription") val reportStateDescription: String, diff --git a/src/main/kotlin/org/retroachivements/api/data/pojo/ticket/GetTicketData.kt b/src/main/kotlin/org/retroachivements/api/data/pojo/ticket/GetTicketData.kt index 81bfae4..28d7904 100644 --- a/src/main/kotlin/org/retroachivements/api/data/pojo/ticket/GetTicketData.kt +++ b/src/main/kotlin/org/retroachivements/api/data/pojo/ticket/GetTicketData.kt @@ -60,10 +60,10 @@ class GetTicketData { val reportedBy: String, @SerializedName("ResolvedAt") - val resolvedAt: String, + val resolvedAt: String?, @SerializedName("ResolvedBy") - val resolvedBy: String, + val resolvedBy: String?, @SerializedName("ReportStateDescription") val reportStateDescription: String, From c4699ddeda1e47447bfbbc1390c00c7b4cb83a47 Mon Sep 17 00:00:00 2001 From: Wizard Date: Sat, 24 Aug 2024 12:29:57 -0400 Subject: [PATCH 4/4] chore: fix nullables --- .../api/data/pojo/game/GetGameInfoAndUserProgress.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameInfoAndUserProgress.kt b/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameInfoAndUserProgress.kt index da4edb1..e4368da 100644 --- a/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameInfoAndUserProgress.kt +++ b/src/main/kotlin/org/retroachivements/api/data/pojo/game/GetGameInfoAndUserProgress.kt @@ -130,7 +130,7 @@ class GetGameInfoAndUserProgress { val memAddr: String, @SerializedName("Type") - val type: String, + val type: String?, @SerializedName("DateEarnedHardcore") val dateEarnedHardcore: String?,