fix ForwardMsgAdapter

guimc233 · Jan 27, 2024 · 605ff66 · 605ff66
1 parent f2b6901
commit 605ff66
Showing 1 changed file with 5 additions and 6 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,13 +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;
-        try {
-            messagesArray = jsonObj.get("messages").getAsJsonArray();
-        } catch (NullPointerException ignored) {
-            messagesArray = jsonObj.get("message").getAsJsonArray();
+        JsonElement messagesArray;
+        messagesArray = jsonObj.get("messages");
+        if (messagesArray == null) {
+            messagesArray = jsonObj.get("message");
         }
-        for (JsonElement jsonElement : messagesArray) {
+        for (JsonElement jsonElement : messagesArray.getAsJsonArray()) {
             JsonsObject obj = new JsonsObject(jsonElement.getAsJsonObject());
             int time = obj.optInt("time");
             String messageType = obj.optString("message_type");