Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-09-29 05:47:27 +02:00
Code Issues Projects Releases Wiki Activity

Add error logging for failed plugin message parse (#3364)

Browse Source
This commit is contained in:
Luck 2022-04-24 09:33:33 +01:00
parent 207e4aa9f8
commit b3cdf67c4f
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java
View File

@ -164,11 +164,21 @@ public class LuckPermsMessagingService implements InternalMessagingService, Inco
@Override
public boolean consumeIncomingMessageAsString(@NonNull String encodedString) {
try {
return consumeIncomingMessageAsString0(encodedString);
} catch (Exception e) {
this.plugin.getLogger().warn("Unable to decode incoming messaging service message: '" + encodedString + "'", e);
return false;
}
}
private boolean consumeIncomingMessageAsString0(@NonNull String encodedString) {
Objects.requireNonNull(encodedString, "encodedString");
JsonObject decodedObject = GsonProvider.normal().fromJson(encodedString, JsonObject.class).getAsJsonObject();
JsonObject parsed = Objects.requireNonNull(GsonProvider.normal().fromJson(encodedString, JsonObject.class), "parsed");
JsonObject json = parsed.getAsJsonObject();
// extract id
JsonElement idElement = decodedObject.get("id");
JsonElement idElement = json.get("id");
if (idElement == null) {
throw new IllegalStateException("Incoming message has no id argument: " + encodedString);
}
@ -180,14 +190,14 @@ public class LuckPermsMessagingService implements InternalMessagingService, Inco
}
// extract type
JsonElement typeElement = decodedObject.get("type");
JsonElement typeElement = json.get("type");
if (typeElement == null) {
throw new IllegalStateException("Incoming message has no type argument: " + encodedString);
}
String type = typeElement.getAsString();
// extract content
@Nullable JsonElement content = decodedObject.get("content");
@Nullable JsonElement content = json.get("content");
// decode message
Message decoded;