处理 ForwardMessage 时不符合 Onebot v11 规范 (#16)

* fix ForwardMsgAdapter * fix ForwardMsgAdapter
MrXiaoM · Jan 27, 2024 · 54118c1 · 54118c1
1 parent eb376cc
commit 54118c1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/onebot/src/main/java/cn/evole/onebot/sdk/util/json/ForwardMsgAdapter.java b/onebot/src/main/java/cn/evole/onebot/sdk/util/json/ForwardMsgAdapter.java
@@ -14,8 +14,12 @@ public class ForwardMsgAdapter implements JsonDeserializer<ForwardMsgResp> {
     public ForwardMsgResp deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
         List<ForwardMsgResp.Node> nodes = new ArrayList<>();
         JsonObject jsonObj = json.getAsJsonObject();
-        JsonArray messagesArray = jsonObj.get("messages").getAsJsonArray();
-        for (JsonElement jsonElement : messagesArray) {
+        JsonElement messagesArray;
+        messagesArray = jsonObj.get("messages");
+        if (messagesArray == null) {
+            messagesArray = jsonObj.get("message");
+        }
+        for (JsonElement jsonElement : messagesArray.getAsJsonArray()) {
             JsonsObject obj = new JsonsObject(jsonElement.getAsJsonObject());
             int time = obj.optInt("time");
             String messageType = obj.optString("message_type");