do not toJson if message is primitive

MrXiaoM · Feb 22, 2024 · d59ef26 · d59ef26
1 parent a9bff12
commit d59ef26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -37,6 +37,8 @@ Overflow 的用途是替换 mirai-core 协议实现，连接 Onebot 标准的实
 + [LagrangeDev/Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core) QQNT 协议库
 + [cnlimiter/onebot-mirai](https://github.com/cnlimiter/onebot-mirai) mirai 转 Onebot，相当于可以实现 mirai 接龙
 
+**额外配置**: Overflow 不支持 CQ 码，请使用`数组格式 (array)`消息。
+
 部署完成后，选择一种连接方式进行下一步操作。
 
 ## 连接

diff --git a/onebot/src/main/java/cn/evole/onebot/sdk/util/json/MessageEventAdapter.java b/onebot/src/main/java/cn/evole/onebot/sdk/util/json/MessageEventAdapter.java
@@ -18,7 +18,8 @@ public MessageEvent deserialize(JsonElement json, Type typeOfT, JsonDeserializat
         JsonObject obj = json.getAsJsonObject();
         String messageType = obj.get("message_type").getAsString();
         long userId = obj.get("user_id").getAsLong();
-        String message = gson.toJson(obj.get("message"));
+        JsonElement messageElement = obj.get("message");
+        String message = messageElement.isJsonPrimitive() ? messageElement.getAsJsonPrimitive().getAsString() : gson.toJson(messageElement);
         String rawMessage = obj.get("raw_message").getAsString();
         int font = obj.get("font").getAsInt();
         switch (messageType) {

diff --git a/onebot/src/main/java/cn/evole/onebot/sdk/util/json/MsgAdapter.java b/onebot/src/main/java/cn/evole/onebot/sdk/util/json/MsgAdapter.java
@@ -15,7 +15,8 @@ public GetMsgResp deserialize(JsonElement json, Type typeOfT, JsonDeserializatio
         int realId = obj.get("real_id").getAsInt();
         GetMsgResp.Sender sender = gson.fromJson(obj.get("sender"), GetMsgResp.Sender.class);
         int time = obj.get("time").getAsInt();
-        String message = gson.toJson(obj.get("message"));
+        JsonElement messageElement = obj.get("message");
+        String message = messageElement.isJsonPrimitive() ? messageElement.getAsJsonPrimitive().getAsString() : gson.toJson(messageElement);
         String rawMessage = obj.has("raw_message") ? obj.get("raw_message").getAsString() : "";
         long peerId = obj.has("peer_id") ? obj.get("peer_id").getAsLong() : 0;
         long groupId = obj.has("group_id") ? obj.get("group_id").getAsLong() : 0;