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

Make trivia functional for a single question

Browse Source
This commit is contained in:
Beatrice Dellacà
2022-12-21 03:40:13 +01:00
parent 3a8a44adf0
commit 78f62b5f8d
2 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/wtf/beatrice/hidekobot/runnables/ExpiredMessageTask.java
View File

@@ -67,19 +67,18 @@ public class ExpiredMessageTask implements Runnable {
}
}
}
private void disableExpired(String messageId)
{
String channelId = databaseSource.getQueuedExpiringMessageChannel(messageId);
// todo: warning, the following method + related if check are thread-locking.
// todo: we should probably merge the two tables somehow, since they have redundant information.
ChannelType msgChannelType = databaseSource.getTrackedMessageChannelType(messageId);
MessageChannel textChannel = null;
// this should never happen, but only message channels are supported.
if(!msgChannelType.isMessage())
{
@@ -91,7 +90,7 @@ public class ExpiredMessageTask implements Runnable {
if(!(msgChannelType.isGuild()))
{
String userId = databaseSource.getTrackedReplyUserId(messageId);
User user = HidekoBot.getAPI().retrieveUserById(userId).complete();
User user = userId == null ? null : HidekoBot.getAPI().retrieveUserById(userId).complete();
if(user == null)
{
// if user is not found, consider it expired
@@ -105,7 +104,7 @@ public class ExpiredMessageTask implements Runnable {
else
{
String guildId = databaseSource.getQueuedExpiringMessageGuild(messageId);
Guild guild = HidekoBot.getAPI().getGuildById(guildId);
Guild guild = guildId == null ? null : HidekoBot.getAPI().getGuildById(guildId);
if(guild == null)
{
// if guild is not found, consider it expired
@@ -130,7 +129,6 @@ public class ExpiredMessageTask implements Runnable {
if(Cache.isVerbose()) logger.log("cleaning up: " + messageId);
retrieveAction.queue(
message -> {
if(message == null)
{