fix: stabler reconnect, fix message reporting

app/src/main/java/chat/revolt/api/realtime/RealtimeSocket.kt

@@ -33,6 +33,13 @@ object RealtimeSocket {
     }
 
     suspend fun connect(token: String) {
+        if (disconnectionState == DisconnectionState.Connected) {
+            Log.d("RealtimeSocket", "Already connected to websocket. Refusing to connect again.")
+            return
+        }
+        
+        socket?.close(CloseReason(CloseReason.Codes.NORMAL, "Reconnecting to websocket."))
+
         RevoltHttp.ws(REVOLT_WEBSOCKET) {
             socket = this
 

app/src/main/java/chat/revolt/api/routes/safety/Reporting.kt

@@ -16,8 +16,9 @@ suspend fun putMessageReport(
 ) {
     val fullMessageReport = FullMessageReport(
         content = MessageReport(
+            type = "Message",
             report_reason = reason,
-            id = messageId,
+            id = messageId
         ),
         additional_context = additionalContext,
     )
@@ -48,6 +49,7 @@ suspend fun putServerReport(
 ) {
     val fullServerReport = FullServerReport(
         content = ServerReport(
+            type = "Server",
             report_reason = reason,
             id = serverId,
         ),
@@ -80,6 +82,7 @@ suspend fun putUserReport(
 ) {
     val fullUserReport = FullUserReport(
         content = UserReport(
+            type = "User",
             report_reason = reason,
             id = userId,
         ),

app/src/main/java/chat/revolt/api/schemas/Safety.kt

@@ -80,7 +80,7 @@ enum class UserReportReason(val value: String) {
 
 @Serializable
 data class MessageReport(
-    val type: String = "Message",
+    val type: String,
     val id: String,
     val report_reason: ContentReportReason,
 )
@@ -93,7 +93,7 @@ data class FullMessageReport(
 
 @Serializable
 data class ServerReport(
-    val type: String = "Server",
+    val type: String,
     val id: String,
     val report_reason: ContentReportReason,
 )
@@ -106,7 +106,7 @@ data class FullServerReport(
 
 @Serializable
 data class UserReport(
-    val type: String = "User",
+    val type: String,
     val id: String,
     val report_reason: UserReportReason,
 )