diff --git a/app/src/main/java/chat/revolt/api/realtime/RealtimeSocket.kt b/app/src/main/java/chat/revolt/api/realtime/RealtimeSocket.kt index 064c8fb0..c31dd0c6 100644 --- a/app/src/main/java/chat/revolt/api/realtime/RealtimeSocket.kt +++ b/app/src/main/java/chat/revolt/api/realtime/RealtimeSocket.kt @@ -454,11 +454,11 @@ object RealtimeSocket { if (existing == null && userRelationshipFrame.user.id != null) { RevoltAPI.userCache[userRelationshipFrame.user.id] = userRelationshipFrame.user.copy( - relationship = userRelationshipFrame.status + relationship = userRelationshipFrame.status ?: "None" ) } else if (existing != null && userRelationshipFrame.user.id != null) { val merged = existing.mergeWithPartial(userRelationshipFrame.user).copy( - relationship = userRelationshipFrame.status + relationship = userRelationshipFrame.status ?: "None" ) RevoltAPI.userCache[userRelationshipFrame.user.id] = merged } else { diff --git a/app/src/main/java/chat/revolt/api/realtime/frames/receivable/ReceivableFrames.kt b/app/src/main/java/chat/revolt/api/realtime/frames/receivable/ReceivableFrames.kt index 359dc774..ad822047 100644 --- a/app/src/main/java/chat/revolt/api/realtime/frames/receivable/ReceivableFrames.kt +++ b/app/src/main/java/chat/revolt/api/realtime/frames/receivable/ReceivableFrames.kt @@ -1,6 +1,14 @@ package chat.revolt.api.realtime.frames.receivable -import chat.revolt.api.schemas.* +import chat.revolt.api.schemas.Channel +import chat.revolt.api.schemas.Embed +import chat.revolt.api.schemas.Emoji +import chat.revolt.api.schemas.Member +import chat.revolt.api.schemas.Message +import chat.revolt.api.schemas.Role +import chat.revolt.api.schemas.Server +import chat.revolt.api.schemas.ServerUserChoice +import chat.revolt.api.schemas.User import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonObject @@ -222,7 +230,7 @@ data class UserRelationshipFrame( val type: String = "UserRelationship", val id: String, val user: User, - val status: String + val status: String? = null ) typealias EmojiCreateFrame = Emoji