Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jan 27, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2b6901
fix ForwardMsgAdapter
guimc233 Jan 27, 2024
605ff66
fix ForwardMsgAdapter
guimc233 Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix ForwardMsgAdapter
  • Loading branch information
@guimc233
guimc233 committed Jan 27, 2024
commit 605ff666ce69f66dfd90df17ab387f83de37eb18
11 changes: 5 additions & 6 deletions onebot/src/main/java/cn/evole/onebot/sdk/util/json/ForwardMsgAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading