From 3fc11cc9e607d52a81cd20aea2ec23bef19d0dc9 Mon Sep 17 00:00:00 2001 From: Simon Verhoeven Date: Sat, 13 Apr 2024 13:36:33 +0200 Subject: [PATCH 1/2] chore: add safety checks to NoteCommand --- .../tjbot/features/moderation/NoteCommand.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/features/moderation/NoteCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/moderation/NoteCommand.java index 2a3ed399fa..e68c4f7ec7 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/moderation/NoteCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/moderation/NoteCommand.java @@ -51,10 +51,11 @@ public NoteCommand(ModerationActionsStore actionsStore) { @Override public void onSlashCommand(SlashCommandInteractionEvent event) { - OptionMapping targetOption = event.getOption(USER_OPTION); - Member author = event.getMember(); - Guild guild = event.getGuild(); - String content = event.getOption(CONTENT_OPTION).getAsString(); + OptionMapping targetOption = + Objects.requireNonNull(event.getOption(USER_OPTION), "The user is null"); + Member author = Objects.requireNonNull(event.getMember()); + Guild guild = Objects.requireNonNull(event.getGuild()); + String content = Objects.requireNonNull(event.getOption(CONTENT_OPTION), "The content is null").getAsString(); if (!handleChecks(guild.getSelfMember(), author, targetOption.getAsMember(), content, event)) { From 717ad505fec17278aa1511ff8ef8718715228f5a Mon Sep 17 00:00:00 2001 From: Simon Verhoeven Date: Sat, 13 Apr 2024 15:59:10 +0200 Subject: [PATCH 2/2] chore: apply spotless --- .../togetherjava/tjbot/features/moderation/NoteCommand.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/features/moderation/NoteCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/moderation/NoteCommand.java index e68c4f7ec7..4a39fb7056 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/moderation/NoteCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/moderation/NoteCommand.java @@ -55,7 +55,9 @@ public void onSlashCommand(SlashCommandInteractionEvent event) { Objects.requireNonNull(event.getOption(USER_OPTION), "The user is null"); Member author = Objects.requireNonNull(event.getMember()); Guild guild = Objects.requireNonNull(event.getGuild()); - String content = Objects.requireNonNull(event.getOption(CONTENT_OPTION), "The content is null").getAsString(); + String content = + Objects.requireNonNull(event.getOption(CONTENT_OPTION), "The content is null") + .getAsString(); if (!handleChecks(guild.getSelfMember(), author, targetOption.getAsMember(), content, event)) {