fix: fix some problems

RTAkland · Aug 31, 2024 · 983d6e0 · 983d6e0
1 parent 2ff3a8e
commit 983d6e0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official
 
-libVersion=1.2.7
+libVersion=1.2.8
diff --git a/src/main/kotlin/cn/rtast/rob/entity/NoticeEvent.kt b/src/main/kotlin/cn/rtast/rob/entity/NoticeEvent.kt
@@ -16,5 +16,6 @@ data class NoticeEvent(
     val operatorId: Long,
     @SerializedName("user_id")
     val userId: Long,
-    val comment: String?
+    val comment: String?,
+    val duration: Int?
 )
diff --git a/src/main/kotlin/cn/rtast/rob/util/ob/MessageHandler.kt b/src/main/kotlin/cn/rtast/rob/util/ob/MessageHandler.kt
@@ -94,12 +94,12 @@ object MessageHandler {
                 val time = serializedMessage.time
                 val msg = message.fromJson<NoticeEvent>()
                 when (serializedMessage.subType) {
-                    SubType.kick -> listener.onMemberKick(websocket, time)
-                    SubType.kick_me -> listener.onBeKicked(websocket, time)
-                    SubType.unset -> listener.onUnsetOperator(websocket, time)
-                    SubType.set -> listener.onSetOperator(websocket, time)
-                    SubType.ban -> listener.onBan(websocket, time)
-                    SubType.lift_ban -> listener.onPardon(websocket, time)
+                    SubType.kick -> listener.onMemberKick(websocket, msg.groupId, msg.operatorId, time)
+                    SubType.kick_me -> listener.onBeKicked(websocket, msg.groupId, msg.operatorId, time)
+                    SubType.unset -> listener.onUnsetOperator(websocket, msg.groupId, msg.operatorId, time)
+                    SubType.set -> listener.onSetOperator(websocket, msg.groupId, msg.operatorId, time)
+                    SubType.ban -> listener.onBan(websocket, msg.groupId, msg.operatorId, msg.duration!!, time)
+                    SubType.lift_ban -> listener.onPardon(websocket, msg.groupId, msg.operatorId, msg.duration!!, time)
                     SubType.leave -> listener.onLeaveMessage(websocket, msg.groupId, msg.userId, msg.operatorId, time)
                     SubType.invite -> listener.onInviteMessage(websocket, msg.groupId, msg.userId, msg.operatorId, time)
                     SubType.approve -> listener.onApproveMessage(

diff --git a/src/main/kotlin/cn/rtast/rob/util/ob/OBMessage.kt b/src/main/kotlin/cn/rtast/rob/util/ob/OBMessage.kt
@@ -29,17 +29,20 @@ interface OBMessage : OBAction {
     suspend fun onConnectEvent(websocket: WebSocket, event: ConnectEvent) {}
     suspend fun onHeartBeatMessage(websocket: WebSocket, event: HeartBeatEvent) {}
     suspend fun onMessage(websocket: WebSocket, rawMessage: String) {}
+    suspend fun onBeAt(webSocket: WebSocket, message: GroupMessage) {}
+    suspend fun onBeRepliedInGroup(webSocket: WebSocket, message: GroupMessage) {}
+    suspend fun onBeRepliedInPrivate(webSocket: WebSocket, message: PrivateMessage) {}
     suspend fun onGroupMessage(websocket: WebSocket, message: GroupMessage, json: String) {}
     suspend fun onPrivateMessage(websocket: WebSocket, message: PrivateMessage, json: String) {}
     suspend fun onInviteMessage(websocket: WebSocket, groupId: Long, userId: Long, operator: Long, time: Long) {}
     suspend fun onApproveMessage(webSocket: WebSocket, groupId: Long, userId: Long, operator: Long, time: Long) {}
     suspend fun onLeaveMessage(webSocket: WebSocket, groupId: Long, userId: Long, operator: Long, time: Long) {}
-    suspend fun onMemberKick(webSocket: WebSocket, time: Long) {}
-    suspend fun onBeKicked(webSocket: WebSocket, time: Long) {}
-    suspend fun onSetOperator(webSocket: WebSocket, time: Long) {}
-    suspend fun onUnsetOperator(webSocket: WebSocket, time: Long) {}
-    suspend fun onBan(webSocket: WebSocket, time: Long) {}
-    suspend fun onPardon(webSocket: WebSocket, time: Long) {}
+    suspend fun onMemberKick(webSocket: WebSocket, groupId: Long, operator: Long, time: Long) {}
+    suspend fun onBeKicked(webSocket: WebSocket, groupId: Long, operator: Long, time: Long) {}
+    suspend fun onSetOperator(webSocket: WebSocket, groupId: Long, operator: Long, time: Long) {}
+    suspend fun onUnsetOperator(webSocket: WebSocket, groupId: Long, operator: Long, time: Long) {}
+    suspend fun onBan(webSocket: WebSocket, groupId: Long, operator: Long, duration: Int, time: Long) {}
+    suspend fun onPardon(webSocket: WebSocket, groupId: Long, operator: Long, duration: Int, time: Long) {}
     suspend fun onJoinRequest(webSocket: WebSocket, groupId: Long, userId: Long, comment: String, time: Long) {}
     suspend fun onGetGroupMemberListResponse(webSocket: WebSocket, members: GroupMemberList) {}
     suspend fun onGetOneBotVersionInfoResponse(webSocket: WebSocket, info: OneBotVersionInfo) {}
@@ -53,7 +56,4 @@ interface OBMessage : OBAction {
     suspend fun onGetMessageResponse(webSocket: WebSocket, messageJson: String) {}
     suspend fun onGetForwardMessageResponse(webSocket: WebSocket, messageJson: String) {}
     suspend fun onGetGroupInfoResponse(webSocket: WebSocket, groupInfo: GroupInfo) {}
-    suspend fun onBeAt(webSocket: WebSocket, message: GroupMessage) {}
-    suspend fun onBeRepliedInGroup(webSocket: WebSocket, message: GroupMessage) {}
-    suspend fun onBeRepliedInPrivate(webSocket: WebSocket, message: PrivateMessage) {}
 }