Fix nullability of Unit returning endpoints and the send message endpoint

Author: rubengees

library/src/main/kotlin/me/proxer/library/KotlinExtensions.kt

@@ -18,9 +18,21 @@ suspend fun <T : Any> ProxerCall<T>.await(): T {
                     continuation.resumeWithException(NullPointerException())
                 }
             },
-            { error ->
-                continuation.resumeWithException(error)
-            }
+            { error -> continuation.resumeWithException(error) }
+        )
+    }
+}
+
+@JvmName("awaitNullable")
+suspend fun <T : Any> ProxerCall<T?>.await(): T? {
+    return suspendCancellableCoroutine { continuation ->
+        continuation.invokeOnCancellation {
+            cancel()
+        }
+
+        enqueue(
+            { result -> continuation.resume(result) },
+            { error -> continuation.resumeWithException(error) }
         )
     }
 }

library/src/main/kotlin/me/proxer/library/api/apps/ErrorLogEndpoint.kt

@@ -12,7 +12,7 @@ class ErrorLogEndpoint internal constructor(
     private val internalApi: InternalApi,
     private val id: String,
     private val message: String
-) : Endpoint<Unit> {
+) : Endpoint<Unit?> {
 
     private var anonym: Boolean? = null
     private var silent: Boolean? = null
@@ -27,7 +27,7 @@ class ErrorLogEndpoint internal constructor(
      */
     fun silent(silent: Boolean? = true) = this.apply { this.silent = silent }
 
-    override fun build(): ProxerCall<Unit> {
+    override fun build(): ProxerCall<Unit?> {
         return internalApi.errorLog(id, message, anonym, silent)
     }
 }

library/src/main/kotlin/me/proxer/library/api/apps/InternalApi.kt

@@ -17,5 +17,5 @@ internal interface InternalApi {
         @Field("message") message: String?,
         @Field("anonym") anonym: Boolean?,
         @Field("silent") silent: Boolean?
-    ): ProxerCall<Unit>
+    ): ProxerCall<Unit?>
 }

library/src/main/kotlin/me/proxer/library/api/chat/InternalApi.kt

@@ -39,7 +39,7 @@ internal interface InternalApi {
     fun reportMessage(
         @Field("message_id") messageId: String?,
         @Field("message") message: String?
-    ): ProxerCall<Unit>
+    ): ProxerCall<Unit?>
 
     @GET("chat/roomusers")
     fun roomUsers(@Query("room_id") roomId: String?): ProxerCall<List<ChatRoomUser>>

library/src/main/kotlin/me/proxer/library/api/chat/ReportChatMessageEndpoint.kt

@@ -12,9 +12,9 @@ class ReportChatMessageEndpoint internal constructor(
     private val internalApi: InternalApi,
     private val messageId: String,
     private val message: String
-) : Endpoint<Unit> {
+) : Endpoint<Unit?> {
 
-    override fun build(): ProxerCall<Unit> {
+    override fun build(): ProxerCall<Unit?> {
         return internalApi.reportMessage(messageId, message)
     }
 }

library/src/main/kotlin/me/proxer/library/api/comment/InternalApi.kt

@@ -27,7 +27,7 @@ internal interface InternalApi {
         @Field("episode") episode: Int?,
         @Field("state") state: Int?,
         @Field("comment") comment: String?
-    ): ProxerCall<Unit>
+    ): ProxerCall<Unit?>
 
     @FormUrlEncoded
     @POST("comment/update")
@@ -37,5 +37,5 @@ internal interface InternalApi {
         @Field("episode") episode: Int?,
         @Field("state") state: Int?,
         @Field("comment") comment: String?
-    ): ProxerCall<Unit>
+    ): ProxerCall<Unit?>
 }

library/src/main/kotlin/me/proxer/library/api/comment/UpdateCommentEndpoint.kt

@@ -24,7 +24,7 @@ class UpdateCommentEndpoint internal constructor(
     private val internalApi: InternalApi,
     private val id: String?,
     private val entryId: String?
-) : Endpoint<Unit> {
+) : Endpoint<Unit?> {
 
     private var rating: Int? = null
     private var episode: Int? = null
@@ -69,7 +69,7 @@ class UpdateCommentEndpoint internal constructor(
         return this.apply { this.comment = comment }
     }
 
-    override fun build(): ProxerCall<Unit> {
+    override fun build(): ProxerCall<Unit?> {
         val apiMediaProgress = mediaProgress?.let { ProxerUtils.getSafeApiEnumName(it).toInt() }
 
         return when {

library/src/main/kotlin/me/proxer/library/api/info/InternalApi.kt

@@ -62,7 +62,7 @@ internal interface InternalApi {
     fun modifyUserInfo(
         @Field("id") id: String?,
         @Field("type") type: UserInfoType?
-    ): ProxerCall<Unit>
+    ): ProxerCall<Unit?>
 
     @GET("info/recommendations")
     fun recommendations(@Query("id") id: String?): ProxerCall<List<Recommendation>>

library/src/main/kotlin/me/proxer/library/api/info/ModifyUserInfoEndpoint.kt

@@ -12,9 +12,9 @@ class ModifyUserInfoEndpoint internal constructor(
     private val internalApi: InternalApi,
     private val id: String,
     private val type: UserInfoType
-) : Endpoint<Unit> {
+) : Endpoint<Unit?> {
 
-    override fun build(): ProxerCall<Unit> {
+    override fun build(): ProxerCall<Unit?> {
         return internalApi.modifyUserInfo(id, type)
     }
 }

library/src/main/kotlin/me/proxer/library/api/messenger/ConferenceModificationEndpoint.kt

@@ -26,9 +26,9 @@ class ConferenceModificationEndpoint internal constructor(
     private val internalApi: InternalApi,
     private val id: String,
     private val modification: ConferenceModification
-) : Endpoint<Unit> {
+) : Endpoint<Unit?> {
 
-    override fun build(): ProxerCall<Unit> {
+    override fun build(): ProxerCall<Unit?> {
         return when (modification) {
             READ -> internalApi.markConferenceAsRead(id)
             UNREAD -> internalApi.unmarkConferenceAsRead(id)