Merge pull request #236 from dev-ritik/avatar_realtime_api

[NEW] Add support to fetch avatar realtime

Author: philipbrito

common/src/main/kotlin/chat/rocket/common/model/BaseUser.kt

@@ -39,4 +39,31 @@ fun userStatusOf(status: String): UserStatus {
         "offline" -> UserStatus.Offline()
         else -> UserStatus.Unknown(status)
     }
-}
+}
+
+@FallbackSealedClass(name = "Unknown", fieldName = "rawAvatar")
+sealed class UserAvatar {
+    @Json(name = "upload")
+    class Upload : chat.rocket.common.model.UserAvatar()
+    @Json(name = "url")
+    class Url : chat.rocket.common.model.UserAvatar()
+    class Cleared : chat.rocket.common.model.UserAvatar()
+    class Unknown(val rawAvatar: String) : UserAvatar()
+
+    override fun toString(): String {
+        return when (this) {
+            is Upload -> "upload"
+            is Url -> "url"
+            else -> "cleared"
+        }
+    }
+}
+
+fun userAvatarOf(avatar: String): UserAvatar {
+    return when(avatar) {
+        "upload" -> UserAvatar.Upload()
+        "url" -> UserAvatar.Url()
+        "cleared" -> UserAvatar.Cleared()
+        else -> UserAvatar.Unknown(avatar)
+    }
+}

core/src/main/kotlin/chat/rocket/core/internal/realtime/socket/message/collection/Users.kt

@@ -1,5 +1,6 @@
 package chat.rocket.core.internal.realtime.socket.message.collection
 
+import chat.rocket.common.model.*
 import chat.rocket.common.model.User
 import chat.rocket.core.internal.realtime.socket.Socket
 import chat.rocket.core.model.Myself
@@ -32,11 +33,25 @@ internal fun Socket.processUserStream(text: String) {
 @ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
 private fun Socket.processUserDataStream(json: JSONObject, id: String) {
-    val fields = json.optJSONObject("fields")
-    fields.put("_id", id)
+    var fields:JSONObject? = JSONObject()
+
+    if(json.has("fields")){
+        fields = json.optJSONObject("fields")
+    }else if(json.has("cleared")){
+        val cleared = json.optJSONArray("cleared")
+
+        for (i in 0..(cleared.length() - 1)) {
+            if (cleared.get(i) == "avatarOrigin"){
+                fields?.put("avatarOrigin", userAvatarOf("cleared"))
+                break
+            }
+        }
+    }
+    fields?.put("_id", id)
 
     val adapter = moshi.adapter<Myself>(Myself::class.java)
     val myself = adapter.fromJson(fields.toString())
+
     myself?.let {
         if (!parentJob.isActive) {
             logger.debug { "Parent job: $parentJob" }

core/src/main/kotlin/chat/rocket/core/model/Myself.kt

@@ -2,6 +2,7 @@ package chat.rocket.core.model
 
 import chat.rocket.common.model.BaseUser
 import chat.rocket.common.model.UserStatus
+import chat.rocket.common.model.UserAvatar
 import com.squareup.moshi.Json
 import se.ansman.kotshi.JsonSerializable
 
@@ -14,6 +15,7 @@ data class Myself(
     val status: UserStatus?,
     val statusConnection: UserStatus?,
     val statusDefault: UserStatus?,
+    val avatarOrigin: UserAvatar?,
     val utcOffset: Float?,
     val emails: List<Email>?,
     val roles: List<String>?