Skip to content

Commit 66d28ab

Browse files
author
andrew-09
committed
Use matches intead of equals, merge if statements and remove unnecessary failure case. Update a reply for more clarity for users
1 parent 5b40a1f commit 66d28ab

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

application/src/main/java/org/togetherjava/tjbot/features/help/PinAnswerCommand.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,13 @@ public void onMessageContext(MessageContextInteractionEvent event) {
2929
Message originalMessage = event.getTarget();
3030
User commandInvoker = event.getUser();
3131

32-
if (!(originalMessage.getChannel() instanceof ThreadChannel threadChannel)) {
32+
if (!(originalMessage.getChannel() instanceof ThreadChannel threadChannel)
33+
|| !(threadChannel.getParentChannel() instanceof ForumChannel forumChannel)
34+
|| !forumChannel.getName().matches(helpForumPattern)) {
3335
replyNotInThread(event);
3436
return;
3537
}
3638

37-
if (!(threadChannel.getParentChannel() instanceof ForumChannel forumChannel)
38-
|| !forumChannel.getName().equalsIgnoreCase(helpForumPattern)) {
39-
replyNotInThread(event);
40-
return;
41-
}
4239

4340
if (!threadOwner(commandInvoker, threadChannel)) {
4441
replyNotThreadOwner(event);
@@ -60,12 +57,15 @@ private boolean threadOwner(User user, ThreadChannel thread) {
6057

6158
private void pinMessage(MessageContextInteractionEvent event, Message message) {
6259
message.pin()
63-
.queue(success -> event.reply("Answer pinned successfully!").setEphemeral(true).queue(),
64-
failure -> event.reply("Failed to pin the answer.").setEphemeral(true).queue());
60+
.queue(success -> event.reply("Answer pinned successfully!")
61+
.setEphemeral(true)
62+
.queue());
6563
}
6664

6765
private void replyNotInThread(MessageContextInteractionEvent event) {
68-
event.reply("This command can only be used in threads").setEphemeral(true).queue();
66+
event.reply("This command can only be used in threads in the questions channel")
67+
.setEphemeral(true)
68+
.queue();
6969
}
7070

7171
private void replyNotThreadOwner(MessageContextInteractionEvent event) {

0 commit comments

Comments
 (0)