Redstoner/RedstonerBot
Archived
0
Fork 0
Code Activity

Added info message rechecking

Browse Source
This commit is contained in:
David Panić
2019-07-18 01:11:32 +02:00
parent 92e6242b7a
commit cd59c54dcd
7 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/redstoner/redstonerBot/commands/CheckMessagesCommand.java Normal file
View File

@@ -0,0 +1,22 @@
package com.redstoner.redstonerBot.commands;
import com.redstoner.redstonerBot.managers.DiscordManager;
import com.redstoner.redstonerBot.managers.InfoManager;
import net.dv8tion.jda.core.entities.*;
public class CheckMessagesCommand implements Command {
@Override
public boolean execute(Guild guild, TextChannel channel, Message message, User author, Member self, String command, String[] params) {
if (!guild.getOwnerId().equals(author.getId())) {
message.getChannel().sendMessage("You are not allowed to run this command " + author.getAsMention()).queue(DiscordManager::expireMessage);
return false;
}
message.getChannel().sendMessage("Rechecking messages " + author.getAsMention()).queue(DiscordManager::expireMessage);
InfoManager.checkMessages();
return true;
}
}

8
src/main/java/com/redstoner/redstonerBot/commands/StopCommand.java
View File

@@ -7,9 +7,13 @@ import net.dv8tion.jda.core.entities.*;
public class StopCommand implements Command {
@Override
public boolean execute(Guild guild, TextChannel channel, Message message, User author, Member self, String command, String[] params) {
if (!guild.getOwnerId().equals(author.getId())) return false;
if (!guild.getOwnerId().equals(author.getId())) {
message.getChannel().sendMessage("You are not allowed to run this command " + author.getAsMention()).queue(DiscordManager::expireMessage);
message.getChannel().sendMessage("This bot will stop in 5 seconds, as requested by " + author.getAsTag()).queue(DiscordManager::expireMessage);
return false;
}
message.getChannel().sendMessage("This bot will stop in 5 seconds, as requested by " + author.getAsMention()).queue(DiscordManager::expireMessage);
new Thread(() -> {
try {

3
src/main/java/com/redstoner/redstonerBot/managers/CommandManager.java
View File

@@ -1,6 +1,7 @@
package com.redstoner.redstonerBot.managers;
import com.redstoner.redstonerBot.Manager;
import com.redstoner.redstonerBot.commands.CheckMessagesCommand;
import com.redstoner.redstonerBot.commands.Command;
import com.redstoner.redstonerBot.commands.InfoCommand;
import com.redstoner.redstonerBot.commands.StopCommand;
@@ -23,7 +24,7 @@ public class CommandManager implements Manager {
commands.put("info", new InfoCommand());
commands.put("stop", new StopCommand());
commands.put("checkmessages", new CheckMessagesCommand());
logger.info("Command Manager started!");
return true;

18
src/main/java/com/redstoner/redstonerBot/managers/InfoManager.java
View File

@@ -16,7 +16,7 @@ import java.util.List;
public class InfoManager implements Manager {
private static final Logger logger = LoggerFactory.getLogger(InfoManager.class);
private List<ReactableMessageHandler> messageHandlers = new ArrayList<>();
private static List<ReactableMessageHandler> messageHandlers = new ArrayList<>();
@Override
public boolean start() {
@@ -29,11 +29,7 @@ public class InfoManager implements Manager {
messageHandlers.add(new InfoReactableMessageHandler(jda, guild, channel));
messageHandlers.add(new OptInReactableMessageHandler(jda, guild, channel));
new Thread(() -> {
for (ReactableMessageHandler handler : messageHandlers) {
handler.checkMessage();
}
}).start();
checkMessages();
logger.info("Info Manager started!");
return true;
@@ -52,4 +48,14 @@ public class InfoManager implements Manager {
logger.info("Info Manager stopped!");
return true;
}
public static void checkMessages() {
new Thread(() -> {
for (ReactableMessageHandler handler : messageHandlers) {
handler.checkMessage();
}
}).start();
}
}

6
src/main/java/com/redstoner/redstonerBot/reactableMessages/InfoReactableMessageHandler.java
View File

@@ -8,7 +8,6 @@ import net.dv8tion.jda.core.entities.*;
import net.dv8tion.jda.core.managers.GuildController;
import java.util.*;
import java.util.function.Consumer;
public class InfoReactableMessageHandler extends ReactableMessageHandler {
static Map<String, String> configNames = new HashMap<>();
@@ -32,7 +31,7 @@ public class InfoReactableMessageHandler extends ReactableMessageHandler {
}
@Override
public void send(Consumer<? super Message> onSent) {
public Message getMessage() {
String prefix = DataManager.getConfigValue(configNames.get("prefix"));
String suffix = DataManager.getConfigValue(configNames.get("suffix"));
@@ -72,9 +71,10 @@ public class InfoReactableMessageHandler extends ReactableMessageHandler {
msg.append(suffix);
channel.sendMessage(msg.build()).queue(onSent);
return msg.build();
}
@Override
public ReactionHandler getReactionHandler() {
return (messageId, reaction, author, added) -> {

5
src/main/java/com/redstoner/redstonerBot/reactableMessages/OptInReactableMessageHandler.java
View File

@@ -9,7 +9,6 @@ import net.dv8tion.jda.core.entities.*;
import net.dv8tion.jda.core.managers.GuildController;
import java.util.*;
import java.util.function.Consumer;
public class OptInReactableMessageHandler extends ReactableMessageHandler {
static Map<String, String> configNames = new HashMap<>();
@@ -34,7 +33,7 @@ public class OptInReactableMessageHandler extends ReactableMessageHandler {
}
@Override
public void send(Consumer<? super Message> onSent) {
public Message getMessage() {
String prefix = DataManager.getConfigValue(configNames.get("prefix"));
String suffix = DataManager.getConfigValue(configNames.get("suffix"));
@@ -106,7 +105,7 @@ public class OptInReactableMessageHandler extends ReactableMessageHandler {
msg.append(suffix);
channel.sendMessage(msg.build()).queue(onSent);
return msg.build();
}
@Override

7
src/main/java/com/redstoner/redstonerBot/reactableMessages/ReactableMessageHandler.java
View File

@@ -35,17 +35,22 @@ public abstract class ReactableMessageHandler {
abstract Map<String, String> getConfigNames();
public abstract void send(Consumer<? super Message> onSent);
public abstract Message getMessage();
public abstract ReactionHandler getReactionHandler();
public abstract Set<String> getReactions();
private void send(Consumer<? super Message> onSent) {
channel.sendMessage(getMessage()).queue(onSent);
}
public void checkMessage() {
logger.info("[Check] Checking message ID: " + msgId);
try {
checkAfterMessageFound(channel.getMessageById(msgId).complete());
channel.editMessageById(msgId, getMessage()).queue();
} catch (Exception e) {
logger.info("[Check] Message with ID " + msgId + " does not exist, sending new one!");
send(this::checkAfterMessageFound);