bea/HidekoBot
1
0
Fork 0
Code Issues 8 Pull Requests 7 Packages Projects Releases Wiki Activity

Implement various null checks
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Beatrice Dellacà
2023-01-15 04:51:30 +01:00
parent 546eb49144
commit d2abeb35fc
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/wtf/beatrice/hidekobot/commands/message/TriviaCommand.java
View File

@@ -5,6 +5,7 @@ import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import wtf.beatrice.hidekobot.Cache;
@@ -77,11 +78,19 @@ public class TriviaCommand implements MessageCommand
MessageResponse response = Trivia.generateMainScreen();
event.getMessage().replyEmbeds(response.embed()).addActionRow(response.components()).queue(message ->
{
Cache.getDatabaseSource().trackRanCommandReply(message, event.getAuthor());
Cache.getDatabaseSource().queueDisabling(message);
});
Message recvMessage = event.getMessage();
MessageCreateAction responseAction = null;
if(response.content() != null) responseAction = recvMessage.reply(response.content());
else if(response.embed() != null) responseAction = recvMessage.replyEmbeds(response.embed());
if(responseAction != null) {
if(response.components() != null) responseAction = responseAction.addActionRow(response.components());
responseAction.queue(message -> {
Cache.getDatabaseSource().trackRanCommandReply(message, event.getAuthor());
Cache.getDatabaseSource().queueDisabling(message);
});
}
}