Alex/KittyBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+Added Fetch command

Browse Source 
Added Fetch command
Refactored AddGuildRole and AllowedGuildRole to be standard
Added GuildRoleRemove
This commit is contained in:
Alex Stewart
2019-04-18 22:13:49 -07:00
parent 448fb6bf92
commit c1c7b1f891
10 changed files with 180 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/ObjectBuilderFactory.java
+21 -45
View File
@@ -1,50 +1,13 @@
package core;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.Semaphore;
import commands.CommandAddGuildRole;
import commands.CommandAllowedGuildRole;
import commands.CommandBeansShow;
import commands.CommandBetBeans;
import commands.CommandBlurry;
import commands.CommandBoop;
import commands.CommandChangeIndicator;
import commands.CommandChoose;
import commands.CommandColiru;
import commands.CommandDoWork;
import commands.CommandEightBall;
import commands.CommandGiveBeans;
import commands.CommandHelp;
import commands.CommandHelpBuilder;
import commands.CommandInfo;
import commands.CommandInvite;
import commands.CommandJDoodle;
import commands.CommandMap;
import commands.CommandPerish;
import commands.CommandPing;
import commands.CommandPollManage;
import commands.CommandPollResults;
import commands.CommandPollShow;
import commands.CommandPollVote;
import commands.CommandRPEnd;
import commands.CommandRPG;
import commands.CommandRPStart;
import commands.CommandRating;
import commands.CommandRole;
import commands.CommandRoll;
import commands.CommandShutdown;
import commands.CommandStark;
import commands.CommandStats;
import commands.CommandTeey;
import commands.CommandTweet;
import commands.CommandWolfram;
import commands.CommandYeet;
import dataStructures.KittyChannel;
import dataStructures.KittyGuild;
import dataStructures.KittyRating;
import dataStructures.KittyRole;
import dataStructures.KittyUser;
import commands.*;
import dataStructures.*;
import net.dv8tion.jda.core.entities.Emote;
import net.dv8tion.jda.core.entities.Member;
import net.dv8tion.jda.core.events.message.guild.GuildMessageReceivedEvent;
import utils.AdminControl;
@@ -136,6 +99,17 @@ public class ObjectBuilderFactory
// look up the guild.
String uid = event.getGuild().getId();
List<Emote> emotes = event.getGuild().getEmotes();
ArrayList<String> emotesString = new ArrayList<String>();
String emote;
String emoteFix;
for(int i = 0; i < emotes.size(); i++)
{
emote = emotes.get(i).toString();
emoteFix = "<:" + emote.substring(2, emote.indexOf("("));
emoteFix += ":" + emote.substring(emote.indexOf("(")+1, emote.length()-1) + ">";
emotesString.add(emoteFix);
}
// once we're lazily initialized, we can synchronize w/ the
// guildCache object now instead of having to use a mutex.
KittyGuild guild = null;
@@ -149,7 +123,7 @@ public class ObjectBuilderFactory
else
{
// Construct a new guild with defaults
guild = new KittyGuild(uid, new AdminControl(event.getGuild()));
guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString);
DatabaseManager.instance.Register(guild);
guildCache.put(uid, guild);
}
@@ -363,13 +337,15 @@ public class ObjectBuilderFactory
manager.Register(LocCommands.Stub("rating"), new CommandRating(KittyRole.Admin, KittyRating.Safe));
manager.Register(LocCommands.Stub("indicator"), new CommandChangeIndicator(KittyRole.Admin, KittyRating.Safe));
manager.Register(LocCommands.Stub("allowedguildrole"), new CommandAllowedGuildRole(KittyRole.Admin, KittyRating.Safe));
manager.Register(LocCommands.Stub("guildroleallowed"), new CommandGuildRoleAllowed(KittyRole.Admin, KittyRating.Safe));
manager.Register(LocCommands.Stub("poll"), new CommandPollManage(KittyRole.Mod, KittyRating.Safe));
manager.Register(LocCommands.Stub("givebeans"), new CommandGiveBeans(KittyRole.Mod, KittyRating.Safe));
manager.Register(LocCommands.Stub("rpg"), new CommandRPG(KittyRole.Mod, KittyRating.Safe));
manager.Register(LocCommands.Stub("addguildrole"), new CommandAddGuildRole(KittyRole.General, KittyRating.Safe));
manager.Register(LocCommands.Stub("fetch"), new CommandFetch(KittyRole.General, KittyRating.Safe));
manager.Register(LocCommands.Stub("guildroleadd"), new CommandGuildRoleAdd(KittyRole.General, KittyRating.Safe));
manager.Register(LocCommands.Stub("guildroleremove"), new CommandGuildRoleRemove(KittyRole.General, KittyRating.Safe));
manager.Register(LocCommands.Stub("teey"), new CommandTeey(KittyRole.General, KittyRating.Safe));
manager.Register(LocCommands.Stub("perish, thenperish"), new CommandPerish(KittyRole.General, KittyRating.Safe));
manager.Register(LocCommands.Stub("yeet"), new CommandYeet(KittyRole.General, KittyRating.Safe));