Skip to content

Commit 5a1eb64

Browse files
committed
fix: handle possible NPEs
1 parent 2507876 commit 5a1eb64

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

application/src/main/java/org/togetherjava/tjbot/features/basic/ApplicationCreateCommand.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,19 +208,20 @@ private Optional<TextChannel> getApplicationChannel(Guild guild) {
208208

209209
private boolean handleHasPermissions(SlashCommandInteractionEvent event) {
210210
Member member = event.getMember();
211+
Guild guild = event.getGuild();
211212

212-
if (member == null) {
213+
if (member == null || guild == null) {
213214
return false;
214215
}
215216

216-
if (!event.getMember().hasPermission(Permission.MANAGE_ROLES)) {
217+
if (!member.hasPermission(Permission.MANAGE_ROLES)) {
217218
event.reply("You do not have the required manage role permission to use this command")
218219
.setEphemeral(true)
219220
.queue();
220221
return false;
221222
}
222223

223-
Member selfMember = event.getGuild().getSelfMember();
224+
Member selfMember = guild.getSelfMember();
224225
if (!selfMember.hasPermission(Permission.MANAGE_ROLES)) {
225226
event.reply(
226227
"Sorry, but I was not set up correctly. I need the manage role permissions for this.")

0 commit comments

Comments
 (0)