diff --git a/src/main/java/com/redstoner/redstonerBot/listeners/MessageReaction.java b/src/main/java/com/redstoner/redstonerBot/listeners/MessageReaction.java index 0cf7013..0ced8e3 100644 --- a/src/main/java/com/redstoner/redstonerBot/listeners/MessageReaction.java +++ b/src/main/java/com/redstoner/redstonerBot/listeners/MessageReaction.java @@ -37,7 +37,8 @@ public class MessageReaction extends ListenerAdapter { if (!self.hasPermission(channel, Permission.MESSAGE_WRITE)) return; if (!self.hasPermission(channel, Permission.MESSAGE_EMBED_LINKS)) return; - logger.info("[" + messageId + "] " + author.getAsTag() + " -> + " + reaction.getReactionEmote().getName()); + // TOS :omegalul: + // logger.info("[" + messageId + "] " + author.getAsTag() + " -> + " + reaction.getReactionEmote().getName()); ReactionManager.handle(messageId, reaction, author, true); } @@ -60,7 +61,8 @@ public class MessageReaction extends ListenerAdapter { if (!self.hasPermission(channel, Permission.MESSAGE_WRITE)) return; if (!self.hasPermission(channel, Permission.MESSAGE_EMBED_LINKS)) return; - logger.info("[" + messageId + "] " + author.getAsTag() + " -> - " + reaction.getReactionEmote().getName()); + // TOS :omegalul: + // logger.info("[" + messageId + "] " + author.getAsTag() + " -> - " + reaction.getReactionEmote().getName()); ReactionManager.handle(messageId, reaction, author, false); } diff --git a/src/main/java/com/redstoner/redstonerBot/listeners/MessageReceived.java b/src/main/java/com/redstoner/redstonerBot/listeners/MessageReceived.java index f91761f..119c7f8 100644 --- a/src/main/java/com/redstoner/redstonerBot/listeners/MessageReceived.java +++ b/src/main/java/com/redstoner/redstonerBot/listeners/MessageReceived.java @@ -34,9 +34,12 @@ public class MessageReceived extends ListenerAdapter { String rawMessage = message.getContentRaw(); - logger.info(author.getAsTag() + " -> " + rawMessage); + // TOS :omegalul: + // logger.info(author.getAsTag() + " -> " + rawMessage); - if (rawMessage.startsWith(DataManager.getConfigValue("prefix_char"))) { + String prefixChar = DataManager.getConfigValue("prefix_char"); + + if (prefixChar != null && rawMessage.startsWith(prefixChar)) { CommandManager.execute(guild, channel, message, author, self); } } diff --git a/src/main/java/com/redstoner/redstonerBot/reactableMessages/OptInReactableMessageHandler.java b/src/main/java/com/redstoner/redstonerBot/reactableMessages/OptInReactableMessageHandler.java index e7ef45e..d702fc5 100644 --- a/src/main/java/com/redstoner/redstonerBot/reactableMessages/OptInReactableMessageHandler.java +++ b/src/main/java/com/redstoner/redstonerBot/reactableMessages/OptInReactableMessageHandler.java @@ -44,7 +44,7 @@ public class OptInReactableMessageHandler extends ReactableMessageHandler { List> optIns = DataManager.getOptins(); - if (optIns != null) { + if (optIns != null && channelFormat != null && roleFormat != null) { List> channelOptIns = new ArrayList<>(); List> roleOptIns = new ArrayList<>(); @@ -114,11 +114,12 @@ public class OptInReactableMessageHandler extends ReactableMessageHandler { String emoteName = reaction.getReactionEmote().getName(); String authorTag = author.getAsTag(); - if (added) { - logger.info("Opt in reaction " + emoteName + " by user " + authorTag + " added!"); - } else { - logger.info("Opt in reaction " + emoteName + " by user " + authorTag + " removed!"); - } + // TOS :omegalul: + // if (added) { + // logger.info("Opt in reaction " + emoteName + " by user " + authorTag + " added!"); + // } else { + // logger.info("Opt in reaction " + emoteName + " by user " + authorTag + " removed!"); + // } List> optIns = DataManager.getOptins(); if (optIns == null) return; @@ -157,14 +158,17 @@ public class OptInReactableMessageHandler extends ReactableMessageHandler { Role optInRole = guild.getRoleById(roleId); if (added) { - logger.info("Adding role " + optInRole.getName() + " to user " + authorTag); + // TOS :omegalul: + // logger.info("Adding role " + optInRole.getName() + " to user " + authorTag); guildController.addSingleRoleToMember(authorMember, optInRole).queue(); } else { - logger.info("Removing role " + optInRole.getName() + " from user " + authorTag); + // TOS :omegalul: + // logger.info("Removing role " + optInRole.getName() + " from user " + authorTag); guildController.removeSingleRoleFromMember(authorMember, optInRole).queue(); } } else if (added) { - logger.info("Removing rogue reaction " + emoteName + " by user " + authorTag); + // TOS :omegalul: + // logger.info("Removing rogue reaction " + emoteName + " by user " + authorTag); reaction.removeReaction(author).queue(); } };