feat: ✨ QQ list command support (#29)

AnzhiZhang · Jul 27, 2024 · 71397aa · 71397aa
1 parent 741f8c5
commit 71397aa
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 12 deletions.
diff --git a/readme-zh.md b/readme-zh.md
@@ -260,9 +260,6 @@ Kook 消息的格式化文本。占位符与上文同理，所有的服务器名
 
 ### qq
 
-> [!NOTE]
-> `list` 指令暂未支持
-
 该功能为双向转发，即 MC 内消息会发送到指定 QQ 群，QQ 群内消息将被转发到 MC 内。
 
 #### enable

diff --git a/readme.md b/readme.md
@@ -260,9 +260,6 @@ Message for `/list` command when player list is empty.
 
 ### qq
 
-> [!NOTE]
-> The `list` command is not currently available.
-
 The messages from the group will be synchronized to ChatHub and chatHub will forward all public messages to the group.
 
 #### enable

diff --git a/src/main/java/com/zhanganzhi/chathub/platforms/qq/QQAdaptor.java b/src/main/java/com/zhanganzhi/chathub/platforms/qq/QQAdaptor.java
@@ -74,11 +74,26 @@ public void consumeEvent() {
                             && config.getQQGroupId().equals(curEvent.getGroupId().toString())
             ) {
                 JSONArray message = curEvent.getMessage();
+
+                // list command
+                if (message.size() == 1) {
+                    if (
+                            "text".equals(message.getJSONObject(0).getString("type")) &&
+                                    "/list".equals(message.getJSONObject(0).getJSONObject("data").getString("text"))
+                    ) {
+                        sendPublicMessage(getFormatter().formatListAll(chatHub.getProxyServer()));
+                        return;
+                    }
+                }
+
+                // chat
                 List<String> messages = new ArrayList<>();
                 for (int i = 0; i < message.size(); i++) {
                     JSONObject part = message.getJSONObject(i);
                     if (part.getString("type").equals("text")) {
                         messages.add(part.getJSONObject("data").getString("text"));
+                    } else if (part.getString("type").equals("image")) {
+                        messages.add("[图片]");
                     }
                 }
                 String content = String.join(" ", messages);

diff --git a/src/main/java/com/zhanganzhi/chathub/platforms/qq/protocol/QQAPI.java b/src/main/java/com/zhanganzhi/chathub/platforms/qq/protocol/QQAPI.java
@@ -6,7 +6,6 @@
 import com.zhanganzhi.chathub.platforms.qq.dto.QQEvent;
 import lombok.Getter;
 import lombok.SneakyThrows;
-import org.slf4j.Logger;
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedDeque;

diff --git a/src/main/java/com/zhanganzhi/chathub/platforms/qq/protocol/QQWsServer.java b/src/main/java/com/zhanganzhi/chathub/platforms/qq/protocol/QQWsServer.java
@@ -11,6 +11,7 @@
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Queue;
 
@@ -31,15 +32,15 @@ public QQWsServer(String host, Integer port, String validResourcePath, Queue<QQE
 
     @Override
     public void onOpen(WebSocket webSocket, ClientHandshake clientHandshake) {
-        logger.info("QQ WebSocket server opened at [{}], path:[{}]", webSocket.getLocalSocketAddress(), clientHandshake.getResourceDescriptor());
+        logger.info("QQ WebSocket connection opened at [{}], path:[{}]", webSocket.getLocalSocketAddress(), clientHandshake.getResourceDescriptor());
         if (validResourcePath.equals(clientHandshake.getResourceDescriptor())) {
             clients.add(webSocket);
         }
     }
 
     @Override
     public void onClose(WebSocket webSocket, int i, String s, boolean b) {
-        logger.info("QQ WebSocket server closed");
+        logger.info("QQ WebSocket connection closed");
     }
 
     @Override
@@ -52,7 +53,7 @@ public void onMessage(WebSocket webSocket, String msg) {
 
     @Override
     public void onError(WebSocket webSocket, Exception e) {
-        logger.error("QQ WebSocket server error", e);
+        logger.error("QQ WebSocket connection error", e);
     }
 
     @Override
@@ -62,8 +63,18 @@ public void onStart() {
 
     public void sendMessage(String message) {
         logger.debug("QQ WebSocket server send message to clients");
-        for (WebSocket client : clients) {
-            client.send(message);
+        Iterator<WebSocket> iter = clients.iterator();
+        while (iter.hasNext()) {
+            WebSocket webSocket = iter.next();
+            try {
+                webSocket.send(message);
+            } catch (Exception e) {
+                if (!webSocket.isClosed()) {
+                    logger.error("QQ WebSocket connection closed!error: {}", e.getMessage());
+                    webSocket.close();
+                }
+                iter.remove();
+            }
         }
     }
 }