zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

🐛 JDA: Fix webhook messages throwing NPE (#214)

Browse source 
* Fix NPE with webhook messages.

Webhook messages would be constructed as `JDAGuildSender`, which calls `Objects.requireNonNull(event.getMember())` however the JDA documentation states that the `getMember()` method will `be null in case of Message being received in a PrivateChannel or isWebhookMessage() returning true.` If the message is a webhook message, a generic `JDACommandSender` instance will be constructed instead of a `JDAGuildSender`

* Add webhook fix to changelog
This commit is contained in:
p5nbTgip0r 2021-01-15 13:31:56 -08:00 • committed by Alexander Söderberg
parent 5dd925a8d1
commit 09f8dbd956
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cloud-discord/cloud-jda/src/main/java/cloud/commandframework/jda/JDACommandSender.java
View file

@ -66,7 +66,9 @@ public class JDACommandSender {
* @return Constructed JDA Command Sender
*/
public static @NonNull JDACommandSender of(final @NonNull MessageReceivedEvent event) {
if (event.isFromType(ChannelType.PRIVATE)) {
if (event.isWebhookMessage()) {
return new JDACommandSender(event, event.getAuthor(), event.getChannel());
} else if (event.isFromType(ChannelType.PRIVATE)) {
return new JDAPrivateSender(event, event.getAuthor(), event.getPrivateChannel());
}