Redstoner/RedstonerBot
Archived
0
Fork 0
Code Activity

Made bot TOS compliant + added missing null checks

Browse Source
This commit is contained in:
David Panić
2019-07-18 02:55:08 +02:00
parent e2c47bf969
commit 6a433f379e
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/redstoner/redstonerBot/listeners/MessageReaction.java
View File

@@ -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);
}

7
src/main/java/com/redstoner/redstonerBot/listeners/MessageReceived.java
View File

@@ -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);
}
}

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

@@ -44,7 +44,7 @@ public class OptInReactableMessageHandler extends ReactableMessageHandler {
List<Map<String, String>> optIns = DataManager.getOptins();
if (optIns != null) {
if (optIns != null && channelFormat != null && roleFormat != null) {
List<Map<String, String>> channelOptIns = new ArrayList<>();
List<Map<String, String>> 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<Map<String, String>> 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();
}
};