Skip to content

Commit d15b5bf

Browse files
committed
warped the line that reacts to the message in a try catch block
1 parent e00ac74 commit d15b5bf

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

application/src/main/java/org/togetherjava/tjbot/commands/basic/SuggestionsUpDownVoter.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import net.dv8tion.jda.api.entities.Guild;
55
import net.dv8tion.jda.api.entities.Message;
66
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
7+
import net.dv8tion.jda.api.exceptions.ErrorResponseException;
8+
import net.dv8tion.jda.api.requests.ErrorResponse;
79
import org.jetbrains.annotations.NotNull;
810
import org.slf4j.Logger;
911
import org.slf4j.LoggerFactory;
@@ -51,12 +53,18 @@ public void onMessageReceived(@NotNull GuildMessageReceivedEvent event) {
5153

5254
private static void reactWith(@NotNull String emoteName, @NotNull String fallbackUnicodeEmote,
5355
@NotNull Guild guild, @NotNull Message message) {
54-
getEmoteByName(emoteName, guild).map(message::addReaction).orElseGet(() -> {
55-
logger.warn(
56-
"Unable to vote on a suggestion with the configured emote ('{}'), using fallback instead.",
57-
emoteName);
58-
return message.addReaction(fallbackUnicodeEmote);
59-
}).queue();
56+
try {
57+
getEmoteByName(emoteName, guild).map(message::addReaction).orElseGet(() -> {
58+
logger.warn(
59+
"Unable to vote on a suggestion with the configured emote ('{}'), using fallback instead.",
60+
emoteName);
61+
return message.addReaction(fallbackUnicodeEmote);
62+
}).complete();
63+
} catch (ErrorResponseException exception) {
64+
if (exception.getErrorResponse() != ErrorResponse.REACTION_BLOCKED) {
65+
throw exception;
66+
}
67+
}
6068
}
6169

6270
private static @NotNull Optional<Emote> getEmoteByName(@NotNull String name,

0 commit comments

Comments
 (0)