diff --git a/.classpath b/.classpath index 7c63137..9f1f1b2 100644 --- a/.classpath +++ b/.classpath @@ -14,5 +14,6 @@ + diff --git a/commands.config b/commands.config index 14ef218..e2280cb 100644 --- a/commands.config +++ b/commands.config @@ -9,7 +9,11 @@ buildhelp=1 c++, g++, cplus, cpp=1 catch=1 charactercreate=1 +charactereditbio=1 +charactereditname=1 +characterediturl=1 choose=1 +color, colour=1 crouton=1 dbflush=1 dbstats=1 @@ -42,6 +46,7 @@ roll=1 rpend=1 rpg=1 rpstart=1 +searchcharacter=1 showpoll=1 shutdown=1 stats=1 diff --git a/lib/fuzzywuzzy-1.2.0.jar b/lib/fuzzywuzzy-1.2.0.jar new file mode 100644 index 0000000..a94b728 Binary files /dev/null and b/lib/fuzzywuzzy-1.2.0.jar differ diff --git a/locCommands.config b/locCommands.config index bbad5ef..3a35955 100644 --- a/locCommands.config +++ b/locCommands.config @@ -7,10 +7,12 @@ benchmark, bench= rating= poll= rafflespin= +charactereditURL= bet= guildrolelist= stats= catch= +color, colour= guildroleadd= results= wolfram= @@ -30,6 +32,7 @@ tony, stark, dontfeelgood, dontfeelsogood= role= raffleend= ping= +charactereditbio= roll= blur= choose= @@ -37,6 +40,7 @@ rpstart= guildrolenotallowed= perish, thenperish= teey= +searchcharacter= dbstats= rafflestart= beans= @@ -49,6 +53,7 @@ rpg= tweet= charactercreate= help= +charactereditname= fetch= crouton= invite= diff --git a/locStrings.config b/locStrings.config index e171a11..d402f1e 100644 --- a/locStrings.config +++ b/locStrings.config @@ -89,6 +89,17 @@ RaffleEndSuccess= RaffleEndInfo= RaffleEndFailure=I don't think there's one going! +[CommandCharacterSearch] +CharacterSearchNoCharacterFound=Couldn't find a character with that name or ID! +CharacterSearchMultipleCharacterHeader=I found a couple characters with that name, use `charactersearch UniqueID` with their Unique ID to find them! +CharacterSearchMultipleCharacter=%s is owned by %s. Unique ID is `%s` +CharacterSearchOneCharacter=I found one character with that name! \n Owner: %s | Name: %s | Bio: %s | Ref: <%s> | Unique ID: `%s` +CharacterSearchInfo=Find a character with their name or Unique ID! `charactersearch name` or `charactersearch UniqueID` + +[CommandColor] +ColorNotSearchable=Your color couldn't be parsed! Make sure it's in hex format. Try this! `!color 3F5D54` +ColorInfo=Looks up the provided hex color and outputs it as hex, rgb, hsl, hsv, xyz, and cmyk. Also attempts to name the color, and provies a sample of it! Usage example: `!color #365345` (the # can be omitted) + [CommandDoWork] DoWorkFinished=I finished with my work! :D DoWorkInfo=Occupies a core for a few seconds @@ -123,6 +134,13 @@ PollShowChoices=And the choices are:\n [CommandHelpBuilder] HelpBuilderInfo=Emit help for all commands as formatted HTML +[CommandCharacterEditURL] +CharacterEditURLInfo= +CharacterEditURLNotValid= +CharacterEditURLSuccess= +CharacterEditURLNotAuth= +CharacterEditURLIDNotValid= + [CommandRPG] RPGInfo=Admin+ command only right now - experimental text RPG! Format is !rpg RPGInvalid=Invalid RPG Command! @@ -153,7 +171,7 @@ WolframInfo=Will query wolframalpha with your question and give a full image out WolframNoArgs=You need to provide some arguments! [CommandMap] -MapInfo=Generates a map! You can pass additional information if you want with the flags `-s-w-h`. If one of the fields isn't provided, its default will be used. Note that adjusting the width and height impacts the map outcomes.\n\nDefault seed: Random,\nDefault Width: 35(max %s),\nDefault Height: 25(max %s) +MapInfo=Generates a map! You can pass additional information if you want with the flags `-s -w -h`. If one of the fields isn't provided, its default will be used. Note that adjusting the width and height impacts the map outcomes.\n\n**Defaults**\nDefault Seed: Random,\nDefault Width: 35(max %s),\nDefault Height: 25(max %s)\n\n**Key**\nLand: ˶\nMountain: ▲\nBeach: =\nMarsh: ¥\nLava: # MapSeed=Seed MapInvalid=Invalid arguments provided! MapVersion=Using mapgen v0.1 @@ -175,6 +193,13 @@ RaffleStartInfo= HelpInfo=Lets you look up specific commands, or get a link to a list of all commands. HelpDisplay=You can get help with a specific command by typing `!help command`!\nGeneral Commands: `boop, roll, choose, help, info, vote, results, showpoll, wolfram, cplus, java, beans, role, bet, yeet` +[CommandCharacterEditBio] +CharacterEditBioSuccess= +CharacterEditBioIDNotValid= +CharacterEditBioNotAuth= +CharacterEditBioInfo= +CharacterEditBioNotValid= + [CommandTweet] TweetInfo=Kitty will tweet to her personal twitter account TweetError=Tweet command failed! @@ -185,6 +210,13 @@ GuildRoleAddFailure=Failed to add %s to %s GuildRoleAddNotAllowed=You are not allowed to add %s! GuildRoleAddInfo=Add a role to yourself! +[CommandCharacterEditName] +CharacterEditNameInfo= +CharacterEditNameNotValid= +CharacterEditNameIDNotValid= +CharacterEditNameSuccess= +CharacterEditNameNotAuth= + [CommandColiru] ColiruError=Please provide some c++ code to attempt to compile! ColiruInfo=Will try to compile any c++ code you put in! Supports up to C++14 standard, uses g++. @@ -199,10 +231,10 @@ YeetInfo=Yeet yourself or yeet a friend with @! CroutonInfo=Crouton [CommandCharacterCreate] -CharacterCreateDuplicate= -CharacterCreateInfo= -CharacterCreateSuccess= -CharacterCreateNullInfo= +CharacterCreateDuplicate=You can't create a character with the same name! +CharacterCreateInfo=Create a character for kitty to hold onto for you! `createcharacter name, shortbio, refURL` +CharacterCreateSuccess=You successfully created a character! +CharacterCreateNullInfo=There's not enough info! [CommandTeey] TeeyInfo=Teey yourself back into existance, or teey a friend with @! diff --git a/src/commands/CommandBeansShow.java b/src/commands/CommandBeansShow.java index b3e2493..8f25af7 100644 --- a/src/commands/CommandBeansShow.java +++ b/src/commands/CommandBeansShow.java @@ -9,21 +9,21 @@ public class CommandBeansShow extends Command public CommandBeansShow(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("BeansShowInfo"); }; + public String getHelpText() { return LocStrings.stub("BeansShowInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.mentions == null) - res.Call(String.format(LocStrings.Stub("BeansShowDisplay"), user.GetBeans())); + res.send(String.format(LocStrings.stub("BeansShowDisplay"), user.getBeans())); else { String mentionedBeans = ""; for(KittyUser mentioned:input.mentions) { - mentionedBeans += mentioned.name + " has " + mentioned.GetBeans() + " "; + mentionedBeans += mentioned.name + " has " + mentioned.getBeans() + " "; } - res.Call(String.format(LocStrings.Stub("BeansShowMentioned"), mentionedBeans)); + res.send(String.format(LocStrings.stub("BeansShowMentioned"), mentionedBeans)); } } } diff --git a/src/commands/CommandBenchmark.java b/src/commands/CommandBenchmark.java index d1cd585..bd66977 100644 --- a/src/commands/CommandBenchmark.java +++ b/src/commands/CommandBenchmark.java @@ -25,32 +25,32 @@ public class CommandBenchmark extends Command } @Override - public String HelpText() { return LocStrings.Stub("BenchmarkInfo"); } + public String getHelpText() { return LocStrings.stub("BenchmarkInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - framework.Update(); + framework.update(); if(input.args == null || input.args.length() == 0) { - String output = HelpText(); - res.Call(output); + String output = getHelpText(); + res.send(output); return; } BenchmarkFormattable commandOutput = null; synchronized(framework) { - commandOutput = framework.Run(input.args.trim()); + commandOutput = framework.run(input.args.trim()); } if(commandOutput == null) { - res.Call(LocStrings.Stub("BenchmarkInvalid")); + res.send(LocStrings.stub("BenchmarkInvalid")); return; } - commandOutput.Call(res); + commandOutput.call(res); } } \ No newline at end of file diff --git a/src/commands/CommandBetBeans.java b/src/commands/CommandBetBeans.java index 5c3dd6d..19618a6 100644 --- a/src/commands/CommandBetBeans.java +++ b/src/commands/CommandBetBeans.java @@ -11,10 +11,10 @@ public class CommandBetBeans extends Command public CommandBetBeans(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("BetBeansInfo"); } + public String getHelpText() { return LocStrings.stub("BetBeansInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String call = ""; int bet = 0; @@ -24,41 +24,41 @@ public class CommandBetBeans extends Command bet = Integer.parseInt(input.args); if(bet < 50) { - res.Call(LocStrings.Stub("BetBeansLowBet")); + res.send(LocStrings.stub("BetBeansLowBet")); return; } } catch (NumberFormatException e) { - res.Call(LocStrings.Stub("BetBeansNotValid")); + res.send(LocStrings.stub("BetBeansNotValid")); return; } - if(user.GetBeans() < bet) + if(user.getBeans() < bet) { - res.Call(LocStrings.Stub("BetBeansNotEnough")); + res.send(LocStrings.stub("BetBeansNotEnough")); return; } - user.ChangeBeans(-bet); + user.changeBeans(-bet); int [] slots = getSlots(); call += slotString(slots); slots = sort(slots); win = getWinning(slots); - res.Call(call); + res.send(call); if(win == 0) { - res.Call(LocStrings.Stub("BetBeansLose")); - guild.beans.Add(bet); + res.send(LocStrings.stub("BetBeansLose")); + guild.beans.add(bet); return; } - user.ChangeBeans(bet*win); - guild.beans.Subtract(bet*win); - res.Call(String.format(LocStrings.Stub("BetBeansWin"), "" + (bet*win))); + user.changeBeans(bet*win); + guild.beans.subtract(bet*win); + res.send(String.format(LocStrings.stub("BetBeansWin"), "" + (bet*win))); } private int getWinning(int [] slots) diff --git a/src/commands/CommandBetHistory.java b/src/commands/CommandBetHistory.java index 0a190a1..0f7b541 100644 --- a/src/commands/CommandBetHistory.java +++ b/src/commands/CommandBetHistory.java @@ -15,11 +15,11 @@ public class CommandBetHistory extends Command public CommandBetHistory(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("BetHistoryInfo"); } + public String getHelpText() { return LocStrings.stub("BetHistoryInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - res.Call(String.format(LocStrings.Stub("BetHistoryOutput"), guild.beans.Get())); + res.send(String.format(LocStrings.stub("BetHistoryOutput"), guild.beans.get())); } } \ No newline at end of file diff --git a/src/commands/CommandBlurry.java b/src/commands/CommandBlurry.java index c875ff2..221cc80 100644 --- a/src/commands/CommandBlurry.java +++ b/src/commands/CommandBlurry.java @@ -17,12 +17,12 @@ public class CommandBlurry extends Command public CommandBlurry(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("BlurryInfo"); }; + public String getHelpText() { return LocStrings.stub("BlurryInfo"); }; private static Long num = 0l; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; String filename = null; @@ -39,7 +39,7 @@ public class CommandBlurry extends Command { try { - filename = ImageUtils.DownloadFromURL(input.args.split(" ")[0], ".png"); + filename = ImageUtils.downloadFromURL(input.args.split(" ")[0], ".png"); preProcessed = new File(filename); } catch(Exception e) @@ -48,12 +48,12 @@ public class CommandBlurry extends Command if(input.mentions != null) person = input.mentions[0]; - filename = ImageUtils.DownloadFromURL(person.avatarID, ".png"); + filename = ImageUtils.downloadFromURL(person.avatarID, ".png"); if(filename == null) return; } preProcessed = new File(filename); - ApplySnap(ImageIO.read(preProcessed), name); + applySnap(ImageIO.read(preProcessed), name); } catch (IOException e) { @@ -61,13 +61,13 @@ public class CommandBlurry extends Command } postProcessed = new File(name); - res.CallFile(postProcessed, "png"); + res.sendFile(postProcessed, "png"); - ImageUtils.BlockingFileDelete(preProcessed); - ImageUtils.BlockingFileDelete(postProcessed); + ImageUtils.blockingFileDelete(preProcessed); + ImageUtils.blockingFileDelete(postProcessed); } - private static void ApplySnap(BufferedImage image, String name) throws IOException + private static void applySnap(BufferedImage image, String name) throws IOException { BufferedImage blurred = ImageUtils.copyImage(image); // Iterate over each column left to right and touch up each pixel diff --git a/src/commands/CommandBoop.java b/src/commands/CommandBoop.java index 6774212..fc4a1c3 100644 --- a/src/commands/CommandBoop.java +++ b/src/commands/CommandBoop.java @@ -19,22 +19,22 @@ public class CommandBoop extends Command public BoopTracker() { super("booptracker"); } - public void ApplyBoop() + public void applyBoop() { ++boops; - MarkDirty(); + markDirty(); } - public int HowMany() + public int howMany() { return boops; } @Override - public String Serialize() { return "" + boops; } + public String serialize() { return "" + boops; } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { try { @@ -42,9 +42,9 @@ public class CommandBoop extends Command } catch (NumberFormatException e) { - GlobalLog.Warn(LogFilter.Command, "No valid value was found for boops! Starting over at 0!"); + GlobalLog.warn(LogFilter.Command, "No valid value was found for boops! Starting over at 0!"); boops = 0; - MarkDirty(); + markDirty(); } } } @@ -60,37 +60,37 @@ public class CommandBoop extends Command } @Override - public String HelpText() { return LocStrings.Stub("BoopInfo"); } + public String getHelpText() { return LocStrings.stub("BoopInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.mentions == null) { - boopTracker.ApplyBoop(); - res.Call(String.format(LocStrings.Stub("BoopStandard"), user.name, boopTracker.HowMany())); + boopTracker.applyBoop(); + res.send(String.format(LocStrings.stub("BoopStandard"), user.name, boopTracker.howMany())); } else { if(input.mentions.length == 1) { - boopTracker.ApplyBoop(); - res.Call(String.format(LocStrings.Stub("BoopPerson"), user.name, input.mentions[0].name)); + boopTracker.applyBoop(); + res.send(String.format(LocStrings.stub("BoopPerson"), user.name, input.mentions[0].name)); return; } String booped = ""; for(int i = 0; i < input.mentions.length; i++) { - boopTracker.ApplyBoop(); + boopTracker.applyBoop(); if(i < input.mentions.length-1) booped += input.mentions[i].name + ", "; else booped += "and " + input.mentions[i].name; } - res.Call(String.format(LocStrings.Stub("BoopMultiple"), user.name, booped)); + res.send(String.format(LocStrings.stub("BoopMultiple"), user.name, booped)); } } } \ No newline at end of file diff --git a/src/commands/CommandCatch.java b/src/commands/CommandCatch.java index fac6208..ceaa01d 100644 --- a/src/commands/CommandCatch.java +++ b/src/commands/CommandCatch.java @@ -23,11 +23,11 @@ public class CommandCatch extends Command private static Long num = 0l; @Override - public String HelpText() { return LocStrings.Stub("CatchInfo"); } + public String getHelpText() { return LocStrings.stub("CatchInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; File catchFile = null; @@ -48,13 +48,13 @@ public class CommandCatch extends Command else person = input.mentions[0]; - String catchFilename = ImageUtils.DownloadFromURL(person.avatarID, ".png"); + String catchFilename = ImageUtils.downloadFromURL(person.avatarID, ".png"); if(catchFilename == null) return; catcheeFile = new File(catchFilename); ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/catch/frames/", "catch ", 92, 18); - builder.Overlay(ImageIO.read(catcheeFile), name); + builder.overlay(ImageIO.read(catcheeFile), name); } catch (IOException e) { @@ -62,10 +62,10 @@ public class CommandCatch extends Command } catchFile = new File (name); - res.CallFile(catchFile, "gif"); + res.sendFile(catchFile, "gif"); // Thread cleanup... - ImageUtils.BlockingFileDelete(catchFile); - ImageUtils.BlockingFileDelete(catcheeFile); + ImageUtils.blockingFileDelete(catchFile); + ImageUtils.blockingFileDelete(catcheeFile); } } diff --git a/src/commands/CommandChangeIndicator.java b/src/commands/CommandChangeIndicator.java index 287ce3e..e3d73e8 100644 --- a/src/commands/CommandChangeIndicator.java +++ b/src/commands/CommandChangeIndicator.java @@ -9,26 +9,26 @@ public class CommandChangeIndicator extends Command public CommandChangeIndicator(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("ChangeIndicatorInfo"); } + public String getHelpText() { return LocStrings.stub("ChangeIndicatorInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String arg = input.args.trim(); if(arg.length() == 0) { - res.Call(LocStrings.Stub("ChangeIndicatorError")); + res.send(LocStrings.stub("ChangeIndicatorError")); return; } String indicator = arg.substring(0, 1); if(indicator.charAt(0) == '\n' || indicator.charAt(0) == '\t' || indicator.charAt(0) == '\r') { - res.Call(LocStrings.Lookup("ChangeIndicatorError")); + res.send(LocStrings.lookup("ChangeIndicatorError")); return; } - guild.SetCommandIndicator(indicator); - res.Call(String.format(LocStrings.Stub("ChangeIndicatorChanged"), guild.GetCommandIndicator())); + guild.setCommandIndicator(indicator); + res.send(String.format(LocStrings.stub("ChangeIndicatorChanged"), guild.getCommandIndicator())); } } diff --git a/src/commands/CommandCharacterCreate.java b/src/commands/CommandCharacterCreate.java index 2ab4c07..0933ed8 100644 --- a/src/commands/CommandCharacterCreate.java +++ b/src/commands/CommandCharacterCreate.java @@ -13,26 +13,25 @@ import dataStructures.UserInput; public class CommandCharacterCreate extends Command { -public CommandCharacterCreate(KittyRole level, KittyRating rating) { super(level, rating); } + public CommandCharacterCreate(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("CharacterCreateInfo"); } + public String getHelpText() { return LocStrings.stub("CharacterCreateInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String [] info = input.args.split(","); if(info.length < 3) { - res.Call(LocStrings.Stub("CharacterCreateNullInfo")); + res.send(LocStrings.stub("CharacterCreateNullInfo")); return; } if(CharacterManager.instance.addCharacter(user, info[0], info[1], info[2])) { - res.Call(LocStrings.Stub("CharacterCreateSuccess")); + res.send(LocStrings.stub("CharacterCreateSuccess")); return; } - res.Call(LocStrings.Stub("CharacterCreateDuplicate")); - - } + res.send(LocStrings.stub("CharacterCreateDuplicate")); + } } \ No newline at end of file diff --git a/src/commands/CommandCharacterEditBio.java b/src/commands/CommandCharacterEditBio.java new file mode 100644 index 0000000..4d42579 --- /dev/null +++ b/src/commands/CommandCharacterEditBio.java @@ -0,0 +1,38 @@ +package commands; + +import core.CharacterManager; +import core.Command; +import core.LocStrings; +import dataStructures.*; + +public class CommandCharacterEditBio extends Command +{ + public CommandCharacterEditBio(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public String getHelpText() { return LocStrings.stub("CharacterEditBioInfo"); } + + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + try + { + Long.parseLong(input.args.split(" ")[0]); + } + catch(Exception e) + { + res.send(LocStrings.stub("CharacterEditBioNotValid")); + return; + } + KittyCharacter character = CharacterManager.instance.searchCharacter(input.args.split(" ")[0]).get(0); + if(character.getOwner().equals(user)) + { + CharacterManager.instance.editBio(character, input.args.substring(input.args.indexOf(' '))); + res.send(LocStrings.stub("CharacterEditBioSuccess")); + } + else + { + res.send(LocStrings.stub("CharacterEditBioNotAuth")); + } + } +} \ No newline at end of file diff --git a/src/commands/CommandCharacterEditName.java b/src/commands/CommandCharacterEditName.java new file mode 100644 index 0000000..7382331 --- /dev/null +++ b/src/commands/CommandCharacterEditName.java @@ -0,0 +1,38 @@ +package commands; + +import core.CharacterManager; +import core.Command; +import core.LocStrings; +import dataStructures.*; + +public class CommandCharacterEditName extends Command +{ + public CommandCharacterEditName(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public String getHelpText() { return LocStrings.stub("CharacterEditNameInfo"); } + + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + try + { + Long.parseLong(input.args.split(" ")[0]); + } + catch(Exception e) + { + res.send(LocStrings.stub("CharacterEditNameNotValid")); + return; + } + KittyCharacter character = CharacterManager.instance.searchCharacter(input.args.split(" ")[0]).get(0); + if(character.getOwner().equals(user)) + { + CharacterManager.instance.editName(character, input.args.substring(input.args.indexOf(' '))); + res.send(LocStrings.stub("CharacterEditNameSuccess")); + } + else + { + res.send(LocStrings.stub("CharacterEditNameNotAuth")); + } + } +} \ No newline at end of file diff --git a/src/commands/CommandCharacterEditURL.java b/src/commands/CommandCharacterEditURL.java new file mode 100644 index 0000000..39a8c5c --- /dev/null +++ b/src/commands/CommandCharacterEditURL.java @@ -0,0 +1,38 @@ +package commands; + +import core.CharacterManager; +import core.Command; +import core.LocStrings; +import dataStructures.*; + +public class CommandCharacterEditURL extends Command +{ + public CommandCharacterEditURL(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public String getHelpText() { return LocStrings.stub("CharacterEditURLInfo"); } + + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + try + { + Long.parseLong(input.args.split(" ")[0]); + } + catch(Exception e) + { + res.send(LocStrings.stub("CharacterEditURLNotValid")); + return; + } + KittyCharacter character = CharacterManager.instance.searchCharacter(input.args.split(" ")[0]).get(0); + if(character.getOwner().equals(user)) + { + CharacterManager.instance.editRefImage(character, input.args.substring(input.args.indexOf(' '))); + res.send(LocStrings.stub("CharacterEditURLSuccess")); + } + else + { + res.send(LocStrings.stub("CharacterEditURLNotAuth")); + } + } +} \ No newline at end of file diff --git a/src/commands/CommandCharacterSearch.java b/src/commands/CommandCharacterSearch.java new file mode 100644 index 0000000..5cabef0 --- /dev/null +++ b/src/commands/CommandCharacterSearch.java @@ -0,0 +1,40 @@ +package commands; + +import java.util.ArrayList; + +import core.CharacterManager; +import core.Command; +import core.LocStrings; +import dataStructures.*; + +public class CommandCharacterSearch extends Command +{ + public CommandCharacterSearch(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public String getHelpText() { return LocStrings.stub("CharacterSearchInfo"); } + + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + ArrayList characters = CharacterManager.instance.searchCharacter(input.args); + if(characters.size() < 1) + { + res.send(LocStrings.stub("CharacterSearchNoCharacterFound")); + return; + } + if(characters.size() > 1) + { + res.send(LocStrings.stub("CharacterSearchMultipleCharacterHeader")); + for(KittyCharacter character:characters) + { + res.send(String.format(LocStrings.stub("CharacterSearchMultipleCharacter"), character.getName(), character.getOwner().name, character.getUID())); + } + return; + } + else + { + res.send(String.format(LocStrings.stub("CharacterSearchOneCharacter"), characters.get(0).getOwner().name, characters.get(0).getName(), characters.get(0).getBio(), characters.get(0).getRefImage(), characters.get(0).getUID())); + } + } +} \ No newline at end of file diff --git a/src/commands/CommandChoose.java b/src/commands/CommandChoose.java index e68f783..bb71dd4 100644 --- a/src/commands/CommandChoose.java +++ b/src/commands/CommandChoose.java @@ -14,18 +14,25 @@ public class CommandChoose extends Command public CommandChoose(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("ChooseInfo"); } + public String getHelpText() { return LocStrings.stub("ChooseInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - String [] choices = input.args.split(","); - if(choices.length == 1) + if(input.args.trim().length() == 0) { - res.Call(LocStrings.Stub("ChooseOne")); + res.send(Stats.instance.getHelpText(input.key)); return; } - res.Call(String.format(LocStrings.Stub("ChooseChoice"), (choices[(int) (Math.random()*choices.length)]).toString())); + String [] choices = input.args.split(","); + + if(choices.length == 1) + { + res.send(LocStrings.stub("ChooseOne")); + return; + } + + res.send(String.format(LocStrings.stub("ChooseChoice"), (choices[(int) (Math.random()*choices.length)]).toString())); } } diff --git a/src/commands/CommandColiru.java b/src/commands/CommandColiru.java index b2f5f8e..9dc39c1 100644 --- a/src/commands/CommandColiru.java +++ b/src/commands/CommandColiru.java @@ -12,18 +12,18 @@ public class CommandColiru extends Command public CommandColiru(KittyRole level, KittyRating rating) { super(level, rating);} @Override - public String HelpText() { return LocStrings.Stub("ColiruInfo"); } + public String getHelpText() { return LocStrings.stub("ColiruInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args.trim().length() < 1) { - res.Call(LocStrings.Stub("ColiruError")); + res.send(LocStrings.stub("ColiruError")); return; } - res.Call(compiler.compileCPlus(input.args)); + res.send(compiler.compileCPlusPlus(input.args)); } } diff --git a/src/commands/CommandColor.java b/src/commands/CommandColor.java new file mode 100644 index 0000000..a4c2059 --- /dev/null +++ b/src/commands/CommandColor.java @@ -0,0 +1,83 @@ +package commands; + +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.io.File; + +import core.Command; +import core.LocStrings; +import dataStructures.KittyChannel; +import dataStructures.KittyEmbed; +import dataStructures.KittyGuild; +import dataStructures.KittyRating; +import dataStructures.KittyRole; +import dataStructures.KittyUser; +import dataStructures.Response; +import dataStructures.UserInput; +import network.NetworkTheColorAPI; +import network.NetworkTheColorAPI.ColorData; +import utils.ImageUtils; + +public class CommandColor extends Command +{ + private NetworkTheColorAPI theColorAPI = new NetworkTheColorAPI(); + + public CommandColor(KittyRole level, KittyRating rating) { super(level, rating); } + + @Override + public String getHelpText() { return LocStrings.stub("ColorInfo"); } + + @Override + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + { + // First, try and parse out the color to make sure we can even get it. + ColorData colorData = theColorAPI.lookupHex(input.args.trim()); + + // Verify the color was even found + if(colorData == null) + { + res.send(LocStrings.stub("ColorNotSearchable")); + return; + } + + // Set up the variables we'll be using based on the color, and get the color itself. + int sideLength = 80; // It's 80x80 because as far as I know, that's the size of a thumbnail in discord. + int r = colorData.rgb.r; + int g = colorData.rgb.g; + int b = colorData.rgb.b; + int a = 255; // Alpha not supported at this time + Color parsed = new Color(r, g, b, a); + + // Construct the image example file that we intend to display locally + BufferedImage img = new BufferedImage(sideLength, sideLength, BufferedImage.TYPE_4BYTE_ABGR); + Graphics2D graphics = img.createGraphics(); + graphics.setColor(parsed); + graphics.fillRect(0, 0, sideLength, sideLength); + graphics.dispose(); + + String tempFileName = ImageUtils.writeTempImageData(img, ".png"); + File file = new File(tempFileName); + + // Build the response + KittyEmbed response = new KittyEmbed(); + String postEntry = ", "; + response.title = colorData.name.value + (colorData.name.exact_match_name ? "" : " (ish)"); + response.color = parsed; + response.descriptionText = "```"; + response.descriptionText += "\n hex: #" + colorData.hex.clean; + response.descriptionText += "\n rgb: " + String.format("%1$03d", r) + postEntry + String.format("%1$03d", g) + postEntry + String.format("%1$03d", b); + response.descriptionText += "\n hsl: " + String.format("%1$03d", colorData.hsl.h) + postEntry + String.format("%1$02d", colorData.hsl.s) + "%" + postEntry + String.format("%1$02d", colorData.hsl.l) + "%"; + response.descriptionText += "\n hsv: " + String.format("%1$03d", colorData.hsv.h) + postEntry + String.format("%1$02d", colorData.hsv.s) + "%" + postEntry + String.format("%1$02d", colorData.hsv.v) + "%"; + response.descriptionText += "\n xyz: " + String.format("%1$03d", colorData.XYZ.X) + postEntry + String.format("%1$03d", colorData.XYZ.Y) + postEntry + String.format("%1$03d", colorData.XYZ.Z); + response.descriptionText += "\ncmyk: " + String.format("%1$03d", colorData.cmyk.c) + postEntry + String.format("%1$03d", colorData.cmyk.m) + postEntry + String.format("%1$03d", colorData.cmyk.y) + postEntry + String.format("%1$03d", colorData.cmyk.k); + response.descriptionText += "```"; + response.thumbnailURL = "attachment://" + tempFileName; + response.footerText = "All percentages and values are rounded to the nearest whole number!" + (colorData.name.exact_match_name ? "" : " '" + colorData.name.value + "' is actually " + colorData.name.closest_named_hex + "."); + + // Send then delete the temp local files + res.send(response); + ImageUtils.blockingFileDelete(file); + }; + +} diff --git a/src/commands/CommandCrouton.java b/src/commands/CommandCrouton.java index e08821c..7552b87 100644 --- a/src/commands/CommandCrouton.java +++ b/src/commands/CommandCrouton.java @@ -18,10 +18,10 @@ public class CommandCrouton extends Command public CommandCrouton(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("CroutonInfo"); }; + public String getHelpText() { return LocStrings.stub("CroutonInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { KittyEmbed embed = new KittyEmbed(); embed.authorImage = "https://crouton.net/crouton.png"; @@ -34,7 +34,7 @@ public class CommandCrouton extends Command embed.imageURL = "https://crouton.net/crouton.png"; - res.CallEmbed(embed); + res.send(embed); } } diff --git a/src/commands/CommandDBFlush.java b/src/commands/CommandDBFlush.java index 506d3c2..982c0fa 100644 --- a/src/commands/CommandDBFlush.java +++ b/src/commands/CommandDBFlush.java @@ -18,10 +18,10 @@ public class CommandDBFlush extends Command public CommandDBFlush(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("DBFlushInfo"); } + public String getHelpText() { return LocStrings.stub("DBFlushInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { int numUpdated = DatabaseManager.instance.upkeep(); @@ -30,6 +30,6 @@ public class CommandDBFlush extends Command embed.descriptionText = "**Dirty:** " + numUpdated; embed.color = Config.ColorDefault; - res.CallEmbed(embed); + res.send(embed); } } diff --git a/src/commands/CommandDBStats.java b/src/commands/CommandDBStats.java index ea0641d..de1fcd5 100644 --- a/src/commands/CommandDBStats.java +++ b/src/commands/CommandDBStats.java @@ -26,10 +26,10 @@ public class CommandDBStats extends Command } @Override - public String HelpText() { return LocStrings.Stub("DBStatsInfo"); } + public String getHelpText() { return LocStrings.stub("DBStatsInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { KittyEmbed embed = new KittyEmbed(); embed.title = "Database Info"; @@ -38,6 +38,6 @@ public class CommandDBStats extends Command embed.descriptionText += "**Last Upkeep:** " + dateFormat.format(DatabaseManager.instance.getLastUpkeep()) + " UTC-7"; embed.color = Config.ColorDefault; - res.CallEmbed(embed); + res.send(embed); } } diff --git a/src/commands/CommandDoWork.java b/src/commands/CommandDoWork.java index c37f85f..1cbc063 100644 --- a/src/commands/CommandDoWork.java +++ b/src/commands/CommandDoWork.java @@ -15,11 +15,11 @@ public class CommandDoWork extends Command public CommandDoWork(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("DoWorkInfo"); } + public String getHelpText() { return LocStrings.stub("DoWorkInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { @SuppressWarnings("unused") long thispieceofshit = 0; @@ -28,6 +28,6 @@ public class CommandDoWork extends Command thispieceofshit += Math.log((double)i); } - res.Call(LocStrings.Stub("DoWorkFinished")); + res.send(LocStrings.stub("DoWorkFinished")); } } \ No newline at end of file diff --git a/src/commands/CommandEightBall.java b/src/commands/CommandEightBall.java index 2e90413..2b97f79 100644 --- a/src/commands/CommandEightBall.java +++ b/src/commands/CommandEightBall.java @@ -8,41 +8,41 @@ public class CommandEightBall extends Command { String [] answers = { - LocStrings.Stub("EightBallYes1") - , LocStrings.Stub("EightBallYes2") - , LocStrings.Stub("EightBallYes3") - , LocStrings.Stub("EightBallYes4") - , LocStrings.Stub("EightBallYes5") - , LocStrings.Stub("EightBallYes6") - , LocStrings.Stub("EightBallYes7") - , LocStrings.Stub("EightBallYes8") - , LocStrings.Stub("EightBallYes9") - , LocStrings.Stub("EightBallYes10") + LocStrings.stub("EightBallYes1") + , LocStrings.stub("EightBallYes2") + , LocStrings.stub("EightBallYes3") + , LocStrings.stub("EightBallYes4") + , LocStrings.stub("EightBallYes5") + , LocStrings.stub("EightBallYes6") + , LocStrings.stub("EightBallYes7") + , LocStrings.stub("EightBallYes8") + , LocStrings.stub("EightBallYes9") + , LocStrings.stub("EightBallYes10") - , LocStrings.Stub("EightBallMaybe1") - , LocStrings.Stub("EightBallMaybe2") - , LocStrings.Stub("EightBallMaybe3") - , LocStrings.Stub("EightBallMaybe4") - , LocStrings.Stub("EightBallMaybe5") + , LocStrings.stub("EightBallMaybe1") + , LocStrings.stub("EightBallMaybe2") + , LocStrings.stub("EightBallMaybe3") + , LocStrings.stub("EightBallMaybe4") + , LocStrings.stub("EightBallMaybe5") - , LocStrings.Stub("EightBallNo1") - , LocStrings.Stub("EightBallNo2") - , LocStrings.Stub("EightBallNo3") - , LocStrings.Stub("EightBallNo4") - , LocStrings.Stub("EightBallNo5") + , LocStrings.stub("EightBallNo1") + , LocStrings.stub("EightBallNo2") + , LocStrings.stub("EightBallNo3") + , LocStrings.stub("EightBallNo4") + , LocStrings.stub("EightBallNo5") }; public CommandEightBall(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("EightBallInfo"); } + public String getHelpText() { return LocStrings.stub("EightBallInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args.trim().length() < 1) - res.Call(LocStrings.Stub("EightBallError")); + res.send(LocStrings.stub("EightBallError")); - res.Call(answers[(int) (Math.random()*answers.length)]); + res.send(answers[(int) (Math.random()*answers.length)]); } } diff --git a/src/commands/CommandFetch.java b/src/commands/CommandFetch.java index 569c3c4..29c578a 100644 --- a/src/commands/CommandFetch.java +++ b/src/commands/CommandFetch.java @@ -15,10 +15,10 @@ public class CommandFetch extends Command public CommandFetch(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("FetchInfo"); } + public String getHelpText() { return LocStrings.stub("FetchInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String emote = input.args.split(" ")[0]; if(emote.startsWith("<") && emote.endsWith(">")) @@ -27,30 +27,30 @@ public class CommandFetch extends Command switch(num) { case 1: - res.Call(String.format(LocStrings.Stub("FetchBringBack"), emote)); + res.send(String.format(LocStrings.stub("FetchBringBack"), emote)); break; case 2: - res.Call(String.format(LocStrings.Stub("FetchRunAway"))); + res.send(String.format(LocStrings.stub("FetchRunAway"))); break; case 3: - res.Call(String.format(LocStrings.Stub("FetchBringBackWrong"), guild.emoji.get((int)(Math.random() * guild.emoji.size()) + 1))); + res.send(String.format(LocStrings.stub("FetchBringBackWrong"), guild.emoji.get((int)(Math.random() * guild.emoji.size()) + 1))); break; case 4: - res.Call(String.format(LocStrings.Stub("FetchEat"), emote)); + res.send(String.format(LocStrings.stub("FetchEat"), emote)); break; case 5: - res.Call(String.format(LocStrings.Stub("FetchCatchRun"), emote)); + res.send(String.format(LocStrings.stub("FetchCatchRun"), emote)); break; case 6: - res.Call(String.format(LocStrings.Stub("FetchStare"), user.name)); + res.send(String.format(LocStrings.stub("FetchStare"), user.name)); break; default: - res.Call("" + num); + res.send("" + num); } } else { - res.Call(String.format(LocStrings.Stub("FetchError"))); + res.send(String.format(LocStrings.stub("FetchError"))); System.out.println(emote); } } diff --git a/src/commands/CommandGiveBeans.java b/src/commands/CommandGiveBeans.java index 11df36b..51f55bb 100644 --- a/src/commands/CommandGiveBeans.java +++ b/src/commands/CommandGiveBeans.java @@ -9,15 +9,15 @@ public class CommandGiveBeans extends Command public CommandGiveBeans (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GiveBeansInfo"); } + public String getHelpText() { return LocStrings.stub("GiveBeansInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { // First, make sure someone is mentioned if(input.mentions == null) { - res.Call(LocStrings.Stub("GiveBeansNoneMentioned")); + res.send(LocStrings.stub("GiveBeansNoneMentioned")); return; } @@ -42,15 +42,15 @@ public class CommandGiveBeans extends Command // If there wasn't a number we could find, well, nothing we can do. if(beans == null) { - res.Call(LocStrings.Stub("GiveBeansInvalid")); + res.send(LocStrings.stub("GiveBeansInvalid")); return; } // Go through all the mentions and make sure every user is given beans! for(int i = 0; i < input.mentions.length; i++) { - input.mentions[i].ChangeBeans(beans); - res.Call(String.format(LocStrings.Stub("GiveBeansSuccess"), input.mentions[i].name, "" + beans)); + input.mentions[i].changeBeans(beans); + res.send(String.format(LocStrings.stub("GiveBeansSuccess"), input.mentions[i].name, "" + beans)); } } } diff --git a/src/commands/CommandGuildRoleAdd.java b/src/commands/CommandGuildRoleAdd.java index f99ea33..b4d212e 100644 --- a/src/commands/CommandGuildRoleAdd.java +++ b/src/commands/CommandGuildRoleAdd.java @@ -15,26 +15,26 @@ public class CommandGuildRoleAdd extends Command public CommandGuildRoleAdd(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GuildRoleAddInfo"); }; + public String getHelpText() { return LocStrings.stub("GuildRoleAddInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String role = input.args.split(" ")[0]; if(guild.roleList.contains(role)) { if(guild.control.addRole(user.discordID, role)) { - res.Call(String.format(LocStrings.Stub("GuildRoleAddSuccess"), role, user.name)); + res.send(String.format(LocStrings.stub("GuildRoleAddSuccess"), role, user.name)); } else { - res.Call(String.format(LocStrings.Stub("GuildRoleAddFailure"), role, user.name)); + res.send(String.format(LocStrings.stub("GuildRoleAddFailure"), role, user.name)); } } else { - res.Call(String.format(LocStrings.Stub("GuildRoleAddNotAllowed"), role)); + res.send(String.format(LocStrings.stub("GuildRoleAddNotAllowed"), role)); } } } \ No newline at end of file diff --git a/src/commands/CommandGuildRoleAllowed.java b/src/commands/CommandGuildRoleAllowed.java index 6e30d59..cc40bb2 100644 --- a/src/commands/CommandGuildRoleAllowed.java +++ b/src/commands/CommandGuildRoleAllowed.java @@ -15,10 +15,10 @@ public class CommandGuildRoleAllowed extends Command public CommandGuildRoleAllowed(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GuildRoleAllowedInfo"); } + public String getHelpText() { return LocStrings.stub("GuildRoleAllowedInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String [] roles = input.args.split(","); String role; @@ -27,12 +27,12 @@ public class CommandGuildRoleAllowed extends Command role = roles[i].trim(); if(guild.roleList.contains(role)) { - res.Call(LocStrings.Stub("GuildRoleAllowedDuplicate")); + res.send(LocStrings.stub("GuildRoleAllowedDuplicate")); } else { guild.roleList.add(role); - res.Call(String.format(LocStrings.Stub("GuildRoleAllowedSuccess"), role)); + res.send(String.format(LocStrings.stub("GuildRoleAllowedSuccess"), role)); } } } diff --git a/src/commands/CommandGuildRoleList.java b/src/commands/CommandGuildRoleList.java index b150286..f23a30e 100644 --- a/src/commands/CommandGuildRoleList.java +++ b/src/commands/CommandGuildRoleList.java @@ -12,12 +12,12 @@ public class CommandGuildRoleList extends Command public CommandGuildRoleList(KittyRole level, KittyRating rating) { super(level, rating);} @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String roles = ""; if(guild.roleList.isEmpty()) { - res.Call(String.format(LocStrings.Stub("GuildRoleListEmpty"))); + res.send(String.format(LocStrings.stub("GuildRoleListEmpty"))); return; } for(int i = 0; i < guild.roleList.size(); i++) @@ -26,6 +26,6 @@ public class CommandGuildRoleList extends Command roles += " and "; roles += guild.roleList.get(i); } - res.Call(String.format(LocStrings.Stub("GuildRoleListOutput"), roles)); + res.send(String.format(LocStrings.stub("GuildRoleListOutput"), roles)); } } \ No newline at end of file diff --git a/src/commands/CommandGuildRoleNotAllowed.java b/src/commands/CommandGuildRoleNotAllowed.java index 90d244a..d95c440 100644 --- a/src/commands/CommandGuildRoleNotAllowed.java +++ b/src/commands/CommandGuildRoleNotAllowed.java @@ -15,10 +15,10 @@ public class CommandGuildRoleNotAllowed extends Command public CommandGuildRoleNotAllowed(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GuildRoleNotAllowedInfo"); } + public String getHelpText() { return LocStrings.stub("GuildRoleNotAllowedInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String [] roles = input.args.split(","); String role; @@ -28,11 +28,11 @@ public class CommandGuildRoleNotAllowed extends Command if(guild.roleList.contains(role)) { guild.roleList.remove(role); - res.Call(LocStrings.Stub("GuildRoleNotAllowedSuccess")); + res.send(LocStrings.stub("GuildRoleNotAllowedSuccess")); } else { - res.Call(String.format(LocStrings.Stub("GuildRoleNotAllowedFailure"), role)); + res.send(String.format(LocStrings.stub("GuildRoleNotAllowedFailure"), role)); } } } diff --git a/src/commands/CommandGuildRoleRemove.java b/src/commands/CommandGuildRoleRemove.java index 0ae47da..32ab8e6 100644 --- a/src/commands/CommandGuildRoleRemove.java +++ b/src/commands/CommandGuildRoleRemove.java @@ -15,26 +15,26 @@ public class CommandGuildRoleRemove extends Command public CommandGuildRoleRemove(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("GuildRoleRemoveInfo"); }; + public String getHelpText() { return LocStrings.stub("GuildRoleRemoveInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String role = input.args.split(" ")[0]; if(guild.roleList.contains(role)) { if(guild.control.removeRole(user.discordID, role)) { - res.Call(String.format(LocStrings.Stub("GuildRoleRemoveSuccess"), role, user.name)); + res.send(String.format(LocStrings.stub("GuildRoleRemoveSuccess"), role, user.name)); } else { - res.Call(String.format(LocStrings.Stub("GuildRoleRemoveFailure"), role, user.name)); + res.send(String.format(LocStrings.stub("GuildRoleRemoveFailure"), role, user.name)); } } else { - res.Call(String.format(LocStrings.Stub("GuildRoleRemoveNotAllowed"), role)); + res.send(String.format(LocStrings.stub("GuildRoleRemoveNotAllowed"), role)); } } } \ No newline at end of file diff --git a/src/commands/CommandHelp.java b/src/commands/CommandHelp.java index fd5bd0f..41d33ec 100644 --- a/src/commands/CommandHelp.java +++ b/src/commands/CommandHelp.java @@ -15,23 +15,19 @@ public class CommandHelp extends Command public CommandHelp(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("HelpInfo"); } + public String getHelpText() { return LocStrings.stub("HelpInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - String help = Stats.instance.GetHelpText(input.args); + String help = Stats.instance.getHelpText(input.args); if(help == null) { - help = LocStrings.Stub("HelpDisplay"); - } - else - { - help = "`" + input.args + "`: " + help; + help = LocStrings.stub("HelpDisplay"); } - res.Call(help); + res.send(help); } } \ No newline at end of file diff --git a/src/commands/CommandHelpBuilder.java b/src/commands/CommandHelpBuilder.java index 89ef69b..85c46f5 100644 --- a/src/commands/CommandHelpBuilder.java +++ b/src/commands/CommandHelpBuilder.java @@ -26,10 +26,10 @@ public class CommandHelpBuilder extends Command { } @Override - public String HelpText() { return LocStrings.Stub("HelpBuilderInfo"); } + public String getHelpText() { return LocStrings.stub("HelpBuilderInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { // Holds command groups HashMap> commandsByRole = new HashMap>(); @@ -39,18 +39,18 @@ public class CommandHelpBuilder extends Command { commandsByRole.put(KittyRole.values()[i], new ArrayList()); // Sort commands out - ArrayList commands = Stats.instance.GetAllCommands(); + ArrayList commands = Stats.instance.getAllCommands(); for(int i = 0; i < commands.size(); ++i) { Command current = commands.get(i); - commandsByRole.get(current.RequiredRole()).add(current); + commandsByRole.get(current.requiredRole()).add(current); } // Format outstring and send it back for now String out = ""; - out += PopulateSection(KittyRole.Admin, commandsByRole, true) + "\n"; - out += PopulateSection(KittyRole.Mod, commandsByRole, true) + "\n"; - out += PopulateSection(KittyRole.General, commandsByRole, false) + "\n"; + out += populateSection(KittyRole.Admin, commandsByRole, true) + "\n"; + out += populateSection(KittyRole.Mod, commandsByRole, true) + "\n"; + out += populateSection(KittyRole.General, commandsByRole, false) + "\n"; // Write out file String filename = "buildhelp_out.txt"; @@ -63,17 +63,17 @@ public class CommandHelpBuilder extends Command { } catch (FileNotFoundException e) { - GlobalLog.Error(e.toString()); + GlobalLog.error(e.toString()); return; } File file = new File(filename); - res.CallFile(file, "txt"); - ImageUtils.BlockingFileDelete(file); + res.sendFile(file, "txt"); + ImageUtils.blockingFileDelete(file); } // Generates the section for a specific role, optionally adding spacing after for another section - private String PopulateSection(KittyRole role, HashMap> commandsByRole, boolean delimitSection) + private String populateSection(KittyRole role, HashMap> commandsByRole, boolean delimitSection) { // Formatting variables final String headerStart = "

"; @@ -112,7 +112,7 @@ public class CommandHelpBuilder extends Command { commandsSoFar.add(command); // Write out all the keys and the help text - ArrayList keys = command.RegisteredNames(); + ArrayList keys = command.registeredNames(); for(int j = 0; j < keys.size(); ++j) { if(j != 0) @@ -121,7 +121,7 @@ public class CommandHelpBuilder extends Command { accumulated += leadStart + keys.get(j) + leadEnd; } - accumulated += leadFollow + commands.get(i).HelpText() + lineDelimiter;; + accumulated += leadFollow + commands.get(i).getHelpText() + lineDelimiter;; } accumulated += sectionEnd; diff --git a/src/commands/CommandInfo.java b/src/commands/CommandInfo.java index 7fee7bf..8869203 100644 --- a/src/commands/CommandInfo.java +++ b/src/commands/CommandInfo.java @@ -15,11 +15,11 @@ public class CommandInfo extends Command public CommandInfo(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("InfoInfo"); } + public String getHelpText() { return LocStrings.stub("InfoInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - res.Call(LocStrings.Stub("InfoResponse")); + res.send(LocStrings.stub("InfoResponse")); } } \ No newline at end of file diff --git a/src/commands/CommandInvite.java b/src/commands/CommandInvite.java index d74dda5..efb2f71 100644 --- a/src/commands/CommandInvite.java +++ b/src/commands/CommandInvite.java @@ -10,12 +10,12 @@ public class CommandInvite extends Command public CommandInvite(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("InviteInfo"); } + public String getHelpText() { return LocStrings.stub("InviteInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - res.Call("https://discordapp.com/oauth2/authorize?&client_id="+ Ref.CliID + res.send("https://discordapp.com/oauth2/authorize?&client_id="+ Ref.CliID +"&scope=bot&permissions=8"); } } \ No newline at end of file diff --git a/src/commands/CommandJDoodle.java b/src/commands/CommandJDoodle.java index ae244e4..67165f0 100644 --- a/src/commands/CommandJDoodle.java +++ b/src/commands/CommandJDoodle.java @@ -12,17 +12,17 @@ public class CommandJDoodle extends Command public CommandJDoodle(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("JDoodleInfo"); } + public String getHelpText() { return LocStrings.stub("JDoodleInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args.trim().length() < 1) { - res.Call(LocStrings.Stub("JDoodleError")); + res.send(LocStrings.stub("JDoodleError")); return; } - res.Call(compiler.compileJava(input.args)); + res.send(compiler.compileJava(input.args)); } } diff --git a/src/commands/CommandLeaderboard.java b/src/commands/CommandLeaderboard.java index cfc06af..79a1ff6 100644 --- a/src/commands/CommandLeaderboard.java +++ b/src/commands/CommandLeaderboard.java @@ -25,14 +25,14 @@ public class CommandLeaderboard extends Command public CommandLeaderboard(KittyRole roleLevel, KittyRating contentRating) { super(roleLevel, contentRating); } @Override - public String HelpText() { return LocStrings.Stub("LeaderboardInfo"); } + public String getHelpText() { return LocStrings.stub("LeaderboardInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { // Start by force-flushing. We need to be up-to-date. - GlobalLog.Log("Flushed database for " + DatabaseManager.instance.upkeep() + " items."); + GlobalLog.log("Flushed database for " + DatabaseManager.instance.upkeep() + " items."); // Get all users associated with a guild and get their bean count String guildID = guild.uniqueID; @@ -74,13 +74,13 @@ public class CommandLeaderboard extends Command return (int)difference; }); - GlobalLog.Log(LogFilter.Command, "Sorted through " + users.size() + " KittyUsers for leaderboard purposes."); + GlobalLog.log(LogFilter.Command, "Sorted through " + users.size() + " KittyUsers for leaderboard purposes."); // Configure output final int listSize = 10; KittyEmbed embed = new KittyEmbed(); embed.color = Config.ColorDefault; - embed.title = LocStrings.Stub("LeaderboardTitle"); + embed.title = LocStrings.stub("LeaderboardTitle"); embed.descriptionText = ""; for(int i = 0; i < listSize && i < users.size(); ++i) @@ -94,6 +94,6 @@ public class CommandLeaderboard extends Command } // Write out embed result - res.CallEmbed(embed); + res.send(embed); } } diff --git a/src/commands/CommandMap.java b/src/commands/CommandMap.java index 803b93b..0edf9de 100644 --- a/src/commands/CommandMap.java +++ b/src/commands/CommandMap.java @@ -23,10 +23,10 @@ public class CommandMap extends Command public CommandMap(KittyRole roleLevel, KittyRating contentRating) { super(roleLevel, contentRating); } @Override - public String HelpText() { return String.format(LocStrings.Stub("MapInfo"), "" + MaxWidth, "" + MaxHeight); } + public String getHelpText() { return String.format(LocStrings.stub("MapInfo"), "" + MaxWidth, "" + MaxHeight); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { // Variables int width = 35; @@ -43,24 +43,24 @@ public class CommandMap extends Command { OptionParser parser = new OptionParser(input.args); - String seedStr = parser.GetOption("-s", true); + String seedStr = parser.getOption("-s", true); if(seedStr != null) { seed = Long.parseLong(seedStr); hasSeed = true; } - String widthStr = parser.GetOption("-w", true); + String widthStr = parser.getOption("-w", true); if(widthStr != null) - width = ValidateSize(Integer.parseInt(widthStr), MaxWidth); + width = validateSize(Integer.parseInt(widthStr), MaxWidth); - String heightStr = parser.GetOption("-h", true); + String heightStr = parser.getOption("-h", true); if(heightStr != null) - height = ValidateSize(Integer.parseInt(heightStr), MaxHeight); + height = validateSize(Integer.parseInt(heightStr), MaxHeight); } catch(NumberFormatException e) { - res.Call(LocStrings.Stub("MapInvalid")); + res.send(LocStrings.stub("MapInvalid")); return; } @@ -76,22 +76,22 @@ public class CommandMap extends Command } // Response header creation - header += LocStrings.Stub("MapVersion") + "\n"; - header += LocStrings.Stub("MapSeed") + ": `" + seed + "`, "; - header += LocStrings.Stub("MapWidth") + "`"+ width +"`, "; - header += LocStrings.Stub("MapHeight") + ": `"+ height + "`\n"; + header += LocStrings.stub("MapVersion") + "\n"; + header += LocStrings.stub("MapSeed") + ": `" + seed + "`, "; + header += LocStrings.stub("MapWidth") + "`"+ width +"`, "; + header += LocStrings.stub("MapHeight") + ": `"+ height + "`\n"; // Response body creation body += "```\n"; - body += GenerateMap(width, height, randGenerator); + body += generateMap(width, height, randGenerator); body += "\n```"; // Send back the map - res.Call(header + body); + res.send(header + body); } // Verifies and appropriately caps input as necessary - int ValidateSize(int input, int max) + int validateSize(int input, int max) { if(input < 0) throw new NumberFormatException(); @@ -104,7 +104,7 @@ public class CommandMap extends Command // Does the map generation - String GenerateMap(int width, int height, Random gen) + String generateMap(int width, int height, Random gen) { String landscape[][] = new String[width][height]; int r1 = rand(gen); diff --git a/src/commands/CommandPerish.java b/src/commands/CommandPerish.java index 73ca6e6..d372510 100644 --- a/src/commands/CommandPerish.java +++ b/src/commands/CommandPerish.java @@ -23,12 +23,12 @@ public class CommandPerish extends Command public CommandPerish(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PerishInfo"); }; + public String getHelpText() { return LocStrings.stub("PerishInfo"); }; private static Long num = 0l; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; String filename = null; @@ -45,7 +45,7 @@ public class CommandPerish extends Command { try { - filename = ImageUtils.DownloadFromURL(input.args.split(" ")[0], ".png"); + filename = ImageUtils.downloadFromURL(input.args.split(" ")[0], ".png"); preProcessed = new File(filename); } catch(Exception e) @@ -54,12 +54,12 @@ public class CommandPerish extends Command if(input.mentions != null) person = input.mentions[0]; - filename = ImageUtils.DownloadFromURL(person.avatarID, ".png"); + filename = ImageUtils.downloadFromURL(person.avatarID, ".png"); if(filename == null) return; } preProcessed = new File(filename); - ApplyTintEffect(ImageIO.read(preProcessed), name); + applyTintEffect(ImageIO.read(preProcessed), name); } catch (IOException e) { @@ -67,13 +67,13 @@ public class CommandPerish extends Command } postProcessed = new File(name); - res.CallFile(postProcessed, "png"); + res.sendFile(postProcessed, "png"); - ImageUtils.BlockingFileDelete(preProcessed); - ImageUtils.BlockingFileDelete(postProcessed); + ImageUtils.blockingFileDelete(preProcessed); + ImageUtils.blockingFileDelete(postProcessed); } - private static void ApplyTintEffect(BufferedImage image, String name) throws IOException + private static void applyTintEffect(BufferedImage image, String name) throws IOException { // Iterate over each column left to right and touch up each pixel for(int x = 0; x < image.getWidth(); ++x) diff --git a/src/commands/CommandPing.java b/src/commands/CommandPing.java index 7de6205..e5f8d62 100644 --- a/src/commands/CommandPing.java +++ b/src/commands/CommandPing.java @@ -15,12 +15,12 @@ public class CommandPing extends Command public CommandPing(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PingInfo"); } + public String getHelpText() { return LocStrings.stub("PingInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - res.Call(LocStrings.Stub("PingResponse")); + res.send(LocStrings.stub("PingResponse")); } } diff --git a/src/commands/CommandPollManage.java b/src/commands/CommandPollManage.java index 1a0114d..5457a1b 100644 --- a/src/commands/CommandPollManage.java +++ b/src/commands/CommandPollManage.java @@ -14,23 +14,23 @@ public class CommandPollManage extends Command public CommandPollManage(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PollManageInfo"); } + public String getHelpText() { return LocStrings.stub("PollManageInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { switch(input.args.split(" ")[0].toLowerCase()) { case "start": - res.Call(guild.startPoll(input.args.substring(input.args.indexOf(' ')).trim())); + res.send(guild.startPoll(input.args.substring(input.args.indexOf(' ')).trim())); break; case "choice": - res.Call(guild.addChoiceToPoll(input.args.substring(input.args.indexOf(' ')).trim())); + res.send(guild.addChoiceToPoll(input.args.substring(input.args.indexOf(' ')).trim())); break; case "stop": - res.Call(guild.endPoll()); + res.send(guild.endPoll()); break; default: diff --git a/src/commands/CommandPollResults.java b/src/commands/CommandPollResults.java index ac36aff..638bb81 100644 --- a/src/commands/CommandPollResults.java +++ b/src/commands/CommandPollResults.java @@ -10,10 +10,10 @@ public class CommandPollResults extends Command public CommandPollResults(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PollResultsInfo"); } + public String getHelpText() { return LocStrings.stub("PollResultsInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String results = ""; int totalVotes = 0; @@ -28,9 +28,9 @@ public class CommandPollResults extends Command for(int i = 0; i < votes.size(); i++) { - results += String.format(LocStrings.Stub("PollResultsResponse"), votes.get(i).votes, votes.get(i).choice, (int)(((double)votes.get(i).votes) / ((double)totalVotes) * 100)); + results += String.format(LocStrings.stub("PollResultsResponse"), votes.get(i).votes, votes.get(i).choice, (int)(((double)votes.get(i).votes) / ((double)totalVotes) * 100)); } - res.Call(results); + res.send(results); } } diff --git a/src/commands/CommandPollShow.java b/src/commands/CommandPollShow.java index 08cde19..c92ab2d 100644 --- a/src/commands/CommandPollShow.java +++ b/src/commands/CommandPollShow.java @@ -8,23 +8,23 @@ public class CommandPollShow extends Command public CommandPollShow(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PollShowInfo"); } + public String getHelpText() { return LocStrings.stub("PollShowInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(!guild.polling) { - res.Call(LocStrings.Stub("PollShowNoPoll")); + res.send(LocStrings.stub("PollShowNoPoll")); return; } - String poll = String.format(LocStrings.Stub("PollShowPoll"), guild.poll); - poll += LocStrings.Stub("PollShowChoices"); + String poll = String.format(LocStrings.stub("PollShowPoll"), guild.poll); + poll += LocStrings.stub("PollShowChoices"); for(int i = 0; i < guild.choices.size(); i++) { poll += (i+1) + ": `" + guild.choices.get(i).choice + "`\n"; } - res.Call(poll); + res.send(poll); } } diff --git a/src/commands/CommandPollVote.java b/src/commands/CommandPollVote.java index d3b48f5..b3012f1 100644 --- a/src/commands/CommandPollVote.java +++ b/src/commands/CommandPollVote.java @@ -8,16 +8,16 @@ public class CommandPollVote extends Command public CommandPollVote(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("PollVoteInfo"); } + public String getHelpText() { return LocStrings.stub("PollVoteInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(guild.polling) { if(guild.hasVoted.contains(user.uniqueID)) { - res.Call(LocStrings.Stub("PollVoteAlreadyVoted")); + res.send(LocStrings.stub("PollVoteAlreadyVoted")); return; } try @@ -25,23 +25,23 @@ public class CommandPollVote extends Command int voteNum = Integer.parseInt(input.args)-1; if(voteNum >= guild.choices.size() || voteNum < 0) { - res.Call(String.format(LocStrings.Stub("PollVoteNotValidVote"), voteNum)); + res.send(String.format(LocStrings.stub("PollVoteNotValidVote"), voteNum)); return; } KittyPoll polled = guild.choices.get(voteNum); polled.votes++; guild.hasVoted.add(user.uniqueID); - res.Call(LocStrings.Stub("PollVoteSuccess") + " `" + polled.choice + "`!"); + res.send(LocStrings.stub("PollVoteSuccess") + " `" + polled.choice + "`!"); return; } catch (NumberFormatException e) { - res.Call(LocStrings.Stub("PollVoteNotValidNumber")); + res.send(LocStrings.stub("PollVoteNotValidNumber")); return; } } - res.Call(LocStrings.Stub("PollVoteNoPoll")); + res.send(LocStrings.stub("PollVoteNoPoll")); } } diff --git a/src/commands/CommandRPEnd.java b/src/commands/CommandRPEnd.java index 17005d6..355b691 100644 --- a/src/commands/CommandRPEnd.java +++ b/src/commands/CommandRPEnd.java @@ -14,10 +14,10 @@ public class CommandRPEnd extends Command public CommandRPEnd (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RPEndInfo"); } + public String getHelpText() { return LocStrings.stub("RPEndInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { File sending = null; @@ -32,12 +32,12 @@ public class CommandRPEnd extends Command if(sending != null) { - res.CallFile(sending, "txt"); - res.Call(LocStrings.Stub("RPEndFileOut")); + res.sendFile(sending, "txt"); + res.send(LocStrings.stub("RPEndFileOut")); } else { - res.Call(LocStrings.Stub("RPEndError")); + res.send(LocStrings.stub("RPEndError")); } } } diff --git a/src/commands/CommandRPG.java b/src/commands/CommandRPG.java index 733d12d..6230dc0 100644 --- a/src/commands/CommandRPG.java +++ b/src/commands/CommandRPG.java @@ -23,31 +23,31 @@ public class CommandRPG extends Command } @Override - public String HelpText() { return LocStrings.Stub("RPGInfo"); }; + public String getHelpText() { return LocStrings.stub("RPGInfo"); }; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args == null || input.args.length() == 0) { - String output = HelpText(); - res.Call(output); + String output = getHelpText(); + res.send(output); return; } String result = null; synchronized(framework) { - result = framework.Run(user.uniqueID, input.args.trim()); + result = framework.run(user.uniqueID, input.args.trim()); } if(result == null) { - res.Call(LocStrings.Stub("RPGInvalid")); + res.send(LocStrings.stub("RPGInvalid")); return; } - res.Call(result); + res.send(result); } } diff --git a/src/commands/CommandRPStart.java b/src/commands/CommandRPStart.java index b433cd0..866b6f8 100644 --- a/src/commands/CommandRPStart.java +++ b/src/commands/CommandRPStart.java @@ -12,10 +12,10 @@ public class CommandRPStart extends Command public CommandRPStart (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RPStartInfo"); } + public String getHelpText() { return LocStrings.stub("RPStartInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { ArrayList users = new ArrayList(); users.add(user); @@ -27,6 +27,6 @@ public class CommandRPStart extends Command } } - res.Call(RPManager.instance.newRP(channel, users)); + res.send(RPManager.instance.newRP(channel, users)); } } diff --git a/src/commands/CommandRaffleEnd.java b/src/commands/CommandRaffleEnd.java index 47ee4f6..735c604 100644 --- a/src/commands/CommandRaffleEnd.java +++ b/src/commands/CommandRaffleEnd.java @@ -15,18 +15,18 @@ public class CommandRaffleEnd extends Command public CommandRaffleEnd(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RaffleEndInfo"); } + public String getHelpText() { return LocStrings.stub("RaffleEndInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(guild.endRaffle()) { - res.Call(LocStrings.Stub("RaffleEndSuccess")); + res.send(LocStrings.stub("RaffleEndSuccess")); } else { - res.Call(LocStrings.Stub("RaffleEndFailure")); + res.send(LocStrings.stub("RaffleEndFailure")); } } } \ No newline at end of file diff --git a/src/commands/CommandRaffleJoin.java b/src/commands/CommandRaffleJoin.java index a3ff7e0..0b6a78f 100644 --- a/src/commands/CommandRaffleJoin.java +++ b/src/commands/CommandRaffleJoin.java @@ -15,18 +15,18 @@ public class CommandRaffleJoin extends Command public CommandRaffleJoin(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RaffleJoinInfo"); } + public String getHelpText() { return LocStrings.stub("RaffleJoinInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(guild.joinRaffle(user)) { - res.Call(LocStrings.Stub("RaffleJoinSuccess")); + res.send(LocStrings.stub("RaffleJoinSuccess")); } else { - res.Call(LocStrings.Stub("RaffleJoinFailure")); + res.send(LocStrings.stub("RaffleJoinFailure")); } } } diff --git a/src/commands/CommandRaffleSpin.java b/src/commands/CommandRaffleSpin.java index ecc1e2e..3889252 100644 --- a/src/commands/CommandRaffleSpin.java +++ b/src/commands/CommandRaffleSpin.java @@ -15,18 +15,18 @@ public class CommandRaffleSpin extends Command public CommandRaffleSpin(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RaffleSpinInfo"); } + public String getHelpText() { return LocStrings.stub("RaffleSpinInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { try { - res.Call(String.format(LocStrings.Stub("RaffleSpinSuccess"), guild.chooseRaffleWinner().name)); + res.send(String.format(LocStrings.stub("RaffleSpinSuccess"), guild.chooseRaffleWinner().name)); } catch(Exception e) { - res.Call(LocStrings.Stub("RaffleSpinFailure")); + res.send(LocStrings.stub("RaffleSpinFailure")); } } } \ No newline at end of file diff --git a/src/commands/CommandRaffleStart.java b/src/commands/CommandRaffleStart.java index fb2fac1..57468a3 100644 --- a/src/commands/CommandRaffleStart.java +++ b/src/commands/CommandRaffleStart.java @@ -15,12 +15,12 @@ public class CommandRaffleStart extends Command public CommandRaffleStart(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RaffleStartInfo"); } + public String getHelpText() { return LocStrings.stub("RaffleStartInfo"); } public int beanCost; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { try { @@ -30,13 +30,14 @@ public class CommandRaffleStart extends Command { beanCost = 100; } + if(guild.startRaffle(beanCost)) { - res.Call(String.format(LocStrings.Stub("RaffleStartSuccess"), beanCost)); + res.send(String.format(LocStrings.stub("RaffleStartSuccess"), beanCost)); } else { - res.Call(LocStrings.Stub("RaffleStartFailure")); + res.send(LocStrings.stub("RaffleStartFailure")); } } } diff --git a/src/commands/CommandRating.java b/src/commands/CommandRating.java index 0adaae6..6947e77 100644 --- a/src/commands/CommandRating.java +++ b/src/commands/CommandRating.java @@ -15,11 +15,11 @@ public class CommandRating extends Command public CommandRating(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RatingInfo"); } + public String getHelpText() { return LocStrings.stub("RatingInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String newRating = null; switch(input.args.toLowerCase().trim()) @@ -55,11 +55,11 @@ public class CommandRating extends Command } if(newRating != null) - res.Call(LocStrings.Stub("RatingChanged") + " " + newRating); + res.send(LocStrings.stub("RatingChanged") + " " + newRating); else - res.Call(LocStrings.Stub("RatingInvalid") + " `" + input.args + "`"); + res.send(LocStrings.stub("RatingInvalid") + " `" + input.args + "`"); if(newRating.equals("Filtered")) - res.Call(LocStrings.Stub("RatingWarning")); + res.send(LocStrings.stub("RatingWarning")); } } \ No newline at end of file diff --git a/src/commands/CommandRole.java b/src/commands/CommandRole.java index e9633b8..1abee3a 100644 --- a/src/commands/CommandRole.java +++ b/src/commands/CommandRole.java @@ -9,20 +9,20 @@ public class CommandRole extends Command public CommandRole (KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RoleInfo"); } + public String getHelpText() { return LocStrings.stub("RoleInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args.isEmpty()) { - res.Call(LocStrings.Stub("RoleStandardResponse") + " " + user.GetRole().name() + "!"); + res.send(LocStrings.stub("RoleStandardResponse") + " " + user.getRole().name() + "!"); return; } - if(user.GetRole().getValue() < KittyRole.Admin.getValue()) + if(user.getRole().getValue() < KittyRole.Admin.getValue()) { - res.Call(String.format(LocStrings.Stub("RoleError"), KittyRole.Admin.toString())); + res.send(String.format(LocStrings.stub("RoleError"), KittyRole.Admin.toString())); return; } @@ -46,16 +46,16 @@ public class CommandRole extends Command break; default: - res.Call(LocStrings.Stub("RoleNeededRole")); + res.send(LocStrings.stub("RoleNeededRole")); return; } String users = ""; for(int i = 0; i < input.mentions.length; i++) { - input.mentions[i].ChangeRole(newRole); + input.mentions[i].changeRole(newRole); users += input.mentions[i].name + " "; } - res.Call(String.format(LocStrings.Stub("RoleChanged"), users, newRole.name())); + res.send(String.format(LocStrings.stub("RoleChanged"), users, newRole.name())); } } diff --git a/src/commands/CommandRoll.java b/src/commands/CommandRoll.java index 1cb7ba7..046c2c0 100644 --- a/src/commands/CommandRoll.java +++ b/src/commands/CommandRoll.java @@ -16,18 +16,18 @@ public class CommandRoll extends Command public CommandRoll(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("RollInfo"); } + public String getHelpText() { return LocStrings.stub("RollInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { try { - res.Call(rollDice(input.args)); + res.send(rollDice(input.args)); } catch(Exception e) { - res.Call(LocStrings.Stub("RollError")); + res.send(LocStrings.stub("RollError")); } } diff --git a/src/commands/CommandShutdown.java b/src/commands/CommandShutdown.java index 57538a6..b6de2ea 100644 --- a/src/commands/CommandShutdown.java +++ b/src/commands/CommandShutdown.java @@ -20,14 +20,14 @@ public class CommandShutdown extends Command public CommandShutdown(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("ShutdownInfo"); } + public String getHelpText() { return LocStrings.stub("ShutdownInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { // Flag the shutdown immediately. - Stats.instance.IndicateShutdown(); + Stats.instance.indicateShutdown(); boolean isSafe = false; switch(input.args.toLowerCase().trim()) @@ -41,21 +41,19 @@ public class CommandShutdown extends Command break; } - - if(isSafe) { // Force upkeep, this works so long as upkeep is on the main thread. - res.CallImmediate(LocStrings.Stub("ShutdownSafe")); + res.sendImmediate(LocStrings.stub("ShutdownSafe")); DatabaseManager.instance.upkeep(); - GlobalLog.Warn(LogFilter.Command, LocStrings.Lookup("ShutdownSafe")); + GlobalLog.warn(LogFilter.Command, LocStrings.lookup("ShutdownSafe")); System.exit(0); } else { - res.CallImmediate(LocStrings.Stub("ShutdownUnsafe"));// "``"); - GlobalLog.Warn(LogFilter.Command, LocStrings.Lookup("ShutdownSafe")); + res.sendImmediate(LocStrings.stub("ShutdownUnsafe"));// "``"); + GlobalLog.warn(LogFilter.Command, LocStrings.lookup("ShutdownSafe")); System.exit(0); } } diff --git a/src/commands/CommandStark.java b/src/commands/CommandStark.java index 16378c8..9795b6e 100644 --- a/src/commands/CommandStark.java +++ b/src/commands/CommandStark.java @@ -17,12 +17,12 @@ public class CommandStark extends Command public CommandStark(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("StarkInfo"); }; + public String getHelpText() { return LocStrings.stub("StarkInfo"); }; private static Long num = 0l; @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; String filename = null; @@ -39,7 +39,7 @@ public class CommandStark extends Command { try { - filename = ImageUtils.DownloadFromURL(input.args.split(" ")[0], ".png"); + filename = ImageUtils.downloadFromURL(input.args.split(" ")[0], ".png"); preProcessed = new File(filename); } catch(Exception e) @@ -48,12 +48,12 @@ public class CommandStark extends Command if(input.mentions != null) person = input.mentions[0]; - filename = ImageUtils.DownloadFromURL(person.avatarID, ".png"); + filename = ImageUtils.downloadFromURL(person.avatarID, ".png"); if(filename == null) return; } preProcessed = new File(filename); - ApplySnap(ImageIO.read(preProcessed), name); + applySnap(ImageIO.read(preProcessed), name); } catch (IOException e) { @@ -61,13 +61,13 @@ public class CommandStark extends Command } postProcessed = new File(name); - res.CallFile(postProcessed, "png"); + res.sendFile(postProcessed, "png"); - ImageUtils.BlockingFileDelete(preProcessed); - ImageUtils.BlockingFileDelete(postProcessed); + ImageUtils.blockingFileDelete(preProcessed); + ImageUtils.blockingFileDelete(postProcessed); } - private static void ApplySnap(BufferedImage image, String name) throws IOException + private static void applySnap(BufferedImage image, String name) throws IOException { BufferedImage snap = ImageUtils.copyImage(image); // Iterate over each column left to right and touch up each pixel diff --git a/src/commands/CommandStats.java b/src/commands/CommandStats.java index 593ff66..3e6217a 100644 --- a/src/commands/CommandStats.java +++ b/src/commands/CommandStats.java @@ -3,7 +3,9 @@ package commands; import core.Command; import core.LocStrings; import core.CommandManager.ThreadData; +import core.Config; import dataStructures.KittyChannel; +import dataStructures.KittyEmbed; import dataStructures.KittyGuild; import dataStructures.KittyRating; import dataStructures.KittyRole; @@ -17,33 +19,38 @@ public class CommandStats extends Command public CommandStats(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("StatsInfo"); } + public String getHelpText() { return LocStrings.stub("StatsInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - String out = "```\n"; + // Variables Stats stats = Stats.instance; + String out = ""; + long seen = stats.getMessagesSeen(); + long processed = stats.getCommandsProcessed(); - long seen = stats.GetMessagesSeen(); - long processed = stats.GetCommandsProcessed(); - - out += "----- [General] -----\n"; + // General + out += "General"; + out += "```\n"; out += " Messages observed: " + seen + "\n"; out += "Commands processed: " + processed + "\n"; out += " Command invoke %: " + ((int)((processed / (float)seen) * 1000)) / 10.0f + "%\n"; - out += " KittyBot uptime: " + stats.GetFormattedUptime() + "\n"; - out += "\n"; - out += "----- [Health] -----\n"; - out += " SMT cores: " + stats.GetCPUAvailable() + "\n"; + out += " Bot uptime: " + stats.getFormattedUptime() + "\n"; + out += "```\n"; - // If CPU load works on this OS, list it. - double CPULoad = stats.GetSystemCPULoad(); - if(CPULoad > -0.9) // -1.0 is the error state - out += "System CPU Load: " + (CPULoad * 100) + "%\n"; + // Health + out += "Health"; + out += "```\n"; + out += " SMT cores: " + stats.getCPUAvailable() + "\n"; - ThreadData data = stats.GetThreadData(); + // If CPU load works on this OS, list it. -1.0 is the error state + double CPULoad = stats.getSystemCPULoad(); + out += CPULoad > -0.9 + ? " CPU Load: " + (CPULoad * 100) + "%\n" : ""; + + ThreadData data = stats.getThreadData(); Integer terminated = data.states.get(Thread.State.TERMINATED); Integer runnable = data.states.get(Thread.State.RUNNABLE); Integer blocked = data.states.get(Thread.State.BLOCKED); @@ -58,14 +65,25 @@ public class CommandStats extends Command + " term-" + (terminated == null ? 0 : terminated) + "\n"; - Integer guildCount = stats.GetGuildCount(); - Integer userCount = stats.GetUserCount(); + out += "```\n"; - out += "\n----- [Cache] -----\n" + + // Cache + Integer guildCount = stats.getGuildCount(); + Integer userCount = stats.getUserCount(); + + out += "Cache"; + out += "```\n" + "Cached Guilds: " + guildCount + "\n" + " Cached Users: " + userCount; + out += "\n```"; - res.Call(out); + KittyEmbed embed = new KittyEmbed(); + embed.title = "Bot Stats"; + embed.descriptionText = out; + embed.color = Config.ColorDefault; + + res.send(embed); } } diff --git a/src/commands/CommandTeey.java b/src/commands/CommandTeey.java index 6a3394a..c98d0b2 100644 --- a/src/commands/CommandTeey.java +++ b/src/commands/CommandTeey.java @@ -23,11 +23,11 @@ public class CommandTeey extends Command private static Long num = 0l; @Override - public String HelpText() { return LocStrings.Stub("TeeyInfo"); } + public String getHelpText() { return LocStrings.stub("TeeyInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; File teeyFile = null; @@ -48,13 +48,13 @@ public class CommandTeey extends Command else person = input.mentions[0]; - String yeeteeFilename = ImageUtils.DownloadFromURL(person.avatarID, ".png"); + String yeeteeFilename = ImageUtils.downloadFromURL(person.avatarID, ".png"); if(yeeteeFilename == null) return; teeyeeFile = new File(yeeteeFilename); ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/teey/frames/", "teey ", 24, 18); - builder.Overlay(ImageIO.read(teeyeeFile), name); + builder.overlay(ImageIO.read(teeyeeFile), name); } catch (IOException e) { @@ -62,10 +62,10 @@ public class CommandTeey extends Command } teeyFile = new File (name); - res.CallFile(teeyFile, "gif"); + res.sendFile(teeyFile, "gif"); // Thread cleanup... - ImageUtils.BlockingFileDelete(teeyFile); - ImageUtils.BlockingFileDelete(teeyeeFile); + ImageUtils.blockingFileDelete(teeyFile); + ImageUtils.blockingFileDelete(teeyeeFile); } } diff --git a/src/commands/CommandTradeBeans.java b/src/commands/CommandTradeBeans.java index 141ab46..efb7627 100644 --- a/src/commands/CommandTradeBeans.java +++ b/src/commands/CommandTradeBeans.java @@ -15,14 +15,14 @@ public class CommandTradeBeans extends Command public CommandTradeBeans(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("TradeBeansInfo"); } + public String getHelpText() { return LocStrings.stub("TradeBeansInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.mentions == null) { - res.Call(LocStrings.Stub("TradeBeansNoTargetError")); + res.send(LocStrings.stub("TradeBeansNoTargetError")); return; } @@ -32,25 +32,25 @@ public class CommandTradeBeans extends Command } catch (NumberFormatException e) { - res.Call(LocStrings.Stub("TradeBeansIntParseError")); + res.send(LocStrings.stub("TradeBeansIntParseError")); return; } - if(user.GetBeans() < beans) + if(user.getBeans() < beans) { - res.Call(LocStrings.Stub("TradeBeansNotEnoughError")); + res.send(LocStrings.stub("TradeBeansNotEnoughError")); return; } if(beans < 0) { - res.Call(String.format(LocStrings.Stub("TradeBeansStealingBeans"), user.name)); - user.ChangeBeans(-10); + res.send(String.format(LocStrings.stub("TradeBeansStealingBeans"), user.name)); + user.changeBeans(-10); return; } - input.mentions[0].ChangeBeans(beans); - user.ChangeBeans(-beans); - res.Call(String.format(LocStrings.Stub("TradeBeansSuccess"), user.name, input.mentions[0].name, beans)); + input.mentions[0].changeBeans(beans); + user.changeBeans(-beans); + res.send(String.format(LocStrings.stub("TradeBeansSuccess"), user.name, input.mentions[0].name, beans)); } } diff --git a/src/commands/CommandTweet.java b/src/commands/CommandTweet.java index 8c9770a..5334900 100644 --- a/src/commands/CommandTweet.java +++ b/src/commands/CommandTweet.java @@ -11,16 +11,16 @@ public class CommandTweet extends Command public CommandTweet(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return LocStrings.Stub("TweetInfo"); } + public String getHelpText() { return LocStrings.stub("TweetInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { //TODO: Figure out how to pass pictures correctly try { - res.Call(tweet.tweet(input.args)); + res.send(tweet.tweet(input.args)); } catch (Exception e) { - res.Call(LocStrings.Stub("TweetError")); + res.send(LocStrings.stub("TweetError")); } } } diff --git a/src/commands/CommandWolfram.java b/src/commands/CommandWolfram.java index 4947261..ee341cc 100644 --- a/src/commands/CommandWolfram.java +++ b/src/commands/CommandWolfram.java @@ -15,23 +15,23 @@ public class CommandWolfram extends Command public CommandWolfram(KittyRole level, KittyRating rating) { super(level, rating);} @Override - public String HelpText() { return LocStrings.Stub("WolframInfo"); } + public String getHelpText() { return LocStrings.stub("WolframInfo"); } @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { if(input.args == null || input.args.trim().length() == 0) - res.Call(LocStrings.Stub("WolframNoArgs")); + res.send(LocStrings.stub("WolframNoArgs")); try { File pic = new File(searcher.getWolfram(input.args)); - res.CallFile(pic, "png"); - ImageUtils.BlockingFileDelete(pic); + res.sendFile(pic, "png"); + ImageUtils.blockingFileDelete(pic); } - catch (IOException e) + catch (IOException e) { - res.Call(LocStrings.Stub("WolframError")); + res.send(LocStrings.stub("WolframError")); } } } \ No newline at end of file diff --git a/src/commands/CommandYeet.java b/src/commands/CommandYeet.java index 65ea728..71c5a63 100644 --- a/src/commands/CommandYeet.java +++ b/src/commands/CommandYeet.java @@ -23,11 +23,11 @@ public class CommandYeet extends Command private static Long num = 0l; @Override - public String HelpText() { return LocStrings.Stub("YeetInfo"); } + public String getHelpText() { return LocStrings.stub("YeetInfo"); } // Called when the command is run! @Override - public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { String name = null; File yeetFile = null; @@ -48,13 +48,13 @@ public class CommandYeet extends Command else person = input.mentions[0]; - String yeeteeFilename = ImageUtils.DownloadFromURL(person.avatarID, ".png"); + String yeeteeFilename = ImageUtils.downloadFromURL(person.avatarID, ".png"); if(yeeteeFilename == null) return; yeeteeFile = new File(yeeteeFilename); ImageOverlayBuilder builder = new ImageOverlayBuilder("assets/yeet/frames/", "yeet ", 24, 18); - builder.Overlay(ImageIO.read(yeeteeFile), name); + builder.overlay(ImageIO.read(yeeteeFile), name); } catch (IOException e) { @@ -62,10 +62,10 @@ public class CommandYeet extends Command } yeetFile = new File (name); - res.CallFile(yeetFile, "gif"); + res.sendFile(yeetFile, "gif"); // Thread cleanup... - ImageUtils.BlockingFileDelete(yeetFile); - ImageUtils.BlockingFileDelete(yeeteeFile); + ImageUtils.blockingFileDelete(yeetFile); + ImageUtils.blockingFileDelete(yeeteeFile); } } diff --git a/src/commands/benchmark/BenchmarkCommandCompare.java b/src/commands/benchmark/BenchmarkCommandCompare.java index 182a335..1052091 100644 --- a/src/commands/benchmark/BenchmarkCommandCompare.java +++ b/src/commands/benchmark/BenchmarkCommandCompare.java @@ -10,7 +10,7 @@ import core.benchmark.BenchmarkManager; public class BenchmarkCommandCompare extends BenchmarkCommand { - public BenchmarkFormattable OnRun(BenchmarkManager manager, BenchmarkInput input) + public BenchmarkFormattable onRun(BenchmarkManager manager, BenchmarkInput input) { final String lineDelimiter = "\n"; String output = ""; @@ -24,7 +24,7 @@ public class BenchmarkCommandCompare extends BenchmarkCommand if(i != 0) output += lineDelimiter; - List entries = manager.FindModel(inputSplit[i]); + List entries = manager.findModel(inputSplit[i]); if(entries.size() < 1) output += "Couldn't find any models containing `" + inputSplit[i] + "`!"; diff --git a/src/commands/benchmark/BenchmarkCommandFind.java b/src/commands/benchmark/BenchmarkCommandFind.java index f0ac9e8..ab01624 100644 --- a/src/commands/benchmark/BenchmarkCommandFind.java +++ b/src/commands/benchmark/BenchmarkCommandFind.java @@ -9,12 +9,12 @@ public class BenchmarkCommandFind extends BenchmarkCommand private final String lineDelimiter = "\n"; private final int listMax = 30; - public BenchmarkFormattable OnRun(BenchmarkManager manager, BenchmarkInput input) + public BenchmarkFormattable onRun(BenchmarkManager manager, BenchmarkInput input) { String output = ""; String searchString = input.value.trim(); - List entries = manager.FindModel(searchString); + List entries = manager.findModel(searchString); if(entries.size() > 0) { diff --git a/src/commands/benchmark/BenchmarkCommandInfo.java b/src/commands/benchmark/BenchmarkCommandInfo.java index 2fb7dae..08f2af2 100644 --- a/src/commands/benchmark/BenchmarkCommandInfo.java +++ b/src/commands/benchmark/BenchmarkCommandInfo.java @@ -74,16 +74,16 @@ public class BenchmarkCommandInfo extends BenchmarkCommand } @Override - public BenchmarkFormattable OnRun(BenchmarkManager manager, BenchmarkInput input) + public BenchmarkFormattable onRun(BenchmarkManager manager, BenchmarkInput input) { String searchString = input.value.trim(); long start = System.currentTimeMillis(); - List entries = manager.FindModel(searchString); + List entries = manager.findModel(searchString); if(entries.size() < 1) return new BenchmarkFormattable("Couldn't find any models containing `" + searchString + "`!"); - List sortedEntries = manager.EvaluateLevenshteinDistance(entries, searchString); + List sortedEntries = manager.evaluateLevenshteinDistance(entries, searchString); BenchmarkEntry entry = sortedEntries.get(0); KittyEmbed embed = FormatInfoEmbed(entry); diff --git a/src/commands/rpg/RPGCommandBattleFight.java b/src/commands/rpg/RPGCommandBattleFight.java index d353496..7c1fe64 100644 --- a/src/commands/rpg/RPGCommandBattleFight.java +++ b/src/commands/rpg/RPGCommandBattleFight.java @@ -7,7 +7,7 @@ import core.rpg.RPGState; public class RPGCommandBattleFight extends RPGCommand { @Override - public String OnRun(RPGState state, RPGInput input) + public String onRun(RPGState state, RPGInput input) { if(state.battleContext == null) return "```There's nothing to fight!```"; @@ -19,7 +19,7 @@ public class RPGCommandBattleFight extends RPGCommand reward = "+150xp"; state.battleContext = null; - state.player.ApplyEXP(150); + state.player.applyEXP(150); if(out != null && reward != null) { diff --git a/src/commands/rpg/RPGCommandBattleRun.java b/src/commands/rpg/RPGCommandBattleRun.java index b01a593..b655cab 100644 --- a/src/commands/rpg/RPGCommandBattleRun.java +++ b/src/commands/rpg/RPGCommandBattleRun.java @@ -7,15 +7,15 @@ import core.rpg.RPGState; public class RPGCommandBattleRun extends RPGCommand { @Override - public String OnRun(RPGState state, RPGInput input) + public String onRun(RPGState state, RPGInput input) { if(state.battleContext == null) return "```There's nothing to run from!```"; - long lostGold = (long)(state.player.GetGold() * .1); + long lostGold = (long)(state.player.getGold() * .1); String out = null; - state.player.SpendGold(lostGold); + state.player.spendGold(lostGold); state.battleContext = null; out = "You duck behind a tree and manage to escape from encounter just barely!"; diff --git a/src/commands/rpg/RPGCommandExplore.java b/src/commands/rpg/RPGCommandExplore.java index 55e38f9..3e5544c 100644 --- a/src/commands/rpg/RPGCommandExplore.java +++ b/src/commands/rpg/RPGCommandExplore.java @@ -28,7 +28,7 @@ public class RPGCommandExplore extends RPGCommand } @Override - public String OnRun(RPGState state, RPGInput input) + public String onRun(RPGState state, RPGInput input) { Chance chance = new Chance(100); @@ -50,7 +50,7 @@ public class RPGCommandExplore extends RPGCommand out = "As you take a stroll, you spy a small shiny glint from a bush and decide to investigate! Looks like it's your lucky day!"; reward = "+" + gp + "gp"; - state.player.GiveGold(gp); + state.player.giveGold(gp); } else if(chance.Next(20)) { @@ -59,8 +59,8 @@ public class RPGCommandExplore extends RPGCommand out = "You head out on a lovely stroll down a familiar path - the sun is out and the birds are chirping! Nothing much comes of it, but you feel refreshed."; reward = "+" + xp + "xp, +" + healing + "hp"; - state.player.ApplyHealing(healing); - state.player.ApplyEXP(xp); + state.player.applyHealing(healing); + state.player.applyEXP(xp); } else if(chance.Next(20)) { @@ -69,8 +69,8 @@ public class RPGCommandExplore extends RPGCommand out = "Today's the day you head out on a new path. You find a lot of little nicknacks and trinkets on the trail, but leave them be. The trail gets really steep, the rocks jagged, but you keep going. Eventually, you make it out to the other side into a small but pleasant town, and collapse on a bench to catch your breath."; reward = "+" + xp + "xp, -" + damage + "hp"; - state.player.ApplyEXP(xp); - state.player.ApplyDamage(damage); + state.player.applyEXP(xp); + state.player.applyDamage(damage); } else { @@ -78,7 +78,7 @@ public class RPGCommandExplore extends RPGCommand out = "You step outside but it starts to rain. You decide not to do much today, and hang about the inn and the tavern."; reward = "+" + hp + "hp"; - state.player.ApplyHealing(hp); + state.player.applyHealing(hp); } if(out != null && reward != null) diff --git a/src/commands/rpg/RPGCommandInfo.java b/src/commands/rpg/RPGCommandInfo.java index b668757..5fbaf7e 100644 --- a/src/commands/rpg/RPGCommandInfo.java +++ b/src/commands/rpg/RPGCommandInfo.java @@ -10,7 +10,7 @@ public class RPGCommandInfo extends RPGCommand { @Override - public String OnRun(RPGState state, RPGInput input) + public String onRun(RPGState state, RPGInput input) { String out = null; switch(input.value.trim().toLowerCase()) @@ -27,7 +27,7 @@ public class RPGCommandInfo extends RPGCommand case "hand": case "att": case "attack": - out = WeaponStats(state.player.GetWeapon()); + out = WeaponStats(state.player.getWeapon()); break; case "armour": @@ -44,7 +44,7 @@ public class RPGCommandInfo extends RPGCommand case "dress": case "wear": case "outfit": - out = ArmorStats(state.player.GetArmor()); + out = ArmorStats(state.player.getArmor()); break; } @@ -60,14 +60,14 @@ public class RPGCommandInfo extends RPGCommand return null; String out = ""; - out += "[" + weapon.GetName() + "]"; + out += "[" + weapon.getName() + "]"; out += "\n"; - out += " att: " + weapon.GetAttack(); + out += " att: " + weapon.getAttack(); out += "\n"; - out += "value: " + weapon.GetValue() + "gp"; + out += "value: " + weapon.getValue() + "gp"; out += "\n"; out += "\n"; - out += weapon.GetDescription(); + out += weapon.getDescription(); return out; } @@ -78,14 +78,14 @@ public class RPGCommandInfo extends RPGCommand return null; String out = ""; - out += "[" + armor.GetName() + "]"; + out += "[" + armor.getName() + "]"; out += "\n"; - out += " def: " + armor.GetDefense(); + out += " def: " + armor.getDefense(); out += "\n"; - out += "value: " + armor.GetValue() + "gp"; + out += "value: " + armor.getValue() + "gp"; out += "\n"; out += "\n"; - out += armor.GetDescription(); + out += armor.getDescription(); return out; } diff --git a/src/commands/rpg/RPGCommandStats.java b/src/commands/rpg/RPGCommandStats.java index 221d038..1e2cb9b 100644 --- a/src/commands/rpg/RPGCommandStats.java +++ b/src/commands/rpg/RPGCommandStats.java @@ -11,18 +11,18 @@ import core.rpg.RPGWeapon; public class RPGCommandStats extends RPGCommand { @Override - public String OnRun(RPGState state, RPGInput input) + public String onRun(RPGState state, RPGInput input) { RPGPlayer player = state.player; - long exp = player.GetEXP(); - long level = RPGExpTable.LevelFromEXP(player.GetEXP()); - long ceil = RPGExpTable.EXPCeil(level); + long exp = player.getEXP(); + long level = RPGExpTable.levelFromEXP(player.getEXP()); + long ceil = RPGExpTable.expCeil(level); String indent = ""; String linebreak = "\n"; String out = ""; - out += indent + "[" + player.GetName() + ", lv. " + level + "]"; + out += indent + "[" + player.getName() + ", lv. " + level + "]"; out += indent + linebreak; out += indent + "_______________"; out += indent + linebreak; @@ -31,26 +31,26 @@ public class RPGCommandStats extends RPGCommand out += indent + " (until next: " + (ceil - exp) + ")"; out += indent + linebreak; - out += indent + " Gold: " + player.GetGold(); + out += indent + " Gold: " + player.getGold(); out += indent + linebreak; - out += indent + "Health: " + player.GetHealthCurrent() + "/" + player.GetHealthMax(); + out += indent + "Health: " + player.getHealthCurrent() + "/" + player.getHealthMax(); out += indent + linebreak; - RPGWeapon weapon = player.GetWeapon(); + RPGWeapon weapon = player.getWeapon(); out += indent + "_____"; out += indent + linebreak; - out += indent + "Weapon: " + weapon.GetName(); + out += indent + "Weapon: " + weapon.getName(); out += indent + linebreak; - out += indent + " att: " + weapon.GetAttack(); + out += indent + " att: " + weapon.getAttack(); out += indent + linebreak; - RPGArmor armor = player.GetArmor(); + RPGArmor armor = player.getArmor(); out += indent + "_____"; out += indent + linebreak; - out += indent + "Armor: " + armor.GetName(); + out += indent + "Armor: " + armor.getName(); out += indent + linebreak; - out += indent + " def: " + armor.GetDefense() ; + out += indent + " def: " + armor.getDefense() ; out += indent + linebreak; out += indent + linebreak; diff --git a/src/core/BaseKeyValueFile.java b/src/core/BaseKeyValueFile.java index cb27fc5..b2b19bd 100644 --- a/src/core/BaseKeyValueFile.java +++ b/src/core/BaseKeyValueFile.java @@ -33,12 +33,12 @@ public class BaseKeyValueFile } // Reads in and calls the specifid function for each keyvalue pair we find - protected void Parse(Consumer> keyValueCallback) + protected void parse(Consumer> keyValueCallback) { File f = new File(filename); if(f.isFile() && f.canRead()) { - String content = FileUtils.ReadContent(f).trim(); + String content = FileUtils.readContent(f).trim(); String[] lines = content.split("" + pairSeparator); for(int i = 0; i < lines.length; ++i) @@ -60,7 +60,7 @@ public class BaseKeyValueFile } // Writes out a set of keyvalue pairs - protected void Write(List> toWrite) + protected void write(List> toWrite) { try { @@ -84,7 +84,7 @@ public class BaseKeyValueFile } catch (IOException e) { - GlobalLog.Error(LogFilter.Core, "Issue writing file " + filename + ": " + e.getMessage()); + GlobalLog.error(LogFilter.Core, "Issue writing file " + filename + ": " + e.getMessage()); } } } diff --git a/src/core/BaseLocFile.java b/src/core/BaseLocFile.java index 7525e27..a139857 100644 --- a/src/core/BaseLocFile.java +++ b/src/core/BaseLocFile.java @@ -30,9 +30,9 @@ public abstract class BaseLocFile protected TaggedPairStore stringStore; // Logging - private void Log(String str) { GlobalLog.Log(LogFilter.Strings, str); } - private void Warn(String str) { GlobalLog.Warn(LogFilter.Strings, str); } - private void Error(String str) { GlobalLog.Error(LogFilter.Strings, str); } + private void log(String str) { GlobalLog.log(LogFilter.Strings, str); } + private void warn(String str) { GlobalLog.warn(LogFilter.Strings, str); } + private void error(String str) { GlobalLog.error(LogFilter.Strings, str); } // File monitoring protected FileMonitor fileMonitor; @@ -45,19 +45,19 @@ public abstract class BaseLocFile } // Checks the file specified for updates - public void Update() + public void update() { synchronized(stringStore) { - fileMonitor.Update(this::OnFileChange); + fileMonitor.update(this::onFileChange); } } // When the file is changed - protected void OnFileChange(MonitoredFile file) + protected void onFileChange(MonitoredFile file) { - Log("Loc file was modified at path " + file.path); - UpdateLocFromDisk(); + log("Loc file was modified at path " + file.path); + updateLocFromDisk(); } // Structure used for holding a pair of strings and any other info we need @@ -75,12 +75,12 @@ public abstract class BaseLocFile } // Do processing on each path in the scraped directory here, assuming it's .java - public void StripForContents(Path path, ArrayList strings) + public void stripForContents(Path path, ArrayList strings) { String filename = path.getFileName().toString(); if(filename.contains(".java")) { - String contents = FileUtils.ReadContent(path); + String contents = FileUtils.readContent(path); String[] split = contents.split(functionName); // Identify all localizer function calls @@ -101,11 +101,11 @@ public abstract class BaseLocFile strings.add(new LocInfo(filename.substring(0, filename.lastIndexOf('.')), toLocalize)); - Log("Found lookup call in " + path + ": " + toLocalize); + log("Found lookup call in " + path + ": " + toLocalize); } catch(IndexOutOfBoundsException e) { - Warn("Found phrase but couldn't parse in file " + path); + warn("Found phrase but couldn't parse in file " + path); } } } @@ -116,12 +116,12 @@ public abstract class BaseLocFile // Nothing for now, but in the future will return a parsed and localized version of // the string in question if one can be found. If the localized string is empty, // returns a the key instead which is the default phrase. - public String GetKey(String input) + public String getKey(String input) { if(stringStore == null) return input; - String value = stringStore.GetKey(input); + String value = stringStore.getKey(input); if(value == null || value.trim().length() < 1) return input; @@ -129,7 +129,7 @@ public abstract class BaseLocFile } // Reads a file to string, adapted from https://stackoverflow.com/a/326440/5383198 - private String ReadFileAsString(String path, Charset encoding) + private String readFileAsString(String path, Charset encoding) { try { @@ -138,7 +138,7 @@ public abstract class BaseLocFile } catch (IOException e) { - Warn("No file found to read from!"); + warn("No file found to read from!"); } return null; @@ -146,13 +146,13 @@ public abstract class BaseLocFile // Update localization from the disk on file. Creates the file if it doesn't exist. // This file is internally formatted as an ini file. - public void UpdateLocFromDisk() + public void updateLocFromDisk() { - Log("Attempting to read localization file: " + filename); + log("Attempting to read localization file: " + filename); try { - String fileContents = ReadFileAsString(filename, Charset.defaultCharset()); + String fileContents = readFileAsString(filename, Charset.defaultCharset()); if(fileContents == null) { @@ -164,15 +164,15 @@ public abstract class BaseLocFile } catch(IOException e) { - Error("IO exception during localization file read"); + error("IO exception during localization file read"); } } // Rewrites out at the specified filename with existing stubs. // This preserves existing localized phrases. - public void SaveLocToDisk() + public void saveLocToDisk() { - Log("Attempting to write updated localization file"); + log("Attempting to write updated localization file"); try { @@ -182,30 +182,30 @@ public abstract class BaseLocFile } catch(IOException e) { - Error("IO exception during localization file write"); + error("IO exception during localization file write"); } } - private void TryStripSpecified(Path path, ArrayList toFill) + private void tryStripSpecified(Path path, ArrayList toFill) { try { - StripForContents(path, toFill); + stripForContents(path, toFill); } catch(Exception e) { - Error("issue with file: " + path.toString()); + error("issue with file: " + path.toString()); } } // Scrape the project and generate all the possible localizeable phrases. // This stubs out phrases to be localized. - public void ScrapeAll() + public void scrapeAll() { ArrayList localizeList = new ArrayList(); - FileUtils.AcquireAllFiles(KittySourceDirectory).forEach((path) -> TryStripSpecified(path, localizeList)); + FileUtils.acquireAllFiles(KittySourceDirectory).forEach((path) -> tryStripSpecified(path, localizeList)); for(LocInfo toStub : localizeList) - stringStore.AddKeyValue(toStub.file, toStub.phrase, toStub.phrase); + stringStore.addKeyValue(toStub.file, toStub.phrase, toStub.phrase); } } diff --git a/src/core/CharacterManager.java b/src/core/CharacterManager.java index caa40ed..0a55d81 100644 --- a/src/core/CharacterManager.java +++ b/src/core/CharacterManager.java @@ -1,15 +1,19 @@ package core; +import java.util.ArrayList; import java.util.Vector; import dataStructures.KittyCharacter; +import dataStructures.KittyTrackedLong; import dataStructures.KittyUser; +import me.xdrop.fuzzywuzzy.FuzzySearch; import utils.GlobalLog; import utils.LogFilter; public class CharacterManager { - public static CharacterManager instance; + public static CharacterManager instance; + KittyTrackedLong uniqueID = new KittyTrackedLong("CharacterIDCounter", ""); private Vector characters = new Vector(); public CharacterManager() @@ -20,11 +24,38 @@ public class CharacterManager } else { - GlobalLog.Error(LogFilter.Core, "Attempted to create a second CharacterManager singleton!"); + GlobalLog.error(LogFilter.Core, "Attempted to create a second CharacterManager singleton!"); return; } } + public ArrayList searchCharacter(String query) + { + ArrayList chars = new ArrayList(); + try + { + long UID = Long.parseLong(query); + for(KittyCharacter character:characters) + { + if(character.getUID() == UID) + { + chars.add(character); + break; + } + } + }catch(Exception e) + { + for(KittyCharacter character:characters) + { + if(FuzzySearch.ratio(query.toLowerCase(), character.getName().toLowerCase()) > 60) + { + chars.add(character); + } + } + } + return chars; + } + public boolean addCharacter(KittyUser user, String name, String bio, String refImage) { for(KittyCharacter character:characters) @@ -35,45 +66,29 @@ public class CharacterManager } } - characters.add(new KittyCharacter(user, name, bio, refImage)); + characters.add(new KittyCharacter(user, name, bio, refImage, uniqueID.get())); + uniqueID.add(1); return true; } - public boolean removeCharacter(KittyUser user, String name) + public void removeCharacter(KittyCharacter character, String name) { - for(KittyCharacter character:characters) - { - if(character.getName().equals(name) && character.getOwner().discordID.equals(user.discordID)) - { - characters.remove(character); - return true; - } - } - return false; + characters.remove(character); } - public boolean editRefImage(KittyUser user, String name, String refImage) + public void editRefImage(KittyCharacter character, String refImage) { - for(KittyCharacter character:characters) - { - if(character.getName().equals(name) && character.getOwner().discordID.equals(user.discordID)) - { - return character.editRefImage(user, refImage); - } - } - return false; + character.editRefImage(refImage); } - public boolean editBio(KittyUser user, String name, String bio) + public void editBio(KittyCharacter character, String bio) { - for(KittyCharacter character:characters) - { - if(character.getName().equals(name) && character.getOwner().discordID.equals(user.discordID)) - { - return character.editBio(user, bio); - } - } - return false; + character.editBio(bio); + } + + public void editName(KittyCharacter character, String name) + { + character.editName(name); } } diff --git a/src/core/Command.java b/src/core/Command.java index a8defdb..f38e0e8 100644 --- a/src/core/Command.java +++ b/src/core/Command.java @@ -26,65 +26,65 @@ public abstract class Command this.contentRating = contentRating; } - private void Reject(KittyUser user, String reason) + private void reject(KittyUser user, String reason) { - GlobalLog.Warn(LogFilter.Command, this.getClass().getSimpleName() + " from " + user.name + " rejected due to command's " + reason); + GlobalLog.warn(LogFilter.Command, this.getClass().getSimpleName() + " from " + user.name + " rejected due to command's " + reason); } // Determine if we're exclusive enough for this command and // if the command is permitted by the guild we're in - private boolean CanCall(KittyGuild guild, KittyChannel channel, KittyUser user) + private boolean canCall(KittyGuild guild, KittyChannel channel, KittyUser user) { if(guild.contentRating.getValue() < contentRating.getValue()) { - Reject(user, "content rating"); + reject(user, "content rating"); return false; } //TODO: ADD CHANNEL CHECK HERE - if(user.GetRole().getValue() >= roleLevel.getValue()) + if(user.getRole().getValue() >= roleLevel.getValue()) { return true; } - Reject(user, "permissions"); + reject(user, "permissions"); return false; } // Called by the Command manager - this will run the command // if the issuing user has the permission to do so! - protected final void Invoke(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) + protected final void invoke(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - if(!CanCall(guild, channel, user)) + if(!canCall(guild, channel, user)) return; - OnRun(guild, channel, user, input, res); + onRun(guild, channel, user, input, res); } - public ArrayList RegisteredNames() + public ArrayList registeredNames() { return registeredNames; } - public KittyRating Rating() + public KittyRating rating() { return contentRating; } - public KittyRole RequiredRole() + public KittyRole requiredRole() { return roleLevel; } // OVERRIDE ME! (This is not required but advised!) // Returns if the command succeeded or not. - public String HelpText() + public String getHelpText() { return "No help text has been added yet for " + this.getClass().getSimpleName() + "!"; } // OVERRIDE ME! (This is required) // Returns if the command succeeded or not. - public abstract void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res); + public abstract void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res); } diff --git a/src/core/CommandEnabler.java b/src/core/CommandEnabler.java index 25a83cc..b249655 100644 --- a/src/core/CommandEnabler.java +++ b/src/core/CommandEnabler.java @@ -30,20 +30,20 @@ public class CommandEnabler extends BaseKeyValueFile super(name); // Create/Init variables - GlobalLog.Log(LogFilter.Core, "Initializing " + this.getClass().getSimpleName()); + GlobalLog.log(LogFilter.Core, "Initializing " + this.getClass().getSimpleName()); enabledMap = new HashMap<>(); keyList = new ArrayList<>(); // Startup - ReadIn(); - GetTrackedCommands(); - WriteOut(); + readIn(); + getTrackedCommands(); + writeOut(); } // Reads in the config file and parses it, keeping tabs on the order it read things - private void ReadIn() + private void readIn() { - Parse((pair) ->{ + parse((pair) ->{ String key = pair.First; String value = pair.Second; @@ -58,9 +58,9 @@ public class CommandEnabler extends BaseKeyValueFile // Look up the already scraped values from the localizer and store them if they // don't already exist in the lookup. Defaults to defaultEnabledState. - private void GetTrackedCommands() + private void getTrackedCommands() { - ArrayList unloc = LocCommands.GetUnlocalizedCommands(); + ArrayList unloc = LocCommands.getUnlocalizedCommands(); for(int i = 0; i < unloc.size(); ++i) { @@ -68,14 +68,14 @@ public class CommandEnabler extends BaseKeyValueFile if(enabledMap.putIfAbsent(command, defaultEnabledState) == null) { - GlobalLog.Log(LogFilter.Strings, "Identified new toggleable raw command: " + command); + GlobalLog.log(LogFilter.Strings, "Identified new toggleable raw command: " + command); keyList.add(command); } } } // Write out enabled/disabled file info. - private void WriteOut() + private void writeOut() { List> list = new Vector>(); @@ -92,11 +92,11 @@ public class CommandEnabler extends BaseKeyValueFile Collections.sort(list, (c1, c2) -> { return c1.First.compareTo(c2.First); }); - Write(list); + write(list); } // Looks up a key to see if it's enabled or not - public boolean IsEnabled(String key) + public boolean isEnabled(String key) { String toCheck = key.toLowerCase(); diff --git a/src/core/CommandManager.java b/src/core/CommandManager.java index 5e79a7c..73befc7 100644 --- a/src/core/CommandManager.java +++ b/src/core/CommandManager.java @@ -31,7 +31,7 @@ public class CommandManager // Allows the command manager to keep track of a command. Takes a pair (the un-localized and localzied commands) // and the command associated with the localized commands. - public void Register(Pair pair, Command command) + public void register(Pair pair, Command command) { if(pair == null || pair.Second == null) return; @@ -39,7 +39,7 @@ public class CommandManager // If we haven't already split a multisplit command (or even assessed that), // then verify if we even need to register the commands at all. If it's // not enabled, don't register it. - if(pair.First != null && !commandEnabler.IsEnabled(pair.First)) + if(pair.First != null && !commandEnabler.isEnabled(pair.First)) return; String key = pair.Second; @@ -48,7 +48,7 @@ public class CommandManager { String[] keys = key.split(","); - Register(keys, command); + register(keys, command); return; } @@ -59,25 +59,25 @@ public class CommandManager if(old != null) { - GlobalLog.Warn(LogFilter.Core, "Writing over a command with the key " + key); + GlobalLog.warn(LogFilter.Core, "Writing over a command with the key " + key); return; } - GlobalLog.Log(LogFilter.Core, "Command registered under key " + key); + GlobalLog.log(LogFilter.Core, "Command registered under key " + key); } // Registers a command under multiple names! - public void Register(String[] keys, Command command) + public void register(String[] keys, Command command) { for(int i = 0; i < keys.length; ++i) - Register(new Pair(null, keys[i].trim()), command); + register(new Pair(null, keys[i].trim()), command); } // Calls the command but on a whole new thread! - public boolean InvokeOnNewThread(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response responseContext) + public boolean invokeOnNewThread(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response responseContext) { // This is here to prevent spinning up a thread if this wasn't even a command. - if(input == null || !input.IsValid()) + if(input == null || !input.isValid()) return false; Command command = commands.get(input.key); @@ -91,44 +91,44 @@ public class CommandManager } else { - GlobalLog.Warn(LogFilter.Command, "User " + user.name + " tried to invoke command that doesn't exist: " + input.key); + GlobalLog.warn(LogFilter.Command, "User " + user.name + " tried to invoke command that doesn't exist: " + input.key); return false; } } // Calls the command specified with the key, providing user information arguments, etc. - void Invoke(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response responseContext) + void invoke(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response responseContext) { - if(input == null || !input.IsValid()) + if(input == null || !input.isValid()) return; Command command = commands.get(input.key); if(command != null) { ++invokeCount; - command.Invoke(guild, channel, user, input, responseContext); + command.invoke(guild, channel, user, input, responseContext); } } // Looks up command by name. If it exists, dumps help text, otherwise returns null. - public String GetCommandHelpText(String lookup) + public String getCommandHelpText(String key) { - Command command = commands.get(lookup); + Command command = commands.get(key); if(command != null) - return command.HelpText(); + return "`" + key + "`: " + command.getHelpText(); return null; } // Returns the number of commands sent so far during this program run - public long GetInvokeCount() + public long getInvokeCount() { return invokeCount; } // Returns all commands by name - public ArrayList GetAllRegisteredCommands() + public ArrayList getAllRegisteredCommands() { ArrayList cmds = new ArrayList(); for(Entry entry : commands.entrySet()) @@ -142,7 +142,7 @@ public class CommandManager { public HashMap states = new HashMap(); } - public ThreadData DumpThreadData() + public ThreadData dumpThreadData() { ThreadData data = new ThreadData(); diff --git a/src/core/CommandThread.java b/src/core/CommandThread.java index 2fc5707..2d044e5 100644 --- a/src/core/CommandThread.java +++ b/src/core/CommandThread.java @@ -31,17 +31,17 @@ public class CommandThread extends Thread @Override public void run() { - InvokeCommand(); + invokeCommand(); } - private void InvokeCommand() + private void invokeCommand() { - manager.Invoke(guild, channel, user, input, response); + manager.invoke(guild, channel, user, input, response); } // Handles the try catch requirement java has for sleeping @SuppressWarnings("unused") - private void ThreadSleep(int ms) + private void threadSleep(int ms) { try { diff --git a/src/core/DatabaseDriverKeyValue.java b/src/core/DatabaseDriverKeyValue.java index 01e63c1..14a8699 100644 --- a/src/core/DatabaseDriverKeyValue.java +++ b/src/core/DatabaseDriverKeyValue.java @@ -35,97 +35,97 @@ public class DatabaseDriverKeyValue // Makes sure a table exists with the specified name. // The keyName specifies the key column label, and the valueName specifies the value column label. - public void EnsureTableExists(String tableName, String keyName, String valueName) + public void ensureTableExists(String tableName, String keyName, String valueName) { // Require a global table if it doesn't exist already - driver.ExecuteStatement(JDBCStatementType.Create, "CREATE TABLE IF NOT EXISTS " + tableName + " (" + keyName + " text PRIMARY KEY, " + valueName + " text)", null); + driver.executeStatement(JDBCStatementType.Create, "CREATE TABLE IF NOT EXISTS " + tableName + " (" + keyName + " text PRIMARY KEY, " + valueName + " text)", null); } // Set up and create a table in the database - public boolean Connect() + public boolean connect() { driver = new JDBCDriverSQLite(); - if(driver.Connect() == false) + if(driver.connect() == false) { return false; } // Verify tables we want to use exist - EnsureTableExists(tableName, keyColumnName, valueColumnName); // General table. Do not remove. + ensureTableExists(tableName, keyColumnName, valueColumnName); // General table. Do not remove. return true; } // The key will be created if it doesn't exist and the value specified will be stored. - public void CreateSetKey(String key, String value) + public void createSetKey(String key, String value) { - GlobalLog.Log(LogFilter.Database, "CreateSetKey: Key-" + key + " value-" + value); + GlobalLog.log(LogFilter.Database, "CreateSetKey: Key-" + key + " value-" + value); - if(HasKey(key)) + if(hasKey(key)) { - UpdateKey(key, value); + updateKey(key, value); } else { - CreateKey(key, value); + createKey(key, value); } } // Creates a key. The key will be created if it doesn't exist, and the default value returned. - public String CreateGetKey(String key) + public String createGetKey(String key) { - GlobalLog.Log(LogFilter.Database, "CreateGetKey: " + key); + GlobalLog.log(LogFilter.Database, "CreateGetKey: " + key); - if(HasKey(key)) + if(hasKey(key)) { - return GetKey(key); + return getKey(key); } else { String newValue = ""; - CreateKey(key, newValue); + createKey(key, newValue); return newValue; } } // Prototype formatting for key updating - private void UpdateKey(String key, String value) + private void updateKey(String key, String value) { String command = "UPDATE " + tableName + " SET " + valueColumnName + " = ? WHERE " + keyColumnName + " = ?"; - boolean status = driver.ExecuteStatement(JDBCStatementType.Update, command, new String[] { value, key }); - GlobalLog.Log(LogFilter.Database, "UpdateKey status: " + status); + boolean status = driver.executeStatement(JDBCStatementType.Update, command, new String[] { value, key }); + GlobalLog.log(LogFilter.Database, "UpdateKey status: " + status); } // Protoype updating for seeing if a key exists - private boolean HasKey(String key) + private boolean hasKey(String key) { String command = "SELECT COUNT(1) as count FROM " + tableName + " WHERE " + keyColumnName + " = ?"; - ResultSet set = driver.ExecuteReturningStatement(JDBCStatementType.Select, command, new String[] { key }); - String out = ResultAsString(set, "count"); + ResultSet set = driver.executeReturningStatement(JDBCStatementType.Select, command, new String[] { key }); + String out = resultAsString(set, "count"); return out.charAt(0) == '1'; } // Prototype for getting a key - private String GetKey(String key) + private String getKey(String key) { String command = "SELECT " + valueColumnName + " as searchedKey FROM " + tableName +" WHERE " + keyColumnName + " = ?"; - ResultSet set = driver.ExecuteReturningStatement(JDBCStatementType.Select, command, new String[] { key }); - return ResultAsString(set, "searchedKey"); + ResultSet set = driver.executeReturningStatement(JDBCStatementType.Select, command, new String[] { key }); + return resultAsString(set, "searchedKey"); } // Prototype for creating a key - private void CreateKey(String key, String value) + private void createKey(String key, String value) { String command = "INSERT INTO " + tableName + " (GlobalKey, GlobalValue) VALUES (?, ?)"; - boolean status = driver.ExecuteStatement(JDBCStatementType.Insert, command, new String[] { key, value }); - GlobalLog.Log(LogFilter.Database, "CreateKey status: " + status); + boolean status = driver.executeStatement(JDBCStatementType.Insert, command, new String[] { key, value }); + GlobalLog.log(LogFilter.Database, "CreateKey status: " + status); } // Get all keys containing a substring - public List GetKeysWith(String keySubstring) + public List getKeysWith(String keySubstring) { String command = "SELECT * FROM " + tableName + " WHERE " + keyColumnName + " like ?"; - ResultSet result = driver.ExecuteReturningStatement(JDBCStatementType.Select, command, new String[] { "%" + keySubstring + "%" }); + ResultSet result = driver.executeReturningStatement(JDBCStatementType.Select, command, new String[] { "%" + keySubstring + "%" }); List keys = new ArrayList(); @@ -146,7 +146,7 @@ public class DatabaseDriverKeyValue } // Transforms a result into a string if possible. - private String ResultAsString(ResultSet rs, String key) + private String resultAsString(ResultSet rs, String key) { if(rs == null) return ""; @@ -165,7 +165,7 @@ public class DatabaseDriverKeyValue } catch (SQLException e) { - GlobalLog.Error(LogFilter.Database, e.toString()); + GlobalLog.error(LogFilter.Database, e.toString()); return null; } } diff --git a/src/core/DatabaseManager.java b/src/core/DatabaseManager.java index 4649e7f..204165b 100644 --- a/src/core/DatabaseManager.java +++ b/src/core/DatabaseManager.java @@ -35,7 +35,7 @@ public class DatabaseManager // Constructor to enforce singleton. public DatabaseManager() { - GlobalLog.Log(LogFilter.Database, "Creating database manager"); + GlobalLog.log(LogFilter.Database, "Creating database manager"); if(instance == null) { @@ -43,7 +43,7 @@ public class DatabaseManager } else { - GlobalLog.Error(LogFilter.Database, "Attempted to register a second DataBase manager!"); + GlobalLog.error(LogFilter.Database, "Attempted to register a second DataBase manager!"); return; } @@ -57,15 +57,15 @@ public class DatabaseManager characterDataDriver = new DatabaseDriverKeyValue(characterTableName, characterKeyColumnName, characterValueColumnName); // Connect data sets - if(globalDataDriver.Connect() == false) + if(globalDataDriver.connect() == false) { - GlobalLog.Error("Global database failed to connect. Without this DB, this bot can not run."); + GlobalLog.error("Global database failed to connect. Without this DB, this bot can not run."); System.exit(1); } - if(characterDataDriver.Connect() == false) + if(characterDataDriver.connect() == false) { - GlobalLog.Error("Character database failed to connect. Without this DB, this bot can not run."); + GlobalLog.error("Character database failed to connect. Without this DB, this bot can not run."); System.exit(1); } } @@ -94,10 +94,10 @@ public class DatabaseManager { DatabaseTrackedObject dto = globalDataTrackedObjects.get(i); - if(dto.IsDirty()) + if(dto.isDirty()) { - globalSetRemoteValue(dto.identifier, dto.Serialize()); - dto.Resolve(); + globalSetRemoteValue(dto.identifier, dto.serialize()); + dto.resolve(); ++numUpdated; } } @@ -117,10 +117,10 @@ public class DatabaseManager { DatabaseTrackedObject dto = characterDataTrackedObjects.get(i); - if(dto.IsDirty()) + if(dto.isDirty()) { - characterSetRemoteValue(dto.identifier, dto.Serialize()); - dto.Resolve(); + characterSetRemoteValue(dto.identifier, dto.serialize()); + dto.resolve(); ++numUpdated; } } @@ -131,7 +131,7 @@ public class DatabaseManager public List scrapeGlobalForString(String substring) { - return globalDataDriver.GetKeysWith(substring); + return globalDataDriver.getKeysWith(substring); } ///////////////// @@ -142,7 +142,7 @@ public class DatabaseManager synchronized(globalDataTrackedObjects) { globalDataTrackedObjects.add(tracked); - tracked.DeSerialzie(globalGetRemoteValue(tracked.identifier)); + tracked.deSerialzie(globalGetRemoteValue(tracked.identifier)); } } @@ -151,7 +151,7 @@ public class DatabaseManager { synchronized(globalDataDriver) { - return globalDataDriver.CreateGetKey(key); + return globalDataDriver.createGetKey(key); } } @@ -159,7 +159,7 @@ public class DatabaseManager { synchronized(globalDataDriver) { - globalDataDriver.CreateSetKey(key, value); + globalDataDriver.createSetKey(key, value); } } @@ -172,7 +172,7 @@ public class DatabaseManager synchronized(characterDataTrackedObjects) { characterDataTrackedObjects.add(tracked); - tracked.DeSerialzie(characterGetRemoteValue(tracked.identifier)); + tracked.deSerialzie(characterGetRemoteValue(tracked.identifier)); } } @@ -181,7 +181,7 @@ public class DatabaseManager { synchronized(characterDataDriver) { - return characterDataDriver.CreateGetKey(key); + return characterDataDriver.createGetKey(key); } } @@ -189,7 +189,7 @@ public class DatabaseManager { synchronized(characterDataDriver) { - characterDataDriver.CreateSetKey(key, value); + characterDataDriver.createSetKey(key, value); } } diff --git a/src/core/DatabaseTrackedObject.java b/src/core/DatabaseTrackedObject.java index 2edfc91..f254e1d 100644 --- a/src/core/DatabaseTrackedObject.java +++ b/src/core/DatabaseTrackedObject.java @@ -13,7 +13,7 @@ public abstract class DatabaseTrackedObject this.identifier = identifier; } - public final boolean IsDirty() + public final boolean isDirty() { synchronized(isDirty) { @@ -21,7 +21,7 @@ public abstract class DatabaseTrackedObject } } - public final void MarkDirty() + public final void markDirty() { synchronized(isDirty) { @@ -29,7 +29,7 @@ public abstract class DatabaseTrackedObject } } - public final void Resolve() + public final void resolve() { synchronized(isDirty) { @@ -39,6 +39,6 @@ public abstract class DatabaseTrackedObject // Consider an object factory instead of dedicated serialization methods // if this starts to become impractical. For now, it works. - public abstract String Serialize(); - public abstract void DeSerialzie(String string); + public abstract String serialize(); + public abstract void deSerialzie(String string); } diff --git a/src/core/LocCommands.java b/src/core/LocCommands.java index 6d5b9bd..86bfc1d 100644 --- a/src/core/LocCommands.java +++ b/src/core/LocCommands.java @@ -11,7 +11,7 @@ import dataStructures.Pair; public class LocCommands extends BaseLocFile { public static final String fileName = "locCommands.config"; - public static final String function = "LocCommands.Stub"; + public static final String function = "LocCommands.stub"; private static LocCommands instance; @@ -19,40 +19,40 @@ public class LocCommands extends BaseLocFile { super(fileName, function); - GlobalLog.Log(LogFilter.Core, "Initializing " + this.getClass().getSimpleName()); + GlobalLog.log(LogFilter.Core, "Initializing " + this.getClass().getSimpleName()); if(instance == null) { instance = this; - UpdateLocFromDisk(); - ScrapeAll(); - SaveLocToDisk(); + updateLocFromDisk(); + scrapeAll(); + saveLocToDisk(); fileMonitor = new FileMonitor(filename); } else { - GlobalLog.Error(LogFilter.Core, "You can't have two of the following: " + this.getClass().getSimpleName()); + GlobalLog.error(LogFilter.Core, "You can't have two of the following: " + this.getClass().getSimpleName()); } } // Returns a pair, the raw key and the stub key - public static Pair Stub(String toStub) + public static Pair stub(String toStub) { - return new Pair(toStub, instance.GetKey(toStub)); + return new Pair(toStub, instance.getKey(toStub)); } // Gets all of the un-translated defaults in the commands list. - public static ArrayList GetUnlocalizedCommands() + public static ArrayList getUnlocalizedCommands() { ArrayList raw = new ArrayList<>(); - instance.stringStore.ForEach((pair) -> raw.add((String)((Pair)pair).First )); + instance.stringStore.forEach((pair) -> raw.add((String)((Pair)pair).First )); return raw; } - public static void Upkeep() + public static void upkeep() { - instance.Update(); + instance.update(); } } diff --git a/src/core/LocStrings.java b/src/core/LocStrings.java index 7b95573..c95d363 100644 --- a/src/core/LocStrings.java +++ b/src/core/LocStrings.java @@ -10,7 +10,7 @@ import utils.io.FileMonitor; public class LocStrings extends BaseLocFile { public static final String fileName = "locStrings.config"; - public static final String function = "LocStrings.Stub"; + public static final String function = "LocStrings.stub"; private static LocStrings instance; @@ -18,37 +18,37 @@ public class LocStrings extends BaseLocFile { super(fileName, function); - GlobalLog.Log(LogFilter.Core, "Initializing " + this.getClass().getSimpleName()); + GlobalLog.log(LogFilter.Core, "Initializing " + this.getClass().getSimpleName()); if(instance == null) { instance = this; - UpdateLocFromDisk(); - ScrapeAll(); - SaveLocToDisk(); + updateLocFromDisk(); + scrapeAll(); + saveLocToDisk(); fileMonitor = new FileMonitor(filename); } else { - GlobalLog.Error(LogFilter.Core, "You can't have two of the following: " + this.getClass().getSimpleName()); + GlobalLog.error(LogFilter.Core, "You can't have two of the following: " + this.getClass().getSimpleName()); } } - public static String Stub(String toStub) + public static String stub(String toStub) { - return Lookup(toStub); + return lookup(toStub); } // Won't be picked up when scraping - public static String Lookup(String stubbedPreviously) + public static String lookup(String stubbedPreviously) { - return instance.GetKey(stubbedPreviously); + return instance.getKey(stubbedPreviously); } - public static void Upkeep() + public static void upkeep() { - instance.Update(); + instance.update(); } } \ No newline at end of file diff --git a/src/core/ObjectBuilderFactory.java b/src/core/ObjectBuilderFactory.java index 66c8ad0..640157b 100644 --- a/src/core/ObjectBuilderFactory.java +++ b/src/core/ObjectBuilderFactory.java @@ -59,7 +59,7 @@ public class ObjectBuilderFactory // Handles if we can or can't use specific commands, parsing a config file based on loc data to do so. private static CommandEnabler commandEnabler; - + // Lazy initialization multithreaded mutex stuff to prevent explosions. // TODO: Investigate using 'synchronized' instead potentially private static boolean hasInitialized; @@ -67,7 +67,7 @@ public class ObjectBuilderFactory private static JDA kitty; // This is it, this is how the lazy init starts! - private static void LazyInit() + private static void lazyInit() { if(hasInitialized) return; @@ -99,7 +99,7 @@ public class ObjectBuilderFactory } catch(InterruptedException ie) { - GlobalLog.Error(LogFilter.Core, "Issue during object builder lazy initialization." + GlobalLog.error(LogFilter.Core, "Issue during object builder lazy initialization." + " The factory was not initialized, and kitty will not be able to continue functionally."); } } @@ -109,9 +109,9 @@ public class ObjectBuilderFactory //////////////////////// // Explicitly locks: guildCache - public static KittyGuild ExtractGuild(GuildMessageReceivedEvent event) + public static KittyGuild extractGuild(GuildMessageReceivedEvent event) { - LazyInit(); + lazyInit(); // Look up the guild. This process can only happen in a single-threaded way // because of the nature of the cache. We wait until the last second to @@ -129,6 +129,7 @@ public class ObjectBuilderFactory 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; @@ -152,9 +153,9 @@ public class ObjectBuilderFactory } // Explicitly locks: guildCache - public static KittyRole ExtractRole(GuildMessageReceivedEvent event) + public static KittyRole extractRole(GuildMessageReceivedEvent event) { - LazyInit(); + lazyInit(); // Looks up the user role. If none is found we check to see if they own // the guild if not, they're assumed to be @@ -171,7 +172,7 @@ public class ObjectBuilderFactory { KittyUser cachedUser = userCache.get(uid); if(cachedUser != null) - role = cachedUser.GetRole(); + role = cachedUser.getRole(); } return role; @@ -179,9 +180,9 @@ public class ObjectBuilderFactory // Explicitly locks: guildCache // Extracts the content rating information it can from the provided event. - public static KittyRating ExtractContentRating(GuildMessageReceivedEvent event) + public static KittyRating extractContentRating(GuildMessageReceivedEvent event) { - LazyInit(); + lazyInit(); // Look up content rating of the guild, returns a safe content rating. KittyRating contentRating = KittyRating.Safe; @@ -197,9 +198,9 @@ public class ObjectBuilderFactory } // Implicitly locks guild cache by calling ExtractGuild - public static KittyChannel ExtractChannel(GuildMessageReceivedEvent event) + public static KittyChannel extractChannel(GuildMessageReceivedEvent event) { - LazyInit(); + lazyInit(); String channelID = event.getChannel().getId(); String guildID = event.getGuild().getId(); @@ -225,9 +226,9 @@ public class ObjectBuilderFactory } // Implicitly locks guild cache by calling ExtractRole and ExtractGuild - public static KittyUser ExtractUser(GuildMessageReceivedEvent event) + public static KittyUser extractUser(GuildMessageReceivedEvent event) { - LazyInit(); + lazyInit(); String uid = event.getGuild().getId() + event.getAuthor().getId(); KittyUser user = null; @@ -241,8 +242,8 @@ public class ObjectBuilderFactory } else { - KittyRole role = ExtractRole(event); - KittyGuild guild = ExtractGuild(event); + KittyRole role = extractRole(event); + KittyGuild guild = extractGuild(event); String name; if(event.getMember().getNickname() == null) @@ -266,20 +267,20 @@ public class ObjectBuilderFactory { mentioned = event.getMessage().getMentionedMembers().get(i); if(mentioned.getNickname() != null) - ExtractUserByJDAUser(event.getGuild().getId(), mentioned.getNickname(), + extractUserByJDAUser(event.getGuild().getId(), mentioned.getNickname(), mentioned.getUser().getId(), mentioned.getUser().getAvatarUrl(), mentioned.getUser().getId()); else - ExtractUserByJDAUser(event.getGuild().getId(), mentioned.getUser().getName(), + extractUserByJDAUser(event.getGuild().getId(), mentioned.getUser().getName(), mentioned.getUser().getId(), mentioned.getUser().getAvatarUrl(), mentioned.getUser().getId()); } return user; } - // TODO: Cleanup - public static KittyUser ExtractUserByJDAUser(String guildID, String name, String userID, String avatarID, String discordID) + // TODO: Clean up + public static KittyUser extractUserByJDAUser(String guildID, String name, String userID, String avatarID, String discordID) { - LazyInit(); + lazyInit(); String uid = guildID + userID; KittyUser user = null; @@ -290,6 +291,7 @@ public class ObjectBuilderFactory { if(name != null) cachedUser.name = name; + cachedUser.avatarID = avatarID; user = cachedUser; } @@ -323,30 +325,36 @@ public class ObjectBuilderFactory Member jdaMember = jdaGuild.getMemberById(userID); User jdaUser = jdaMember.getUser(); - user = ExtractUserByJDAUser(guildID, jdaMember.getNickname(), jdaUser.getId(), jdaUser.getAvatarUrl(), jdaUser.getId()); + user = extractUserByJDAUser(guildID, jdaMember.getNickname(), jdaUser.getId(), jdaUser.getAvatarUrl(), jdaUser.getId()); updateUser(user, jdaMember); } return user; } + // Updates a user's name appropriately based on nickname if available public static void updateUser(KittyUser user, Member member) { if(member.getNickname() == null) + { user.name = member.getUser().getName(); + } else + { user.name = member.getNickname(); + } user.avatarID = member.getUser().getAvatarUrl(); } + ////////////////////////// // Construction Methods // ////////////////////////// - - public static KittyCore ConstructKittyCore() throws LoginException, InterruptedException + // Builds the core of the bot + public static KittyCore constructKittyCore() throws LoginException, InterruptedException { - LazyInit(); + lazyInit(); kitty = new JDABuilder(AccountType.BOT).setToken(Ref.TestToken).buildBlocking(); kitty.getPresence().setGame(Game.playing("with digital yarn")); @@ -359,80 +367,85 @@ public class ObjectBuilderFactory // and disabling, what we do is construct the commands with a localized pair that is checked against // the CommandEnabler object passed in. In theory, we could have multiple CommandManagers, tho we can // only have one CommandEnabler. - public static CommandManager ConstructCommandManager(CommandEnabler commandEnabler) + public static CommandManager constructCommandManager(CommandEnabler commandEnabler) { - LazyInit(); + lazyInit(); CommandManager manager = new CommandManager(commandEnabler); // Dev - manager.Register(LocCommands.Stub("work"), new CommandDoWork(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("shutdown"), new CommandShutdown(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("stats"), new CommandStats(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("invite"), new CommandInvite(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("buildHelp"), new CommandHelpBuilder(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("tweet"), new CommandTweet(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("dbflush"), new CommandDBFlush(KittyRole.Dev, KittyRating.Safe)); - manager.Register(LocCommands.Stub("dbstats"), new CommandDBStats(KittyRole.Dev, KittyRating.Safe)); + manager.register(LocCommands.stub("work"), new CommandDoWork(KittyRole.Dev, KittyRating.Safe)); + manager.register(LocCommands.stub("shutdown"), new CommandShutdown(KittyRole.Dev, KittyRating.Safe)); + manager.register(LocCommands.stub("stats"), new CommandStats(KittyRole.Dev, KittyRating.Safe)); + manager.register(LocCommands.stub("invite"), new CommandInvite(KittyRole.Dev, KittyRating.Safe)); + manager.register(LocCommands.stub("buildHelp"), new CommandHelpBuilder(KittyRole.Dev, KittyRating.Safe)); + manager.register(LocCommands.stub("tweet"), new CommandTweet(KittyRole.Dev, KittyRating.Safe)); + manager.register(LocCommands.stub("dbflush"), new CommandDBFlush(KittyRole.Dev, KittyRating.Safe)); + manager.register(LocCommands.stub("dbstats"), new CommandDBStats(KittyRole.Dev, KittyRating.Safe)); // Admin - 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("guildroleallowed"), new CommandGuildRoleAllowed(KittyRole.Admin, KittyRating.Safe)); - manager.Register(LocCommands.Stub("guildrolenotallowed"), new CommandGuildRoleNotAllowed(KittyRole.Admin, KittyRating.Safe)); + 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("guildroleallowed"), new CommandGuildRoleAllowed(KittyRole.Admin, KittyRating.Safe)); + manager.register(LocCommands.stub("guildrolenotallowed"), new CommandGuildRoleNotAllowed(KittyRole.Admin, KittyRating.Safe)); // Mod - 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("rafflestart"), new CommandRaffleStart(KittyRole.Mod, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rafflespin"), new CommandRaffleSpin(KittyRole.Mod, KittyRating.Safe)); - manager.Register(LocCommands.Stub("raffleend"), new CommandRaffleEnd(KittyRole.Mod, 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("rafflestart"), new CommandRaffleStart(KittyRole.Mod, KittyRating.Safe)); + manager.register(LocCommands.stub("rafflespin"), new CommandRaffleSpin(KittyRole.Mod, KittyRating.Safe)); + manager.register(LocCommands.stub("raffleend"), new CommandRaffleEnd(KittyRole.Mod, KittyRating.Safe)); // General - 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)); - manager.Register(LocCommands.Stub("ping"), new CommandPing(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("boop"), new CommandBoop(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("roll"), new CommandRoll(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("choose"), new CommandChoose(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("help"), new CommandHelp(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("info, about"), new CommandInfo(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("vote"), new CommandPollVote(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("results"), new CommandPollResults(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("showpoll"), new CommandPollShow(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("wolfram"), new CommandWolfram(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("c++, g++, cplus, cpp"), new CommandColiru(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("java, jdoodle"), new CommandJDoodle(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("beans"), new CommandBeansShow(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("role"), new CommandRole(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("bet"), new CommandBetBeans(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("map"), new CommandMap(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rpstart"), new CommandRPStart(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rpend"), new CommandRPEnd(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("tony, stark, dontfeelgood, dontfeelsogood"), new CommandStark(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("blur"), new CommandBlurry(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("eightball, 8ball"), new CommandEightBall(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("catch"), new CommandCatch(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("guildrolelist"), new CommandGuildRoleList(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("bethistory"), new CommandBetHistory(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("crouton"), new CommandCrouton(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("benchmark, bench"), new CommandBenchmark(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("rafflejoin"), new CommandRaffleJoin(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("charactercreate"), new CommandCharacterCreate(KittyRole.General, KittyRating.Safe)); - manager.Register(LocCommands.Stub("leaderboard"), new CommandLeaderboard(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)); + manager.register(LocCommands.stub("ping"), new CommandPing(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("boop"), new CommandBoop(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("roll"), new CommandRoll(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("choose"), new CommandChoose(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("help"), new CommandHelp(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("info, about"), new CommandInfo(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("vote"), new CommandPollVote(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("results"), new CommandPollResults(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("showpoll"), new CommandPollShow(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("wolfram"), new CommandWolfram(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("c++, g++, cplus, cpp"), new CommandColiru(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("java, jdoodle"), new CommandJDoodle(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("beans"), new CommandBeansShow(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("role"), new CommandRole(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("bet"), new CommandBetBeans(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("map"), new CommandMap(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("rpstart"), new CommandRPStart(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("rpend"), new CommandRPEnd(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("tony, stark, dontfeelgood, dontfeelsogood"), new CommandStark(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("blur"), new CommandBlurry(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("eightball, 8ball"), new CommandEightBall(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("catch"), new CommandCatch(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("guildrolelist"), new CommandGuildRoleList(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("bethistory"), new CommandBetHistory(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("crouton"), new CommandCrouton(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("benchmark, bench"), new CommandBenchmark(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("rafflejoin"), new CommandRaffleJoin(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("charactercreate"), new CommandCharacterCreate(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("searchcharacter"), new CommandCharacterSearch(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("charactereditbio"), new CommandCharacterEditBio(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("charactereditname"), new CommandCharacterEditName(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("charactereditURL"), new CommandCharacterEditURL(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("leaderboard"), new CommandLeaderboard(KittyRole.General, KittyRating.Safe)); + manager.register(LocCommands.stub("color, colour"), new CommandColor(KittyRole.General, KittyRating.Safe)); return manager; } // Constructs a CommandEnabler if it doesn't exist, and gets the existing one if it does. - public static CommandEnabler ConstructCommandEnabler() + public static CommandEnabler constructCommandEnabler() { - LazyInit(); + lazyInit(); if(commandEnabler == null) commandEnabler = new CommandEnabler(); @@ -444,9 +457,9 @@ public class ObjectBuilderFactory // in different ways, and so we construct it outside of the constructor for // the factory since it doesn't have to be present / can be elsewhere. // Effectively we cache the database here. - public static DatabaseManager ConstructDatabaseManager() + public static DatabaseManager constructDatabaseManager() { - LazyInit(); + lazyInit(); if(database == null) database = new DatabaseManager(); @@ -454,9 +467,9 @@ public class ObjectBuilderFactory return database; } - public static Stats ConstructStats(CommandManager manager) + public static Stats constructStats(CommandManager manager) { - LazyInit(); + lazyInit(); if(stats == null) stats = new Stats(manager); @@ -464,9 +477,9 @@ public class ObjectBuilderFactory return stats; } - public static RPManager ConstructRPManager() + public static RPManager constructRPManager() { - LazyInit(); + lazyInit(); if(rpManager == null) rpManager = new RPManager(); @@ -474,22 +487,23 @@ public class ObjectBuilderFactory return rpManager; } - public static PluginManager ConstructPluginManager() + public static PluginManager constructPluginManager() { - LazyInit(); + lazyInit(); if(pluginManager == null) pluginManager = new PluginManager("./plugins/"); return pluginManager; } - + + ///////////////////// // Utility Methods // ///////////////////// // Returns number of cached guilds (does not equal total users in the database, only what's in memory) - public static Integer GetGuildCount() + public static Integer getGuildCount() { synchronized(guildCache) { return guildCache.size(); @@ -497,10 +511,10 @@ public class ObjectBuilderFactory } // Returns number of cached users (does not equal total users in the database, only what's in memory) - public static Integer GetUserCount() + public static Integer getUserCount() { synchronized(userCache) { return userCache.size(); } } -} +} \ No newline at end of file diff --git a/src/core/RPManager.java b/src/core/RPManager.java index f56be78..9047d9e 100644 --- a/src/core/RPManager.java +++ b/src/core/RPManager.java @@ -23,7 +23,7 @@ public class RPManager } else { - GlobalLog.Error(LogFilter.Core, "Attempted to create a second RP Manager!"); + GlobalLog.error(LogFilter.Core, "Attempted to create a second RP Manager!"); return; } } @@ -39,7 +39,7 @@ public class RPManager public void addLine(KittyChannel channel, KittyUser user, UserInput input) { - if(logs.containsKey(Long.parseLong(channel.uniqueID)) && !input.IsValid()) + if(logs.containsKey(Long.parseLong(channel.uniqueID)) && !input.isValid()) logs.get(Long.parseLong(channel.uniqueID)).addLine(user, input.message); } @@ -55,7 +55,7 @@ public class RPManager return log; } - public static void Upkeep(KittyCore kitty) + public static void upkeep(KittyCore kitty) { Response res = new Response(null, kitty); String reminder = ""; @@ -71,7 +71,7 @@ public class RPManager { reminder += " <@" + users.get(i) + ">"; } - res.CallToChannel(reminder, entry.getValue().getChannel().uniqueID); + res.sendToChannel(reminder, entry.getValue().getChannel().uniqueID); reminder = ""; entry.getValue().resetTimer(); diff --git a/src/core/Stats.java b/src/core/Stats.java index 43ca17b..f3fc254 100644 --- a/src/core/Stats.java +++ b/src/core/Stats.java @@ -31,7 +31,7 @@ public class Stats } else { - GlobalLog.Error(LogFilter.Core, "Attempted to create a second Stats singleton!"); + GlobalLog.error(LogFilter.Core, "Attempted to create a second Stats singleton!"); return; } @@ -43,12 +43,12 @@ public class Stats osBean = ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class); } - public void NoteMessageEvent() + public void noteMessageEvent() { ++messagesSeen; } - public void IndicateShutdown() + public void indicateShutdown() { synchronized(instance) { @@ -56,7 +56,7 @@ public class Stats } } - public boolean GetIsShuttingDown() + public boolean getIsShuttingDown() { synchronized(instance) { @@ -69,7 +69,7 @@ public class Stats ///////////////////////////////////////// // Formatted as HH:MM:SS - public String GetFormattedUptime() + public String getFormattedUptime() { long dif = System.currentTimeMillis() - initTimeMS; @@ -80,48 +80,48 @@ public class Stats } // Get number of commands that kitty has run! - public long GetCommandsProcessed() + public long getCommandsProcessed() { - return commandManager.GetInvokeCount(); + return commandManager.getInvokeCount(); } - public long GetMessagesSeen() + public long getMessagesSeen() { return messagesSeen; } - public double GetSystemCPULoad() + public double getSystemCPULoad() { return osBean.getSystemLoadAverage(); } - public long GetCPUAvailable() + public long getCPUAvailable() { return osBean.getAvailableProcessors(); } - public ThreadData GetThreadData() + public ThreadData getThreadData() { - return commandManager.DumpThreadData(); + return commandManager.dumpThreadData(); } - public int GetGuildCount() + public int getGuildCount() { - return ObjectBuilderFactory.GetGuildCount(); + return ObjectBuilderFactory.getGuildCount(); } - public int GetUserCount() + public int getUserCount() { - return ObjectBuilderFactory.GetUserCount(); + return ObjectBuilderFactory.getUserCount(); } - public ArrayList GetAllCommands() + public ArrayList getAllCommands() { - return commandManager.GetAllRegisteredCommands(); + return commandManager.getAllRegisteredCommands(); } - public String GetHelpText(String commandName) + public String getHelpText(String commandName) { - return commandManager.GetCommandHelpText(commandName); + return commandManager.getCommandHelpText(commandName); } } diff --git a/src/core/benchmark/BenchmarkCommand.java b/src/core/benchmark/BenchmarkCommand.java index 96a808e..3b04e59 100644 --- a/src/core/benchmark/BenchmarkCommand.java +++ b/src/core/benchmark/BenchmarkCommand.java @@ -6,5 +6,5 @@ public abstract class BenchmarkCommand { } // OVERRIDE ME - public abstract BenchmarkFormattable OnRun(BenchmarkManager manager, BenchmarkInput input); + public abstract BenchmarkFormattable onRun(BenchmarkManager manager, BenchmarkInput input); } diff --git a/src/core/benchmark/BenchmarkFormattable.java b/src/core/benchmark/BenchmarkFormattable.java index 7c75bfa..7261ea6 100644 --- a/src/core/benchmark/BenchmarkFormattable.java +++ b/src/core/benchmark/BenchmarkFormattable.java @@ -30,11 +30,11 @@ public class BenchmarkFormattable this.resString = null; } - public void Call(Response res) + public void call(Response res) { if(resEmbed == null) - res.Call(resString); + res.send(resString); else - res.CallEmbed(resEmbed); + res.send(resEmbed); } } diff --git a/src/core/benchmark/BenchmarkFramework.java b/src/core/benchmark/BenchmarkFramework.java index 4c12c6e..948f7f1 100644 --- a/src/core/benchmark/BenchmarkFramework.java +++ b/src/core/benchmark/BenchmarkFramework.java @@ -16,43 +16,43 @@ public class BenchmarkFramework this.benchmarkManager = new BenchmarkManager(); this.benchmarkCommand = new HashMap(); - RegisterCommand("find", new BenchmarkCommandFind()); - RegisterCommand("compare", new BenchmarkCommandCompare()); - RegisterCommand("info", new BenchmarkCommandInfo()); + registerCommand("find", new BenchmarkCommandFind()); + registerCommand("compare", new BenchmarkCommandCompare()); + registerCommand("info", new BenchmarkCommandInfo()); } // Runs a command if possible. - public BenchmarkFormattable Run(String args) + public BenchmarkFormattable run(String args) { BenchmarkInput input = new BenchmarkInput(args); - return ExecuteCommand(input.key, input); + return executeCommand(input.key, input); } - public void Update() + public void update() { synchronized(benchmarkManager) { - benchmarkManager.Update(); + benchmarkManager.update(); } } // Registers a command - private void RegisterCommand(String commandName, BenchmarkCommand command) + private void registerCommand(String commandName, BenchmarkCommand command) { commandName = commandName.toLowerCase(); if(benchmarkCommand.put(commandName, command) != null) - BenchmarkLog.Log("Multiple registration of a command with name '" + commandName + "'!"); + BenchmarkLog.log("Multiple registration of a command with name '" + commandName + "'!"); - BenchmarkLog.Log("Registered " + commandName); + BenchmarkLog.log("Registered " + commandName); } // Executes a command with the specified name, and provides it with some extra input data. - private BenchmarkFormattable ExecuteCommand(String name, BenchmarkInput input) + private BenchmarkFormattable executeCommand(String name, BenchmarkInput input) { BenchmarkCommand command = benchmarkCommand.get(name.toLowerCase()); if(command != null && benchmarkManager != null) - return command.OnRun(benchmarkManager, input); + return command.onRun(benchmarkManager, input); return null; } diff --git a/src/core/benchmark/BenchmarkInput.java b/src/core/benchmark/BenchmarkInput.java index 3e131ff..3773c36 100644 --- a/src/core/benchmark/BenchmarkInput.java +++ b/src/core/benchmark/BenchmarkInput.java @@ -19,7 +19,7 @@ public class BenchmarkInput return; raw = raw.trim(); - int whitespacePos = StringUtils.FindFirstWhitespace(raw); + int whitespacePos = StringUtils.findFirstWhitespace(raw); if(whitespacePos == -1) { diff --git a/src/core/benchmark/BenchmarkLog.java b/src/core/benchmark/BenchmarkLog.java index e9c1f98..0417f02 100644 --- a/src/core/benchmark/BenchmarkLog.java +++ b/src/core/benchmark/BenchmarkLog.java @@ -5,7 +5,7 @@ import utils.GlobalLog; //Logging shim public class BenchmarkLog { - public static void Log(String str) { GlobalLog.Log("[Benchmark] " + str); } - public static void Warn(String str) { GlobalLog.Warn("[Benchmark] " + str); } - public static void Error(String str) { GlobalLog.Error(" [Benchmark] " + str); } + public static void log(String str) { GlobalLog.log("[Benchmark] " + str); } + public static void warn(String str) { GlobalLog.warn("[Benchmark] " + str); } + public static void error(String str) { GlobalLog.error(" [Benchmark] " + str); } } diff --git a/src/core/benchmark/BenchmarkManager.java b/src/core/benchmark/BenchmarkManager.java index dcf5612..04e9909 100644 --- a/src/core/benchmark/BenchmarkManager.java +++ b/src/core/benchmark/BenchmarkManager.java @@ -33,13 +33,13 @@ public class BenchmarkManager directoryMonitor = new DirectoryMonitor(directory); needsUpdate = false; - RebuildLookup(); + rebuildLookup(); - BenchmarkLog.Log("Took " + (Instant.now().toEpochMilli() - start) + " ms to load " + raw.size() + " entries from " + directoryMonitor.GetCurrentFiles().size() + " file" + (raw.size() > 1 ? "s" : "")); + BenchmarkLog.log("Took " + (Instant.now().toEpochMilli() - start) + " ms to load " + raw.size() + " entries from " + directoryMonitor.getCurrentFiles().size() + " file" + (raw.size() > 1 ? "s" : "")); } // Rebuilds the files being monitored - public void RebuildLookup() + public void rebuildLookup() { long start = Instant.now().toEpochMilli(); @@ -50,14 +50,14 @@ public class BenchmarkManager synchronized(directoryMonitor) { - files = directoryMonitor.GetCurrentFiles(); + files = directoryMonitor.getCurrentFiles(); } if(files != null) { for(MonitoredFile mf : files) { - String contents = FileUtils.ReadContent(mf.path); + String contents = FileUtils.readContent(mf.path); String[] lines = contents.split(lineDelimiter); for(int i = 1; i < lines.length; ++i) @@ -66,17 +66,17 @@ public class BenchmarkManager } else { - BenchmarkLog.Warn("No " + extension + " files where found in " + directory); + BenchmarkLog.warn("No " + extension + " files where found in " + directory); } } long end = Instant.now().toEpochMilli(); - BenchmarkLog.Log("Rebuilt data in " + (end - start) + "ms"); + BenchmarkLog.log("Rebuilt data in " + (end - start) + "ms"); } // Re-evaluates and re-orders the input list based on the Levenshtein distance of the // original search and the contents of the provided list of benchmark entries. - public List EvaluateLevenshteinDistance(List entries, String search) + public List evaluateLevenshteinDistance(List entries, String search) { // Populate cost list with heuristic results List> cost = new ArrayList>(); @@ -86,7 +86,7 @@ public class BenchmarkManager BenchmarkEntry entry = entries.get(i); String entryString = entry.brand + " " + entry.model; - int heuristic = LevenshteinHeuristic(entryString, search, bestSoFar); + int heuristic = levenshteinHeuristic(entryString, search, bestSoFar); if(heuristic < bestSoFar) bestSoFar = heuristic; @@ -120,7 +120,7 @@ public class BenchmarkManager // Returns cost based on distance of characters from string. This is a kinda sloppy way // to do it, but because I keep tabs on the best result so far, it could be much worse. // Still chucks a lot - a non-recursive result w/ memoization would be best but this will do. - private int LevenshteinHeuristic(String str1, String str2, int bestSoFar) + private int levenshteinHeuristic(String str1, String str2, int bestSoFar) { int cost; @@ -139,15 +139,15 @@ public class BenchmarkManager if(distance > bestSoFar) return distance; - int s1 = LevenshteinHeuristic(str1.substring(1), str2, bestSoFar) + 1; - int s2 = LevenshteinHeuristic(str1, str2.substring(1), bestSoFar) + 1; - int s3 = LevenshteinHeuristic(str1.substring(1), str2.substring(1), bestSoFar) + cost; + int s1 = levenshteinHeuristic(str1.substring(1), str2, bestSoFar) + 1; + int s2 = levenshteinHeuristic(str1, str2.substring(1), bestSoFar) + 1; + int s3 = levenshteinHeuristic(str1.substring(1), str2.substring(1), bestSoFar) + cost; return min(new int[] {s1, s2, s3 }); } // Search for a substring in the model name - public List FindModel(String modelSubstr) + public List findModel(String modelSubstr) { long start = Instant.now().toEpochMilli(); List matching = new ArrayList(); @@ -161,27 +161,27 @@ public class BenchmarkManager matching.add(e); } - BenchmarkLog.Log("Searched for '" + searchSubstr + "' for "+ (Instant.now().toEpochMilli() - start) + "ms and found " + matching.size() + " entries."); + BenchmarkLog.log("Searched for '" + searchSubstr + "' for "+ (Instant.now().toEpochMilli() - start) + "ms and found " + matching.size() + " entries."); return matching; } // Keeps tabs on any changes of the files. - public void Update() + public void update() { needsUpdate = false; - directoryMonitor.Update(this::OnRescan, this::OnRescan, this::OnRescan); + directoryMonitor.update(this::onRescan, this::onRescan, this::onRescan); if(needsUpdate) - RebuildLookup(); + rebuildLookup(); } // When a file is changed, handle it. - private void OnRescan(MonitoredFile file) + private void onRescan(MonitoredFile file) { // For now, all we need is to note that something was adjusted. if(file.path.toString().contains(extension)) { - BenchmarkLog.Log("File status changed: " + file.path); + BenchmarkLog.log("File status changed: " + file.path); needsUpdate = true; } } diff --git a/src/core/lua/Plugin.java b/src/core/lua/Plugin.java index 86a959a..640d2eb 100644 --- a/src/core/lua/Plugin.java +++ b/src/core/lua/Plugin.java @@ -44,17 +44,17 @@ public class Plugin } catch (IOException e) { - PluginLog.Error(e.getMessage()); + PluginLog.error(e.getMessage()); } } - public List Run(String args, PluginUser user) + public List run(String args, PluginUser user) { try { List outputs = new Vector(); - LuaValue res = func_plugin.call(LuaValue.valueOf(args), user.AsLua()); + LuaValue res = func_plugin.call(LuaValue.valueOf(args), user.asLua()); if(!res.isnil()) { @@ -87,7 +87,7 @@ public class Plugin } catch(Exception e) { - PluginLog.Error("Failed to run plugin from file " + filepath); + PluginLog.error("Failed to run plugin from file " + filepath); } return null; diff --git a/src/core/lua/PluginLog.java b/src/core/lua/PluginLog.java index 8b084c7..471cf2b 100644 --- a/src/core/lua/PluginLog.java +++ b/src/core/lua/PluginLog.java @@ -5,7 +5,7 @@ import utils.LogFilter; public class PluginLog { - public static void Log(String s) { GlobalLog.Log(LogFilter.Plugin, s); } - public static void Warn(String s) { GlobalLog.Warn(LogFilter.Plugin, s); } - public static void Error(String s) { GlobalLog.Error(LogFilter.Plugin, s); } + public static void log(String s) { GlobalLog.log(LogFilter.Plugin, s); } + public static void warn(String s) { GlobalLog.warn(LogFilter.Plugin, s); } + public static void error(String s) { GlobalLog.error(LogFilter.Plugin, s); } } diff --git a/src/core/lua/PluginManager.java b/src/core/lua/PluginManager.java index 984728e..f77203c 100644 --- a/src/core/lua/PluginManager.java +++ b/src/core/lua/PluginManager.java @@ -12,14 +12,11 @@ import dataStructures.KittyUser; // Reads in, handles, and manipulates plugins. Plugins are loaded in the order they appear in the folder. public class PluginManager { + // Variables public final String pluginFolder; public ArrayList plugins; - - public void AddPlugin(Path path) - { - plugins.add(new Plugin(path)); - } + // Constructor public PluginManager(String folder) { this.pluginFolder = folder; @@ -29,30 +26,35 @@ public class PluginManager { try (Stream paths = Files.walk(Paths.get(this.pluginFolder))) { - paths.filter(Files::isRegularFile).forEach((path)->{ AddPlugin(path); }); + paths.filter(Files::isRegularFile).forEach((path)->{ addPlugin(path); }); } } catch(Exception e) { - PluginLog.Error(e.getMessage()); + PluginLog.error(e.getMessage()); } } + public void addPlugin(Path path) + { + plugins.add(new Plugin(path)); + } + // Runs all plugins, returning when it gets a non-nill result. If there // are mutliple strings returned in the list, it is because the plugin // that was run returned multiple strings. Since plugins don't stack, it // will never indicate that multiple // Otherwise, returns null. - public List RunAll(String input, KittyUser user) + public List runAll(String input, KittyUser user) { for(int i = 0; i < plugins.size(); ++i) { Plugin plugin = plugins.get(i); - List out = plugin.Run(input, new PluginUser(user)); + List out = plugin.run(input, new PluginUser(user)); if(out != null) { - PluginLog.Log("Executed plugin at " + plugin.filepath); + PluginLog.log("Executed plugin at " + plugin.filepath); return out; } } @@ -60,9 +62,10 @@ public class PluginManager return null; } - public void PrintAll() + // Dumps the contents of all plugins for debug + public void printAll() { for(int i = 0; i < plugins.size(); ++i) - PluginLog.Log(plugins.get(i).contents.toString()); + PluginLog.log(plugins.get(i).contents.toString()); } } diff --git a/src/core/lua/PluginStructure.java b/src/core/lua/PluginStructure.java index 989d46d..ca70848 100644 --- a/src/core/lua/PluginStructure.java +++ b/src/core/lua/PluginStructure.java @@ -5,7 +5,7 @@ import org.luaj.vm2.lib.jse.CoerceJavaToLua; public class PluginStructure { - public LuaValue AsLua() + public LuaValue asLua() { return CoerceJavaToLua.coerce(this); } diff --git a/src/core/rpg/RPGArmor.java b/src/core/rpg/RPGArmor.java index 62b957d..9d3788f 100644 --- a/src/core/rpg/RPGArmor.java +++ b/src/core/rpg/RPGArmor.java @@ -10,5 +10,5 @@ public class RPGArmor extends RPGItem defense = 1; } - public long GetDefense() { return defense; } + public long getDefense() { return defense; } } diff --git a/src/core/rpg/RPGCommand.java b/src/core/rpg/RPGCommand.java index d22448c..0a7170e 100644 --- a/src/core/rpg/RPGCommand.java +++ b/src/core/rpg/RPGCommand.java @@ -5,5 +5,5 @@ public abstract class RPGCommand public RPGCommand() { } // OVERRIDE ME - public abstract String OnRun(RPGState state, RPGInput input); + public abstract String onRun(RPGState state, RPGInput input); } diff --git a/src/core/rpg/RPGExpTable.java b/src/core/rpg/RPGExpTable.java index 5a1f60a..310d41e 100644 --- a/src/core/rpg/RPGExpTable.java +++ b/src/core/rpg/RPGExpTable.java @@ -2,7 +2,7 @@ package core.rpg; public final class RPGExpTable { - public static long EXPFloor(long level) + public static long expFloor(long level) { if(level > Levels.length - 1) level = Levels.length - 1; @@ -13,7 +13,7 @@ public final class RPGExpTable return Levels[(int) level]; } - public static long EXPCeil(long level) + public static long expCeil(long level) { if(level > Levels.length - 1) level = Levels.length - 1; @@ -23,7 +23,7 @@ public final class RPGExpTable return Levels[(int) (level + 1)]; } - public static long LevelFromEXP(long exp) + public static long levelFromEXP(long exp) { if(exp < 0) exp = 0; diff --git a/src/core/rpg/RPGFramework.java b/src/core/rpg/RPGFramework.java index 21f8312..424048f 100644 --- a/src/core/rpg/RPGFramework.java +++ b/src/core/rpg/RPGFramework.java @@ -22,24 +22,24 @@ public class RPGFramework this.gameStates = new HashMap(); this.gameCommands = new HashMap(); - RegisterCommand("stats", new RPGCommandStats()); - RegisterCommand("about", new RPGCommandInfo()); - RegisterCommand("info", new RPGCommandInfo()); - RegisterCommand("explore", new RPGCommandExplore()); - RegisterCommand("run", new RPGCommandBattleRun()); - RegisterCommand("fight", new RPGCommandBattleFight()); + registerCommand("stats", new RPGCommandStats()); + registerCommand("about", new RPGCommandInfo()); + registerCommand("info", new RPGCommandInfo()); + registerCommand("explore", new RPGCommandExplore()); + registerCommand("run", new RPGCommandBattleRun()); + registerCommand("fight", new RPGCommandBattleFight()); } // Primary external - public String Run(String userID, String inputRaw) + public String run(String userID, String inputRaw) { - RPGState state = LookupState(userID); + RPGState state = lookupState(userID); RPGInput input = new RPGInput(inputRaw); - return ExecuteCommand(input.key, state, input); + return executeCommand(input.key, state, input); } // Get state for executing a command - public RPGState LookupState(String userID) + public RPGState lookupState(String userID) { RPGState state; synchronized(gameStates) @@ -58,23 +58,23 @@ public class RPGFramework } // Registers a command - private void RegisterCommand(String commandName, RPGCommand command) + private void registerCommand(String commandName, RPGCommand command) { commandName = commandName.toLowerCase(); if(gameCommands.put(commandName, command) != null) - RPGLog.Log("Managed to register the same RPG command twice! Not ideal!"); + RPGLog.log("Managed to register the same RPG command twice! Not ideal!"); - RPGLog.Log("Registered " + commandName); + RPGLog.log("Registered " + commandName); } - private String ExecuteCommand(String name, RPGState state, RPGInput input) + private String executeCommand(String name, RPGState state, RPGInput input) { synchronized(gameCommands) { RPGCommand command = gameCommands.get(name.toLowerCase()); if(command != null && state != null) - return command.OnRun(state, input); + return command.onRun(state, input); } return null; diff --git a/src/core/rpg/RPGInput.java b/src/core/rpg/RPGInput.java index 64ec472..d93a318 100644 --- a/src/core/rpg/RPGInput.java +++ b/src/core/rpg/RPGInput.java @@ -18,7 +18,7 @@ public class RPGInput return; raw = raw.trim(); - int whitespacePos = StringUtils.FindFirstWhitespace(raw); + int whitespacePos = StringUtils.findFirstWhitespace(raw); if(whitespacePos == -1) { diff --git a/src/core/rpg/RPGItem.java b/src/core/rpg/RPGItem.java index e7dd749..3c71b03 100644 --- a/src/core/rpg/RPGItem.java +++ b/src/core/rpg/RPGItem.java @@ -19,7 +19,7 @@ public abstract class RPGItem this.value = value; } - public String GetName() { return name; } - public String GetDescription() { return description; } - public long GetValue() { return value; } + public String getName() { return name; } + public String getDescription() { return description; } + public long getValue() { return value; } } diff --git a/src/core/rpg/RPGLog.java b/src/core/rpg/RPGLog.java index 0ee2bf8..cbf6774 100644 --- a/src/core/rpg/RPGLog.java +++ b/src/core/rpg/RPGLog.java @@ -5,8 +5,8 @@ import utils.LogFilter; public class RPGLog { - public static void Log(String toWrite) + public static void log(String toWrite) { - GlobalLog.Log(LogFilter.Command, "[RPG] " + toWrite); + GlobalLog.log(LogFilter.Command, "[RPG] " + toWrite); } } diff --git a/src/core/rpg/RPGMain.java b/src/core/rpg/RPGMain.java index 0af356b..d7d5598 100644 --- a/src/core/rpg/RPGMain.java +++ b/src/core/rpg/RPGMain.java @@ -10,29 +10,29 @@ public class RPGMain public static void RPGmain(String[] args) { - Init(); - while(Run()) { }; - Shutdown(); + init(); + while(run()) { }; + shutdown(); } // Initializes stuff (small factory, ish) - private static void Init() + private static void init() { framework = new RPGFramework(); scanner = new Scanner(System.in); } // Main loop - private static boolean Run() + private static boolean run() { // move outside - String out = framework.Run("Test", scanner.nextLine()); - RPGLog.Log(out); + String out = framework.run("Test", scanner.nextLine()); + RPGLog.log(out); return true; } // Cleanup - private static void Shutdown() + private static void shutdown() { scanner.close(); } diff --git a/src/core/rpg/RPGPlayer.java b/src/core/rpg/RPGPlayer.java index 86d61be..f29ce7a 100644 --- a/src/core/rpg/RPGPlayer.java +++ b/src/core/rpg/RPGPlayer.java @@ -22,17 +22,17 @@ public class RPGPlayer extends RPGUnit } // Getters - public long GetEXP() { return exp; } - public long GetGold() { return gold; } - public String GetName() { return name; } - public RPGArmor GetArmor() { return armor; }; - public RPGWeapon GetWeapon() { return weapon; }; + public long getEXP() { return exp; } + public long getGold() { return gold; } + public String getName() { return name; } + public RPGArmor getArmor() { return armor; }; + public RPGWeapon getWeapon() { return weapon; }; // Setters - public void SetName(String name) { this.name = name; } + public void setName(String name) { this.name = name; } // Interactions - public void ApplyEXP(int expToGive) + public void applyEXP(int expToGive) { if(expToGive < 0) expToGive = 0; @@ -40,7 +40,7 @@ public class RPGPlayer extends RPGUnit exp += expToGive; } - public void GiveGold(long amount) + public void giveGold(long amount) { if(amount < 0) amount = 0; @@ -48,7 +48,7 @@ public class RPGPlayer extends RPGUnit gold += amount; } - public void SpendGold(long amount) + public void spendGold(long amount) { if(amount < 0) amount = 0; diff --git a/src/core/rpg/RPGUnit.java b/src/core/rpg/RPGUnit.java index cb2cb99..b0c23b1 100644 --- a/src/core/rpg/RPGUnit.java +++ b/src/core/rpg/RPGUnit.java @@ -5,13 +5,13 @@ public abstract class RPGUnit protected int healthMax; protected int healthCurrent; - public int GetHealthMax() { return healthMax; } - public int GetHealthCurrent() { return healthCurrent; } - public boolean IsAlive() { return healthCurrent > 0; } + public int getHealthMax() { return healthMax; } + public int getHealthCurrent() { return healthCurrent; } + public boolean isAlive() { return healthCurrent > 0; } // Generic implementation. Consider implementing armor in // derived classes, for example. - public void ApplyDamage(int value) + public void applyDamage(int value) { if(value < 0) value = 0; @@ -21,7 +21,7 @@ public abstract class RPGUnit // Generic implementation. Consider applying boosts in // derived classes, for example. - public void ApplyHealing(int value) + public void applyHealing(int value) { if(value < 0) value = 0; diff --git a/src/core/rpg/RPGWeapon.java b/src/core/rpg/RPGWeapon.java index 7b390ad..b53a25e 100644 --- a/src/core/rpg/RPGWeapon.java +++ b/src/core/rpg/RPGWeapon.java @@ -12,6 +12,6 @@ public class RPGWeapon extends RPGItem accuracy = 0.8; } - public long GetAttack() { return attack; } - public double GetAccuracy() { return accuracy; } + public long getAttack() { return attack; } + public double getAccuracy() { return accuracy; } } diff --git a/src/dataStructures/KittyChannel.java b/src/dataStructures/KittyChannel.java index fb1a225..92c93de 100644 --- a/src/dataStructures/KittyChannel.java +++ b/src/dataStructures/KittyChannel.java @@ -18,13 +18,13 @@ public class KittyChannel //extends DatabaseTrackedObject } // @Override -// public String Serialize() +// public String serialize() // { // return ""; // } // // @Override -// public void DeSerialzie(String string) +// public void deSerialzie(String string) // { // // } diff --git a/src/dataStructures/KittyCharacter.java b/src/dataStructures/KittyCharacter.java index 7865d3d..affef8b 100644 --- a/src/dataStructures/KittyCharacter.java +++ b/src/dataStructures/KittyCharacter.java @@ -6,43 +6,30 @@ public class KittyCharacter private String name; private String bio; private String refImage; + private long uniqueID; - public KittyCharacter(KittyUser owner, String name, String bio, String refImage) + public KittyCharacter(KittyUser owner, String name, String bio, String refImage, long uniqueID) { this.owner = owner; this.name = name; this.bio = bio; this.refImage = refImage; + this.uniqueID = uniqueID; } - - private boolean allowedToEdit(KittyUser editor) + public void editBio(String bio) { - if(editor.identifier.equals(owner.identifier)) - { - return true; - } - return false; + this.bio = bio; } - public boolean editBio(KittyUser editor, String bio) + public void editRefImage(String refImage) { - if(allowedToEdit(editor)) - { - this.bio = bio; - return true; - } - return false; + this.refImage = refImage; } - public boolean editRefImage(KittyUser editor, String refImage) + public void editName(String name) { - if(allowedToEdit(editor)) - { - this.refImage = refImage; - return true; - } - return false; + this.name = name; } public KittyUser getOwner() @@ -65,6 +52,11 @@ public class KittyCharacter return refImage; } + public long getUID() + { + return uniqueID; + } + public String toString() { return name + " " + bio + " " + refImage; diff --git a/src/dataStructures/KittyEmbed.java b/src/dataStructures/KittyEmbed.java index 3bc8382..c871bbe 100644 --- a/src/dataStructures/KittyEmbed.java +++ b/src/dataStructures/KittyEmbed.java @@ -4,7 +4,7 @@ import java.awt.Color; public class KittyEmbed { - public String title = null; + public String title = null; // Required, but if this remails null or is empty, it's made a blank space in Response.java. public Color color = null; public String footerText = null; public String authorText = null; @@ -13,9 +13,5 @@ public class KittyEmbed public String descriptionText = null; public String bodyImageURL = null; public String imageURL = null; - - - public KittyEmbed() - { - } + public String thumbnailURL = null; // Did you know? This is the only field that can actually be a local image file. Use attachment://file.png as the string for it. } diff --git a/src/dataStructures/KittyGuild.java b/src/dataStructures/KittyGuild.java index b2d6868..155679e 100644 --- a/src/dataStructures/KittyGuild.java +++ b/src/dataStructures/KittyGuild.java @@ -33,7 +33,7 @@ public class KittyGuild extends DatabaseTrackedObject private String commandIndicator; - private void RegisterTrackedObjects() + private void registerTrackedObjects() { DatabaseManager.instance.globalRegister(roleList); DatabaseManager.instance.globalRegister(beans); @@ -46,13 +46,13 @@ public class KittyGuild extends DatabaseTrackedObject this.uniqueID = uniqueID; roleList = new KittyTrackedVector(roleListName, uniqueID); beans = new KittyTrackedLong(beansName, uniqueID); - RegisterTrackedObjects(); + registerTrackedObjects(); control = adminControl; this.contentRating = KittyRating.Safe; this.polling = false; this.emoji = emoji; - SetCommandIndicator("!"); + setCommandIndicator("!"); } // Explicit constructor @@ -62,9 +62,9 @@ public class KittyGuild extends DatabaseTrackedObject this.uniqueID = uniqueID; roleList = new KittyTrackedVector(roleListName, uniqueID); beans = new KittyTrackedLong(beansName, uniqueID); - RegisterTrackedObjects(); + registerTrackedObjects(); - SetCommandIndicator(commandIndicator); + setCommandIndicator(commandIndicator); this.contentRating = contentRating; this.polling = false; this.guildOwner = guildOwner; @@ -119,9 +119,9 @@ public class KittyGuild extends DatabaseTrackedObject public boolean joinRaffle(KittyUser user) { - if(!raffleUsersChosen.contains(user) && !raffleUsersUnchosen.contains(user) && user.GetBeans() > raffleCost && raffling) + if(!raffleUsersChosen.contains(user) && !raffleUsersUnchosen.contains(user) && user.getBeans() > raffleCost && raffling) { - user.ChangeBeans(raffleCost); + user.changeBeans(raffleCost); raffleUsersUnchosen.add(user); return true; } @@ -141,31 +141,31 @@ public class KittyGuild extends DatabaseTrackedObject } @Override - public String Serialize() + public String serialize() { return commandIndicator; } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { if(string == null || string.length() == 0) - SetCommandIndicator("!"); + setCommandIndicator("!"); else - SetCommandIndicator(string); + setCommandIndicator(string); } - public String GetCommandIndicator() + public String getCommandIndicator() { return commandIndicator; } - public void SetCommandIndicator(String newIndicator) + public void setCommandIndicator(String newIndicator) { if(newIndicator != commandIndicator) { commandIndicator = newIndicator; - MarkDirty(); + markDirty(); } } } diff --git a/src/dataStructures/KittyRP.java b/src/dataStructures/KittyRP.java index 9eb0be8..0958281 100644 --- a/src/dataStructures/KittyRP.java +++ b/src/dataStructures/KittyRP.java @@ -45,7 +45,7 @@ public class KittyRP public File endRP(KittyUser user) throws FileNotFoundException, UnsupportedEncodingException { - if(!users.contains(Long.parseLong(user.discordID)) && user.GetRole().getValue() < 2) + if(!users.contains(Long.parseLong(user.discordID)) && user.getRole().getValue() < 2) { return null; } diff --git a/src/dataStructures/KittyTrackedLong.java b/src/dataStructures/KittyTrackedLong.java index b584e4b..3b4ab5b 100644 --- a/src/dataStructures/KittyTrackedLong.java +++ b/src/dataStructures/KittyTrackedLong.java @@ -27,40 +27,40 @@ public class KittyTrackedLong extends DatabaseTrackedObject super(differentiator + readableName + UniqueID); } - public long Add(long toAdd) + public long add(long toAdd) { tracked += toAdd; - MarkDirty(); + markDirty(); return tracked; } - public long Subtract(long toSubtract) + public long subtract(long toSubtract) { tracked -= toSubtract; - MarkDirty(); + markDirty(); return tracked; } - public long Get() + public long get() { return tracked; } - public long Set(long newValue) + public long set(long newValue) { tracked = newValue; - MarkDirty(); + markDirty(); return tracked; } @Override - public String Serialize() + public String serialize() { return "" + tracked; } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { if(string != null) { @@ -71,7 +71,7 @@ public class KittyTrackedLong extends DatabaseTrackedObject catch(Exception e) { tracked = 0; - GlobalLog.Error(LogFilter.Core, "Falling back to default of 0 due to failure to deserialize long with database ID " + identifier); + GlobalLog.error(LogFilter.Core, "Falling back to default of 0 due to failure to deserialize long with database ID " + identifier); } } else diff --git a/src/dataStructures/KittyTrackedString.java b/src/dataStructures/KittyTrackedString.java index f7c94bd..d777f2f 100644 --- a/src/dataStructures/KittyTrackedString.java +++ b/src/dataStructures/KittyTrackedString.java @@ -21,7 +21,7 @@ public class KittyTrackedString extends DatabaseTrackedObject synchronized(trackedString) { trackedString = newValue; - MarkDirty(); + markDirty(); } } @@ -35,13 +35,13 @@ public class KittyTrackedString extends DatabaseTrackedObject } @Override - public String Serialize() + public String serialize() { return trackedString; } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { if(string != null && !string.isEmpty()) { @@ -49,9 +49,9 @@ public class KittyTrackedString extends DatabaseTrackedObject } else { - GlobalLog.Log(LogFilter.Database, "String had null or empty value with identifier: " + identifier); + GlobalLog.log(LogFilter.Database, "String had null or empty value with identifier: " + identifier); string = ""; - MarkDirty(); + markDirty(); } } diff --git a/src/dataStructures/KittyTrackedVector.java b/src/dataStructures/KittyTrackedVector.java index 5bff03f..7484f64 100644 --- a/src/dataStructures/KittyTrackedVector.java +++ b/src/dataStructures/KittyTrackedVector.java @@ -44,7 +44,7 @@ public class KittyTrackedVector extends DatabaseTrackedObject public void add(String str) { trackedVector.add(str); - this.MarkDirty(); + this.markDirty(); } public boolean isEmpty() @@ -65,12 +65,12 @@ public class KittyTrackedVector extends DatabaseTrackedObject public void remove(String str) { trackedVector.remove(str); - this.MarkDirty(); + this.markDirty(); } // Writes out the roles as a single string that can be parsed back in later @Override - public String Serialize() + public String serialize() { String toSerialize = ""; @@ -87,7 +87,7 @@ public class KittyTrackedVector extends DatabaseTrackedObject // Reads in the roles as a delimited single string that needs parsing @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { if(string != null) { diff --git a/src/dataStructures/KittyUser.java b/src/dataStructures/KittyUser.java index 538c818..730e09e 100644 --- a/src/dataStructures/KittyUser.java +++ b/src/dataStructures/KittyUser.java @@ -31,35 +31,35 @@ public class KittyUser extends DatabaseTrackedObject } // Can be positive or negative - public void ChangeBeans(int amount) + public void changeBeans(int amount) { beans += amount; if(amount != 0) - MarkDirty(); + markDirty(); } - public void ChangeRole(KittyRole newRole) + public void changeRole(KittyRole newRole) { if(newRole != role) { role = newRole; - MarkDirty(); + markDirty(); } } - public long GetBeans() + public long getBeans() { return beans; } - public KittyRole GetRole() + public KittyRole getRole() { return role; } @Override - public String Serialize() + public String serialize() { return beans + "," + role.getValue(); } @@ -80,18 +80,18 @@ public class KittyUser extends DatabaseTrackedObject } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { try { String[] strings = prepareFromString(string); if(strings.length < 2) { - GlobalLog.Log(LogFilter.Database, "Upgrading user " + name + " to include 'role' in DB"); + GlobalLog.log(LogFilter.Database, "Upgrading user " + name + " to include 'role' in DB"); // Mark ourselves dirty to re-write the role information stored in the user. // Just uses defaults from earlier again. - MarkDirty(); + markDirty(); } else { @@ -101,13 +101,13 @@ public class KittyUser extends DatabaseTrackedObject } catch (NumberFormatException e) { - GlobalLog.Warn(LogFilter.Database, "Invalid user data for user " + name + "! " + GlobalLog.warn(LogFilter.Database, "Invalid user data for user " + name + "! " + "Starting over at 0 beans with a general role!"); // We don't need to specify the role at this point because it is set at this point. // We use what the user was created with whatever defaults were in the factory. // Beans are maintained too, just in case there's some in cache. - MarkDirty(); + markDirty(); } } } diff --git a/src/dataStructures/Response.java b/src/dataStructures/Response.java index 012130b..8e8ba10 100644 --- a/src/dataStructures/Response.java +++ b/src/dataStructures/Response.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.InputStream; import net.dv8tion.jda.core.JDA; +import net.dv8tion.jda.core.MessageBuilder; import net.dv8tion.jda.core.entities.TextChannel; import net.dv8tion.jda.core.events.message.guild.*; import net.dv8tion.jda.core.EmbedBuilder; @@ -29,12 +30,20 @@ public class Response } // Builds a nicely formatted embedded message based on information provided - public void CallEmbed(KittyEmbed embedInfo) + public void send(KittyEmbed embedInfo) { EmbedBuilder embed = new EmbedBuilder(); - if(embedInfo.title != null) + if(embedInfo.title != null && !embedInfo.title.isEmpty()) + { embed.setTitle(embedInfo.title); + } + else + { + // We have to set the title to at least something that's not empty. + // By defualt, this creates nothing really visible. + embed.setTitle(" "); + } if(embedInfo.color != null) embed.setColor(embedInfo.color); @@ -49,15 +58,39 @@ public class Response embed.setAuthor(embedInfo.authorText, embedInfo.authorLink, embedInfo.authorImage); if(embedInfo.imageURL != null) - embed.setImage(embedInfo.imageURL); + embed.setImage(embedInfo.imageURL); - event.getChannel().sendMessage(embed.build()).queue(); + if(embedInfo.thumbnailURL != null && embedInfo.thumbnailURL.contains("attachment://")) + { + // This is the case where you have a thumbnail image, but you want it to be a local file. + // TODO: Make this more generic. Consider message builder for the entire thing. + String thumbPath = embedInfo.thumbnailURL; + String thumbName = thumbPath.replace("attachment://", ""); + + // Build the message and send if the file is valid + MessageBuilder message = new MessageBuilder(); + embed.setThumbnail(thumbPath); + message.setEmbed(embed.build()); + + File thumbImage = new File(thumbName); + if(thumbImage.exists()) + { + event.getChannel().sendFile(thumbImage, thumbName, message.build()).queue(); + } + } + else + { + if(embedInfo.thumbnailURL != null) + embed.setThumbnail(embedInfo.thumbnailURL); + + event.getChannel().sendMessage(embed.build()).queue(); + } } // Queues a standard text-based message response to the channel that issued the command. - public void Call(String toRespondWith) + public void send(String toRespondWith) { - GlobalLog.Log(LogFilter.Response, "Sending response: " + toRespondWith); + GlobalLog.log(LogFilter.Response, "Sending response: " + toRespondWith); if(toRespondWith.length() > discordMessageMax) { event.getChannel().sendMessage(toRespondWith.substring(0, kittyMessageMax) + "\n\nI think that's enough!").queue(); @@ -69,7 +102,7 @@ public class Response } // Queues a standard text-based message response to the specified channel. - public void CallToChannel(String toRespondWith, String channelID) + public void sendToChannel(String toRespondWith, String channelID) { TextChannel channel; channel = kitty.getTextChannelById(Long.parseLong(channelID)); @@ -84,9 +117,9 @@ public class Response } // Immediately dispatches the message to the channel that issued the command. - public void CallImmediate(String toRespondWith) + public void sendImmediate(String toRespondWith) { - GlobalLog.Log(LogFilter.Response, "Sending immediate response: " + toRespondWith); + GlobalLog.log(LogFilter.Response, "Sending immediate response: " + toRespondWith); if(toRespondWith.length() > discordMessageMax) { event.getChannel().sendMessage(toRespondWith.substring(0, kittyMessageMax) + "\n\nI think that's enough!"); @@ -98,16 +131,16 @@ public class Response } // Queues a file response to the channel that issued the command. - public void CallFile(File toRespondWith, String extension) + public void sendFile(File toRespondWith, String extension) { - GlobalLog.Log(LogFilter.Response, "Sending file response"); + GlobalLog.log(LogFilter.Response, "Sending file response"); event.getChannel().sendFile(toRespondWith, "return." + extension).queue(); } // Queues an input stream response to the channel that issued the command. - public void CallInput(InputStream in, String extension) + public void sendFile(InputStream in, String extension) { - GlobalLog.Log(LogFilter.Response, "Sending input stream response"); + GlobalLog.log(LogFilter.Response, "Sending input stream response"); event.getChannel().sendFile(in, "return." + extension).queue(); } } diff --git a/src/dataStructures/TaggedPairStore.java b/src/dataStructures/TaggedPairStore.java index 8c92aa7..8513b11 100644 --- a/src/dataStructures/TaggedPairStore.java +++ b/src/dataStructures/TaggedPairStore.java @@ -39,12 +39,12 @@ public class TaggedPairStore { taggedPairs = new HashMap>(); allPairs = new HashMap(); - Parse(input); + parse(input); } // Calls back on each item in the entire structure. Provides section, then a pair of the keyString and valueString. @SuppressWarnings({"rawtypes", "unchecked"}) - public void ForEach(BiConsumer> action) + public void forEach(BiConsumer> action) { Iterator it = taggedPairs.entrySet().iterator(); while (it.hasNext()) @@ -62,7 +62,7 @@ public class TaggedPairStore // Calls back each item in the structure but does not priv @SuppressWarnings({"rawtypes"}) - public void ForEach(Consumer> action) + public void forEach(Consumer> action) { Iterator it = allPairs.entrySet().iterator(); while (it.hasNext()) @@ -93,8 +93,8 @@ public class TaggedPairStore Map.Entry internalPair = (Map.Entry)internal.next(); String key = (String)internalPair.getKey(); String value = (String)internalPair.getValue(); - key = StringUtils.ReEscape(key); - value = StringUtils.ReEscape(value); + key = StringUtils.reEscape(key); + value = StringUtils.reEscape(value); if(key.endsWith("\\r")) { @@ -123,7 +123,7 @@ public class TaggedPairStore // Parses out the string passed in into the sectionkeyValue HashMap. // Any character used in a split call is escaped just in case on // account of some characters having specific regex meanings. - private void Parse(String input) + private void parse(String input) { if(input == null) return; @@ -143,7 +143,7 @@ public class TaggedPairStore // Parse section name. If it already exists, don't bother making it. String sectionName = section.substring(0, pos); - AddSection(sectionName); + addSection(sectionName); // Parse out the pairs within the section, split them all out. String unparsedPairs = section.substring(pos + 1); @@ -160,8 +160,8 @@ public class TaggedPairStore String key = line.substring(0, splitPos); String value = line.substring(splitPos + PairSplit.length()); - key = StringUtils.UnEscape(key); - value = StringUtils.UnEscape(value); + key = StringUtils.unEscape(key); + value = StringUtils.unEscape(value); taggedPairs.get(sectionName).putIfAbsent(key, value); allPairs.putIfAbsent(key, value); @@ -171,7 +171,7 @@ public class TaggedPairStore // Dumps out a string array @SuppressWarnings("unused") - private void Dump(String[] toPrint) + private void dump(String[] toPrint) { System.out.println("Length: " + toPrint.length); @@ -181,28 +181,28 @@ public class TaggedPairStore // Adds a KeyValue pair to the specified section if it's not already there. // Also creates the section if it's not already present. - public void AddKeyValue(String sectionName, String key, String value) + public void addKeyValue(String sectionName, String key, String value) { - AddSection(sectionName); + addSection(sectionName); taggedPairs.get(sectionName).putIfAbsent(key, value); allPairs.putIfAbsent(key, value); } // Adds a given section to the hashmap if it's not already present - public void AddSection(String sectionName) + public void addSection(String sectionName) { taggedPairs.putIfAbsent(sectionName, new HashMap()); } // Returns a HashMap of Keys to Values for a given section @SuppressWarnings("unchecked") - public HashMap GetSection(String sectionName) + public HashMap getSection(String sectionName) { return (HashMap) taggedPairs.get(sectionName).clone(); } // Look up a global key - public String GetKey(String key) + public String getKey(String key) { if(allPairs.containsKey(key)) return allPairs.get(key); diff --git a/src/dataStructures/UserInput.java b/src/dataStructures/UserInput.java index 063c6a6..328d27a 100644 --- a/src/dataStructures/UserInput.java +++ b/src/dataStructures/UserInput.java @@ -35,13 +35,13 @@ public class UserInput return; if(!event.getMessage().getMentionedMembers().isEmpty()) - mentions = FindMentionedUsers(event); + mentions = findMentionedUsers(event); toParse = toParse.trim(); - String commandIndicator = guildContext.GetCommandIndicator(); + String commandIndicator = guildContext.getCommandIndicator(); if(toParse.startsWith(commandIndicator)) { - int loc = FindFirstWhitespace(toParse); + int loc = findFirstWhitespace(toParse); if(loc <= 0) { @@ -61,22 +61,22 @@ public class UserInput } } - //Used for injecting direct commands from plugins + // Used for injecting direct commands from plugins public UserInput(String input, KittyGuild contextGuild) { - int loc = FindFirstWhitespace(input); + int loc = findFirstWhitespace(input); key = input.substring(0, loc); args = input.substring(loc); isValid = true; } - public boolean IsValid() + public boolean isValid() { return isValid; } // Finds first whitespace in the string - private int FindFirstWhitespace(String str) + private int findFirstWhitespace(String str) { for (int i = 0; i < str.length(); ++i) { @@ -87,7 +87,7 @@ public class UserInput return -1; } - private KittyUser[] FindMentionedUsers(GuildMessageReceivedEvent event) + private KittyUser[] findMentionedUsers(GuildMessageReceivedEvent event) { List JDAMentions = event.getMessage().getMentionedMembers(); KittyUser [] KittyMentions = new KittyUser[JDAMentions.size()]; diff --git a/src/main/Main.java b/src/main/Main.java index a289e0c..c0387a8 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -48,16 +48,16 @@ public class Main extends ListenerAdapter { // Factory startup. The ordering is intentional. GlobalLog.initialize(); - databaseManager = ObjectBuilderFactory.ConstructDatabaseManager(); - commandEnabler = ObjectBuilderFactory.ConstructCommandEnabler(); - commandManager = ObjectBuilderFactory.ConstructCommandManager(commandEnabler); - stats = ObjectBuilderFactory.ConstructStats(commandManager); + databaseManager = ObjectBuilderFactory.constructDatabaseManager(); + commandEnabler = ObjectBuilderFactory.constructCommandEnabler(); + commandManager = ObjectBuilderFactory.constructCommandManager(commandEnabler); + stats = ObjectBuilderFactory.constructStats(commandManager); charManager = new CharacterManager(); - rpManager = ObjectBuilderFactory.ConstructRPManager(); - pluginManager = ObjectBuilderFactory.ConstructPluginManager(); + rpManager = ObjectBuilderFactory.constructRPManager(); + pluginManager = ObjectBuilderFactory.constructPluginManager(); // Bot startup - kittyCore = ObjectBuilderFactory.ConstructKittyCore(); + kittyCore = ObjectBuilderFactory.constructKittyCore(); } // When a message is sent in a server that kitty is in, this is what's called. @@ -65,36 +65,36 @@ public class Main extends ListenerAdapter public void onGuildMessageReceived(GuildMessageReceivedEvent event) { // Tweak the event as necessary - if(!Superintendent.PreProcessSetup(event, stats)) + if(!Superintendent.preProcessSetup(event, stats)) return; // Factory objects - KittyUser user = ObjectBuilderFactory.ExtractUser(event); - KittyGuild guild = ObjectBuilderFactory.ExtractGuild(event); - KittyChannel channel = ObjectBuilderFactory.ExtractChannel(event); + KittyUser user = ObjectBuilderFactory.extractUser(event); + KittyGuild guild = ObjectBuilderFactory.extractGuild(event); + KittyChannel channel = ObjectBuilderFactory.extractChannel(event); // Specialized uncached objects Response response = new Response(event, kittyCore); UserInput input = new UserInput(event, guild); // Tweak object construction as necessary - if(!Superintendent.PostProcessSetup(event, user, guild, channel, response, input)) + if(!Superintendent.postProcessSetup(event, user, guild, channel, response, input)) return; // Track beans! - user.ChangeBeans(1); + user.changeBeans(1); // RP logging system RPManager.instance.addLine(channel, user, input); // Run any pre-emptive upkeep we need to - Superintendent.PerCommandUpkeepPre(); + Superintendent.perCommandUpkeepPre(); // Attempt to spin up a command. If the command doesn't exist. // Run plugins right before invoking the commands but after all other setup. - if(commandManager.InvokeOnNewThread(guild, channel, user, input, response) == false) + if(commandManager.invokeOnNewThread(guild, channel, user, input, response) == false) { - List pluginOutput = pluginManager.RunAll(input.message, user); + List pluginOutput = pluginManager.runAll(input.message, user); if(pluginOutput != null && pluginOutput.size() > 0) { @@ -102,17 +102,17 @@ public class Main extends ListenerAdapter { if(pluginOutput.get(i).startsWith("!")) { - commandManager.InvokeOnNewThread(guild, channel, user, new UserInput(pluginOutput.get(i).substring(1), guild), response); + commandManager.invokeOnNewThread(guild, channel, user, new UserInput(pluginOutput.get(i).substring(1), guild), response); } else { - response.Call(pluginOutput.get(i)); + response.send(pluginOutput.get(i)); } } } } // Run any upkeep in post we need to - Superintendent.PerCommandUpkeepPost(kittyCore, databaseManager); + Superintendent.perCommandUpkeepPost(kittyCore, databaseManager); } } \ No newline at end of file diff --git a/src/main/Superintendent.java b/src/main/Superintendent.java index f678058..aae634c 100644 --- a/src/main/Superintendent.java +++ b/src/main/Superintendent.java @@ -21,17 +21,17 @@ import offline.Ref; public class Superintendent { // This is run on the JDA GuildMessageReceivedEvent before anything else happens. - public static boolean PreProcessSetup(GuildMessageReceivedEvent event, Stats stats) + public static boolean preProcessSetup(GuildMessageReceivedEvent event, Stats stats) { // Verify we have an event if(event == null) return false; // Track number of messages seen - stats.NoteMessageEvent(); + stats.noteMessageEvent(); // If we're mid-shutdown, no more commands. - if(stats.GetIsShuttingDown()) + if(stats.getIsShuttingDown()) return false; // Swat down highest ban level immediately before even hitting command parsing. @@ -47,7 +47,7 @@ public class Superintendent // This runs after all the objects have been constructed! // Modifications to objects here stick! - public static boolean PostProcessSetup(GuildMessageReceivedEvent event, KittyUser user, KittyGuild guild, KittyChannel channel, Response res, UserInput input) + public static boolean postProcessSetup(GuildMessageReceivedEvent event, KittyUser user, KittyGuild guild, KittyChannel channel, Response res, UserInput input) { // Verify we have everything. From here out, we promise we have that all. if(event == null || user == null || guild == null || channel == null || res == null || input == null) @@ -55,14 +55,14 @@ public class Superintendent // If the guild member is the owner, give them admin role by default. if(event.getMember().isOwner()) - user.ChangeRole(KittyRole.Admin); + user.changeRole(KittyRole.Admin); // Give devs the dev role for(int i = 0; i < Ref.devIDs.length; ++i) { if(event.getAuthor().getId().equals(Ref.devIDs[i])) { - user.ChangeRole(KittyRole.Dev); + user.changeRole(KittyRole.Dev); break; } } @@ -72,11 +72,11 @@ public class Superintendent // Only called once per command. Good for lazily updating. // Happens just before the command / plugin runs. - public static boolean PerCommandUpkeepPre() + public static boolean perCommandUpkeepPre() { // Upkeep localization system's file monitoring - LocStrings.Upkeep(); - LocCommands.Upkeep(); + LocStrings.upkeep(); + LocCommands.upkeep(); return true; } @@ -87,7 +87,7 @@ public class Superintendent // This is for stuff that we need to do on a regular basis, but don't // necessarily want running at all points in time. // Happens just after the command / plugin runs. - public static boolean PerCommandUpkeepPost(KittyCore kittyCore, DatabaseManager databaseManager) + public static boolean perCommandUpkeepPost(KittyCore kittyCore, DatabaseManager databaseManager) { // Upkeep database lazily on occasion if(delayTimerCurrent.decrementAndGet() < 0) @@ -97,7 +97,7 @@ public class Superintendent } // Update command-specific - RPManager.Upkeep(kittyCore); + RPManager.upkeep(kittyCore); return true; } diff --git a/src/network/JDBCDriver.java b/src/network/JDBCDriver.java index bd99ee1..1c59163 100644 --- a/src/network/JDBCDriver.java +++ b/src/network/JDBCDriver.java @@ -7,14 +7,14 @@ import java.sql.ResultSet; public abstract class JDBCDriver { // Connects to the database, returns a bool if it succeeded. - public abstract boolean Connect(); + public abstract boolean connect(); // Disconnects the driver. Returns if the driver is disconnected now, regardless of connection status. - public abstract boolean Disconnect(); + public abstract boolean disconnect(); // Executes a SQL command with the database. Returns if it was executed successfully, or in the // case of the returning statement, returns the ResultSet. Args are placed into the prepared statement // in place of each '?' places into it. - public abstract boolean ExecuteStatement(JDBCStatementType type, String command, String[] args); - public abstract ResultSet ExecuteReturningStatement(JDBCStatementType type, String command, String[] args); + public abstract boolean executeStatement(JDBCStatementType type, String command, String[] args); + public abstract ResultSet executeReturningStatement(JDBCStatementType type, String command, String[] args); } diff --git a/src/network/JDBCDriverMySQL.java b/src/network/JDBCDriverMySQL.java index 5fbb404..3649989 100644 --- a/src/network/JDBCDriverMySQL.java +++ b/src/network/JDBCDriverMySQL.java @@ -5,25 +5,25 @@ import java.sql.ResultSet; public class JDBCDriverMySQL extends JDBCDriver { @Override - public boolean Connect() { + public boolean connect() { // TODO Auto-generated method stub return false; } @Override - public boolean Disconnect() { + public boolean disconnect() { // TODO Auto-generated method stub return false; } @Override - public boolean ExecuteStatement(JDBCStatementType type, String statement, String[] args) { + public boolean executeStatement(JDBCStatementType type, String statement, String[] args) { // TODO Auto-generated method stub return false; } @Override - public ResultSet ExecuteReturningStatement(JDBCStatementType type, String statement, String[] args) { + public ResultSet executeReturningStatement(JDBCStatementType type, String statement, String[] args) { // TODO Auto-generated method stub return null; } diff --git a/src/network/JDBCDriverPostgreSQL.java b/src/network/JDBCDriverPostgreSQL.java index b6765eb..fbe1593 100644 --- a/src/network/JDBCDriverPostgreSQL.java +++ b/src/network/JDBCDriverPostgreSQL.java @@ -5,25 +5,25 @@ import java.sql.ResultSet; public class JDBCDriverPostgreSQL extends JDBCDriver { @Override - public boolean Connect() { + public boolean connect() { // TODO Auto-generated method stub return false; } @Override - public boolean Disconnect() { + public boolean disconnect() { // TODO Auto-generated method stub return false; } @Override - public boolean ExecuteStatement(JDBCStatementType type, String statement, String[] args) { + public boolean executeStatement(JDBCStatementType type, String statement, String[] args) { // TODO Auto-generated method stub return false; } @Override - public ResultSet ExecuteReturningStatement(JDBCStatementType type, String statement, String[] args) { + public ResultSet executeReturningStatement(JDBCStatementType type, String statement, String[] args) { // TODO Auto-generated method stub return null; } diff --git a/src/network/JDBCDriverSQLite.java b/src/network/JDBCDriverSQLite.java index 594906f..62edfe1 100644 --- a/src/network/JDBCDriverSQLite.java +++ b/src/network/JDBCDriverSQLite.java @@ -18,7 +18,7 @@ public class JDBCDriverSQLite extends JDBCDriver public static final String databaseName = "catfood"; @Override - public boolean Connect() + public boolean connect() { if(connection == null) { @@ -38,23 +38,23 @@ public class JDBCDriverSQLite extends JDBCDriver // create a connection to the database connection = DriverManager.getConnection(url); - GlobalLog.Log(LogFilter.Database, "Connection to SQLite has been established."); + GlobalLog.log(LogFilter.Database, "Connection to SQLite has been established."); } catch (SQLException e) { - GlobalLog.Error(e.getMessage()); + GlobalLog.error(e.getMessage()); } } else { - GlobalLog.Log(LogFilter.Database, "SQLite database asked to connect a second time. This is perfectly fine as this app has all its data tied together."); + GlobalLog.log(LogFilter.Database, "SQLite database asked to connect a second time. This is perfectly fine as this app has all its data tied together."); } return connection != null; } @Override - public boolean Disconnect() + public boolean disconnect() { try { @@ -67,13 +67,13 @@ public class JDBCDriverSQLite extends JDBCDriver } catch (SQLException ex) { - GlobalLog.Error(ex.getMessage()); + GlobalLog.error(ex.getMessage()); return false; } } @Override - public ResultSet ExecuteReturningStatement(JDBCStatementType type, String command, String[] args) + public ResultSet executeReturningStatement(JDBCStatementType type, String command, String[] args) { if(connection == null) return null; @@ -114,7 +114,7 @@ public class JDBCDriverSQLite extends JDBCDriver { try { - GlobalLog.Fatal(e.getMessage()); + GlobalLog.fatal(e.getMessage()); } catch (Exception e1) { @@ -125,7 +125,7 @@ public class JDBCDriverSQLite extends JDBCDriver } } - public boolean ExecuteStatement(JDBCStatementType type, String command, String[] args) + public boolean executeStatement(JDBCStatementType type, String command, String[] args) { if(connection == null) return false; @@ -178,7 +178,7 @@ public class JDBCDriverSQLite extends JDBCDriver { try { - GlobalLog.Fatal(e.getMessage()); + GlobalLog.fatal(e.getMessage()); } catch (Exception e1) { diff --git a/src/network/NetworkColiru.java b/src/network/NetworkColiru.java index 63d80fb..6cf23fd 100644 --- a/src/network/NetworkColiru.java +++ b/src/network/NetworkColiru.java @@ -4,7 +4,7 @@ import utils.HTTPUtils; public class NetworkColiru { - public String compileCPlus(String query) + public String compileCPlusPlus(String query) { // Escape characters that need escaping. // Primarily types of whitespace. @@ -15,7 +15,7 @@ public class NetworkColiru query = query.replace("\t", "\\t"); // Send the compilation request! - String result = HTTPUtils.SendPOSTRequest("http://coliru.stacked-crooked.com/compile" + String result = HTTPUtils.sendPOSTRequest("http://coliru.stacked-crooked.com/compile" , "{ \"cmd\": \"g++ main.cpp && ./a.out\", \"src\": \"" + query + "\" }"); // If we got a valid response... @@ -23,6 +23,7 @@ public class NetworkColiru { result = "Here's what happened when I went to compiled that! \n```" + result + "```"; } + return result; } diff --git a/src/network/NetworkDerpi.java b/src/network/NetworkDerpi.java index 04f82f5..4463b40 100644 --- a/src/network/NetworkDerpi.java +++ b/src/network/NetworkDerpi.java @@ -26,7 +26,7 @@ public class NetworkDerpi GenericImage image = new GenericImage(" ", " ", " "); query = query.trim(); query = query.replace(" ", ","); - String res = HTTPUtils.SendGETRequest(mainURL + query + "&random_image=1&key=" + Ref.derpiKey); + String res = HTTPUtils.sendGETRequest(mainURL + query + "&random_image=1&key=" + Ref.derpiKey); if(res != null) { // Use class evaluation on an array of the response object to be able to hold multiple. @@ -34,7 +34,7 @@ public class NetworkDerpi if(res != null) { - String res2 = HTTPUtils.SendGETRequest("https://derpibooru.org/" + obj.id + ".json"); + String res2 = HTTPUtils.sendGETRequest("https://derpibooru.org/" + obj.id + ".json"); image.editPostURL(""); DerpiResponseObject imageObj = jsonParser_.fromJson(res2, DerpiResponseObject.class); diff --git a/src/network/NetworkE621.java b/src/network/NetworkE621.java index 6cadeca..ef913a0 100644 --- a/src/network/NetworkE621.java +++ b/src/network/NetworkE621.java @@ -56,7 +56,7 @@ public class NetworkE621 // Configure and send request. Note: Random ordering added as first // tag by default. User-provided tags, therefore, will override it. // If order:score is provided, that will be honored over order:random. - String res = HTTPUtils.SendPOSTRequest(API_ROOT + String res = HTTPUtils.sendPOSTRequest(API_ROOT , "tags=order:random%20" + input + "&limit=" + maxSearchResults_); diff --git a/src/network/NetworkJDoodle.java b/src/network/NetworkJDoodle.java index 824f93b..5ba01f8 100644 --- a/src/network/NetworkJDoodle.java +++ b/src/network/NetworkJDoodle.java @@ -35,7 +35,8 @@ public class NetworkJDoodle String input = "{\"clientId\": \"" + Ref.jdoodleID + "\",\"clientSecret\":\"" + Ref.jdoodleSecret + "\",\"script\":\"" + query + "\",\"language\":\"" + lang + "\",\"versionIndex\":\"" + version + "\"} "; - try { + try + { URL url = new URL("https://api.jdoodle.com/v1/execute"); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setDoOutput(true); @@ -69,10 +70,12 @@ public class NetworkJDoodle result += "The CPU time was " + doodle.cpuTime + "\n"; connection.disconnect(); return result; - } catch (MalformedURLException e) + } + catch (MalformedURLException e) { return "You probably shouldn't be seeing this"; - } catch (IOException e) + } + catch (IOException e) { return "You probably shouldn't be seeing this"; } diff --git a/src/network/NetworkTheColorAPI.java b/src/network/NetworkTheColorAPI.java new file mode 100644 index 0000000..5f2e2b2 --- /dev/null +++ b/src/network/NetworkTheColorAPI.java @@ -0,0 +1,89 @@ +package network; + +import com.google.gson.Gson; + +import utils.HTTPUtils; + +// This class is designed to easily query and ask for responses from https://www.thecolorapi.com/. +// Unlike some of the other networking classes, the query is much more wrapped. +public class NetworkTheColorAPI +{ + private static final Gson jsonParser = new Gson(); + + public class tca_XYZ + { + // This is also known as the CIE 1931 colorspace. + // Value meanings: https://en.wikipedia.org/wiki/CIE_1931_color_space + public int X; + public int Y; + public int Z; + } + + public class tca_cymk + { + public int c; // 0-100 + public int m; // 0-100 + public int y; // 0-100 + public int k; // 0-100 + } + + public class tca_name + { + public String value; // The name of the color in english + public boolean exact_match_name; // Is this exactly the name of the color searched for? + public String closest_named_hex; // The hex value of the actual value + } + + public class tca_hsv + { + public int h; // 0-255 + public int s; // 0-100, % + public int v; // 0-100, % + } + + public class tca_hsl + { + public int h; // 0-255 + public int s; // 0-100, % + public int l; // 0-100, % + } + + public class tca_rgb + { + public int r; // 0-255 + public int g; // 0-255 + public int b; // 0-255 + } + + public class tca_hex + { + public String clean; // format xxxxxx, with no # + } + + public class ColorData + { + public tca_name name; + public tca_hex hex; + public tca_rgb rgb; + public tca_hsl hsl; + public tca_hsv hsv; + public tca_cymk cmyk; + public tca_XYZ XYZ; + } + + public ColorData lookupHex(String hex) + { + try + { + hex = hex.replace("#", ""); + String response = HTTPUtils.sendGETRequest("https://www.thecolorapi.com/id?hex=" + hex); + + ColorData data = jsonParser.fromJson(response, ColorData.class); + return data; + } + catch (Exception e) + { + return null; + } + } +} diff --git a/src/network/NetworkTwitter.java b/src/network/NetworkTwitter.java index f298e4e..0c9a9bd 100644 --- a/src/network/NetworkTwitter.java +++ b/src/network/NetworkTwitter.java @@ -18,8 +18,6 @@ public class NetworkTwitter .setOAuthConsumerSecret(Ref.twitterAPISecret) .setOAuthAccessToken(Ref.twitterAccessToken) .setOAuthAccessTokenSecret(Ref.twitterAccessTokenSecret); - - } public String tweet(String tweetText) throws Exception @@ -28,6 +26,5 @@ public class NetworkTwitter Twitter twitter = tf.getInstance(); Status status = twitter.updateStatus(tweetText); return "Status set to: `" + status.getText() + "`!"; - } } diff --git a/src/utils/GlobalLog.java b/src/utils/GlobalLog.java index 0131587..e0652ba 100644 --- a/src/utils/GlobalLog.java +++ b/src/utils/GlobalLog.java @@ -23,12 +23,12 @@ public class GlobalLog DateFormat dF = new SimpleDateFormat("yyyy_MM_dd_HH-mm"); Date today = new Date(); - FileUtils.CreateDirectoryIfDoesntExist(directory); + FileUtils.createDirectoryIfDoesntExist(directory); outputLog = new PrintWriter(directory + (dF.format(today) + ".log"), "UTF-8"); - GlobalLog.Log(LogFilter.Util, "Finished initializing logging system"); + GlobalLog.log(LogFilter.Util, "Finished initializing logging system"); } - private static void Write(String status, LogFilter filter, String body) + private static void write(String status, LogFilter filter, String body) { String logLine = "[" + status + "] " + "[" + filter.name() + "] " + body; outputLog.write(logLine + "\n"); @@ -36,13 +36,13 @@ public class GlobalLog System.out.println(logLine); } - public static void Log(String msg) { Write(log, LogFilter.Debug, msg); } - public static void Warn(String msg) { Write(warn, LogFilter.Debug, msg); } - public static void Error(String msg) { Write(error, LogFilter.Debug, msg); } - public static void Fatal(String msg) throws Exception { Write(fatal, LogFilter.Debug, msg); throw new Exception(msg); } + public static void log(String msg) { write(log, LogFilter.Debug, msg); } + public static void warn(String msg) { write(warn, LogFilter.Debug, msg); } + public static void error(String msg) { write(error, LogFilter.Debug, msg); } + public static void fatal(String msg) throws Exception { write(fatal, LogFilter.Debug, msg); throw new Exception(msg); } - public static void Log(LogFilter filter, String msg) { Write(log, filter, msg); } - public static void Warn(LogFilter filter, String msg) { Write(warn, filter, msg); } - public static void Error(LogFilter filter, String msg) { Write(error, filter, msg); } - public static void Fatal(LogFilter filter, String msg) throws Exception { Write(fatal, filter, msg); throw new Exception(msg); } + public static void log(LogFilter filter, String msg) { write(log, filter, msg); } + public static void warn(LogFilter filter, String msg) { write(warn, filter, msg); } + public static void error(LogFilter filter, String msg) { write(error, filter, msg); } + public static void fatal(LogFilter filter, String msg) throws Exception { write(fatal, filter, msg); throw new Exception(msg); } } diff --git a/src/utils/HTTPUtils.java b/src/utils/HTTPUtils.java index b9355a1..ef1ef98 100644 --- a/src/utils/HTTPUtils.java +++ b/src/utils/HTTPUtils.java @@ -21,7 +21,7 @@ public class HTTPUtils // Sends a GET request for the specified URL. - public static String SendGETRequest(String url) + public static String sendGETRequest(String url) { try { @@ -45,8 +45,8 @@ public class HTTPUtils // Sends a POST request to the desired URL. // There are two forms of this function, one of which takes - public static String SendPOSTRequest(String url) { return SendPOSTRequest(url, ""); } - public static String SendPOSTRequest(String url, String params) + public static String sendPOSTRequest(String url) { return sendPOSTRequest(url, ""); } + public static String sendPOSTRequest(String url, String params) { try { @@ -103,8 +103,10 @@ public class HTTPUtils // Close and return our data in.close(); return new String(String.toString()); - } else { - GlobalLog.Error(LogFilter.Network, con.getRequestMethod() + " responded with " + responseCode + " instead of 200."); + } + else + { + GlobalLog.error(LogFilter.Network, con.getRequestMethod() + " responded with " + responseCode + " instead of 200."); return Integer.toString(responseCode); } } diff --git a/src/utils/ImageOverlayBuilder.java b/src/utils/ImageOverlayBuilder.java index 21da10e..00837f2 100644 --- a/src/utils/ImageOverlayBuilder.java +++ b/src/utils/ImageOverlayBuilder.java @@ -34,10 +34,10 @@ public class ImageOverlayBuilder public static final String LOG_HEADER = "[Overlay] "; // Logging intermediate functions - private static void Verbose(String str) { if(VERBOSE) Log("[Verbose] " + str); } - private static void Log(String str) { GlobalLog.Log(LogFilter.Util, LOG_HEADER + str); } - private static void Warn(String str) { GlobalLog.Warn(LogFilter.Util, LOG_HEADER + str); } - private static void Error(String str) { GlobalLog.Error(LogFilter.Util, LOG_HEADER + str); } + private static void verbose(String str) { if(VERBOSE) log("[Verbose] " + str); } + private static void log(String str) { GlobalLog.log(LogFilter.Util, LOG_HEADER + str); } + private static void warn(String str) { GlobalLog.warn(LogFilter.Util, LOG_HEADER + str); } + private static void error(String str) { GlobalLog.error(LogFilter.Util, LOG_HEADER + str); } // Local variables private final String basePath; // The folder location of the files @@ -61,46 +61,46 @@ public class ImageOverlayBuilder } // Performs a per-frame overlay, catches IO errors as a note.) - public void Overlay(BufferedImage overlay, String outpath) + public void overlay(BufferedImage overlay, String outpath) { try { long start = Calendar.getInstance().getTimeInMillis(); - ProcessOverlay(overlay, outpath); + processOverlay(overlay, outpath); long end = Calendar.getInstance().getTimeInMillis(); - Log("Took " + (end - start) + "ms"); + log("Took " + (end - start) + "ms"); } catch (IOException e) { - Error(e.getMessage()); + error(e.getMessage()); } } // Processing the image frames to construct a gif. Relies on (0,255,0) pixel for image center specification. - private void ProcessOverlay(BufferedImage overlay, String outfileName) throws IOException + private void processOverlay(BufferedImage overlay, String outfileName) throws IOException { ArrayList frames = new ArrayList(frameCount); //BufferedImage[] frames = new BufferedImage[frameCount]; for(int i = 0; i < frameCount; ++i) { - BufferedImage out = CombineImages(basePath + baseName + i + FRAME_FILE_EXTENSION , overlay); + BufferedImage out = combineImages(basePath + baseName + i + FRAME_FILE_EXTENSION , overlay); if(out != null) frames.add(out);// = out; else - Warn("Skipping frame " + i + " of base " + basePath + baseName); + warn("Skipping frame " + i + " of base " + basePath + baseName); } if(frames.isEmpty()) { - Error("No frames were found at all, so the gif could not be made!"); + error("No frames were found at all, so the gif could not be made!"); return; } - Verbose("Processed " + frameCount + " frames, found " + frames.size() + " valid, writing..."); + verbose("Processed " + frameCount + " frames, found " + frames.size() + " valid, writing..."); ImageOutputStream output = new FileImageOutputStream(new File(outfileName)); GifSequenceWriter writer = new GifSequenceWriter(output, frames.get(0).getType(), fps, true); @@ -115,7 +115,7 @@ public class ImageOverlayBuilder // Performs an overlay at a pixel location. We're making some assumptions here, mostly that there is going // to be an RGBA-32-bit encoded PNG image read in for our parsing purposes. We then look for a 0, 255, 0 // green pixel on the base frame to apply the overlay buffer to, centered. - private BufferedImage CombineImages(String pathBase, BufferedImage overlay) throws IOException + private BufferedImage combineImages(String pathBase, BufferedImage overlay) throws IOException { // Acquire images BufferedImage imageBase = null; @@ -137,7 +137,7 @@ public class ImageOverlayBuilder // Warn about odd sizing when applicable if(overlayHeight > baseHeight || overlayWidth > baseWidth) - Warn("Size mismatch, overlay is larger. May function, but not supported."); + warn("Size mismatch, overlay is larger. May function, but not supported."); // Skim base picture for solid green pixel to use as target center int targetX = NONE; @@ -165,7 +165,7 @@ public class ImageOverlayBuilder // Skip overlay if we have no target location if(targetX == NONE || targetY == NONE) { - Verbose("No overlay required for this frame."); + verbose("No overlay required for this frame."); return imageBase; } diff --git a/src/utils/ImageUtils.java b/src/utils/ImageUtils.java index e85af12..640191c 100644 --- a/src/utils/ImageUtils.java +++ b/src/utils/ImageUtils.java @@ -5,19 +5,58 @@ import java.awt.image.BufferedImage; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; +import javax.imageio.ImageIO; + public class ImageUtils { private static Long uniqueID = 0l; + public static String writeTempImageData(BufferedImage data, String extension) + { + String name = null; + synchronized(uniqueID) + { + String end = extension; + if(!extension.contains(".")) + { + end = "." + extension; + } + + name = "imagetempwriterutil_" + (uniqueID++) + end; + } + + try + { + File outputfile = new File(name); + extension = extension.replace(".", ""); + + boolean didWrite = ImageIO.write(data, extension, outputfile); + if(!didWrite) + { + GlobalLog.error(LogFilter.Util, "Could not identify the writer for extension type '" + extension + "' - Did you accidentally include a period or other punctuation?"); + return null; + } + + return name; + } + catch (IOException e) + { + GlobalLog.error(LogFilter.Util, "Exception in writeTempImageData: " + e.toString()); + return null; + } + + } + // Downloads the file at the url and assigns it a unique local string. // The string (filename) is returned, and can be used. It will have to be // deleted later. By assigning a unique name to the files, this is - public static String DownloadFromURL(String URL, String extension) + public static String downloadFromURL(String URL, String extension) { String name = null; synchronized(uniqueID) @@ -51,13 +90,14 @@ public class ImageUtils } catch(Exception e) { + GlobalLog.error(LogFilter.Util, "Exception in downloadFromURL: " + e.toString()); return null; } } // Deletes the file provided, if it exists. Will continue, in a blocking way, // to attempt to delete the file 10 times a second until thread termination. - public static void BlockingFileDelete(File file) + public static void blockingFileDelete(File file) { if(file == null) return; diff --git a/src/utils/OptionParser.java b/src/utils/OptionParser.java index bc23853..0313366 100644 --- a/src/utils/OptionParser.java +++ b/src/utils/OptionParser.java @@ -40,10 +40,10 @@ public class OptionParser floating = new ArrayList(); if(toParse != null && toParse.length() > 0) - Parse(toParse); + parse(toParse); } - public void Parse(String vals) + public void parse(String vals) { String[] strings = vals.split("\\s+"); @@ -84,17 +84,17 @@ public class OptionParser } } - public ArrayList GetFloating() + public ArrayList getFloating() { return floating; } - public String GetOption(String arg) + public String getOption(String arg) { - return GetOption(arg, false); + return getOption(arg, false); } - public String GetOption(String option, boolean isCaseInsensitive) + public String getOption(String option, boolean isCaseInsensitive) { if(option == null) return null; diff --git a/src/utils/StringUtils.java b/src/utils/StringUtils.java index 5b490c4..04c3dec 100644 --- a/src/utils/StringUtils.java +++ b/src/utils/StringUtils.java @@ -2,7 +2,7 @@ package utils; public class StringUtils { - public static String UnEscape(String str) + public static String unEscape(String str) { str = str.replaceAll("\\\\b", "\b"); str = str.replaceAll("\\\\n", "\n"); @@ -15,7 +15,7 @@ public class StringUtils return str; } - public static String ReEscape(String str) + public static String reEscape(String str) { str = str.replaceAll("\\\b", "\\\\\\b"); str = str.replaceAll("\\\n", "\\\\\\n"); @@ -27,7 +27,7 @@ public class StringUtils } // Finds first whitespace in the string - public static int FindFirstWhitespace(String str) + public static int findFirstWhitespace(String str) { for (int i = 0; i < str.length(); ++i) { diff --git a/src/utils/io/DirectoryMonitor.java b/src/utils/io/DirectoryMonitor.java index 28f33f2..a27d7ac 100644 --- a/src/utils/io/DirectoryMonitor.java +++ b/src/utils/io/DirectoryMonitor.java @@ -20,16 +20,16 @@ public class DirectoryMonitor // Constructs a new file monitor and logs initialization public DirectoryMonitor(String directory) { - IOLog.Log("Reading directory files for montioring in: " + directory.toString()); + IOLog.log("Reading directory files for montioring in: " + directory.toString()); this.directory = directory; - this.last = Scrape(); + this.last = scrape(); - Print(last); + print(last); } // Scrape the target directory for all files and store them as custom objects in the list - private ArrayList Scrape() + private ArrayList scrape() { ArrayList files = new ArrayList(); @@ -39,13 +39,13 @@ public class DirectoryMonitor { paths.filter(Files::isRegularFile).forEach((path)-> { - files.add(new MonitoredFile(path, FileUtils.LastModified(path))); + files.add(new MonitoredFile(path, FileUtils.lastModified(path))); }); } } catch(Exception e) { - IOLog.Error(e.getMessage()); + IOLog.error(e.getMessage()); } return files; @@ -54,10 +54,10 @@ public class DirectoryMonitor // Update function - the first callback is called if a new item is added to the directory, // second is called if an item is updated, and third is called if an item is removed. @SuppressWarnings("unchecked") - public void Update(Consumer onAdd, Consumer onUpdate, Consumer onDelete) + public void update(Consumer onAdd, Consumer onUpdate, Consumer onDelete) { // Unparsed - ArrayList active = Scrape(); + ArrayList active = scrape(); ArrayList curr = (ArrayList)active.clone(); ArrayList prev = (ArrayList)last.clone(); @@ -125,19 +125,19 @@ public class DirectoryMonitor Collections.sort(last); if(last.size() == 0) - IOLog.Warn("There's nothing at all in a FileMonitor's target folder! Folder: " + directory); + IOLog.warn("There's nothing at all in a FileMonitor's target folder! Folder: " + directory); } // Returns the current list of files the monitor is tracking in the directory. - public List GetCurrentFiles() + public List getCurrentFiles() { return last; } // Prints out an arraylist of items from a directory by path - private void Print(ArrayList toPrint) + private void print(ArrayList toPrint) { for(int i = 0; i < toPrint.size(); ++i) - IOLog.Log(toPrint.get(i).path.toString()); + IOLog.log(toPrint.get(i).path.toString()); } } diff --git a/src/utils/io/FileMonitor.java b/src/utils/io/FileMonitor.java index 80de434..f634e45 100644 --- a/src/utils/io/FileMonitor.java +++ b/src/utils/io/FileMonitor.java @@ -11,12 +11,12 @@ public class FileMonitor // Constructs file monitor for a given file at a specific path. public FileMonitor(String path) { - Long last = FileUtils.LastModified(Paths.get(path)); + Long last = FileUtils.lastModified(Paths.get(path)); if(last == null) { file = null; - IOLog.Error("Couldn't find a readable file at " + path + "!"); + IOLog.error("Couldn't find a readable file at " + path + "!"); } else { @@ -26,24 +26,24 @@ public class FileMonitor // Looks at the file and sees if it has undergone any changes. // If so, the fileChanged function provided is called! - public void Update(Consumer fileChanged) + public void update(Consumer fileChanged) { if(file == null) { - IOLog.Error("Attempted to update a file that doesn't exist"); + IOLog.error("Attempted to update a file that doesn't exist"); return; } - Long last = FileUtils.LastModified(file.path); + Long last = FileUtils.lastModified(file.path); if(last == null) { - IOLog.Error("The file previously at " + file.path + " couldn't be read!"); + IOLog.error("The file previously at " + file.path + " couldn't be read!"); return; } if(last.longValue() != file.lastModified.longValue()) { - IOLog.Log("Most recently modified at " + last + ", stored version at " + file.lastModified); + IOLog.log("Most recently modified at " + last + ", stored version at " + file.lastModified); file = new MonitoredFile(file.path, last); fileChanged.accept(file); } diff --git a/src/utils/io/FileUtils.java b/src/utils/io/FileUtils.java index 21edfd6..493409b 100644 --- a/src/utils/io/FileUtils.java +++ b/src/utils/io/FileUtils.java @@ -14,7 +14,7 @@ import utils.LogFilter; public class FileUtils { - public static void CreateDirectoryIfDoesntExist(String directoryName) + public static void createDirectoryIfDoesntExist(String directoryName) { File directory = new File(directoryName); @@ -24,8 +24,8 @@ public class FileUtils } // Reads all lines from a file as a string - public static String ReadContent(File file) { return ReadContent(file.toPath()); } - public static String ReadContent(Path filePath) + public static String readContent(File file) { return readContent(file.toPath()); } + public static String readContent(Path filePath) { StringBuilder contentBuilder = new StringBuilder(); @@ -38,14 +38,14 @@ public class FileUtils } catch (IOException e) { - GlobalLog.Error(LogFilter.Util, e.getMessage()); + GlobalLog.error(LogFilter.Util, e.getMessage()); } return contentBuilder.toString(); } // Recursively acquires all files at and below the specified directory, returning them as an arraylist of paths. - public static ArrayList AcquireAllFiles(String startingDir) + public static ArrayList acquireAllFiles(String startingDir) { ArrayList items = new ArrayList(); @@ -59,14 +59,14 @@ public class FileUtils } catch (IOException e) { - GlobalLog.Error(LogFilter.Util, e.getMessage()); + GlobalLog.error(LogFilter.Util, e.getMessage()); } return items; } // Check when a file was last modified by path - public static Long LastModified(Path path) + public static Long lastModified(Path path) { File file = new File(path.toString()); @@ -76,7 +76,7 @@ public class FileUtils } else { - GlobalLog.Error(LogFilter.Util, "File doesn't exist at path: " + path); + GlobalLog.error(LogFilter.Util, "File doesn't exist at path: " + path); return null; } } diff --git a/src/utils/io/IOLog.java b/src/utils/io/IOLog.java index 5e994c3..5246de7 100644 --- a/src/utils/io/IOLog.java +++ b/src/utils/io/IOLog.java @@ -6,7 +6,7 @@ import utils.LogFilter; // Logging shim public class IOLog { - public static void Log(String s) { GlobalLog.Log(LogFilter.Util, s); } - public static void Warn(String s) { GlobalLog.Warn(LogFilter.Util, s); } - public static void Error(String s) { GlobalLog.Error(LogFilter.Util, s); } + public static void log(String s) { GlobalLog.log(LogFilter.Util, s); } + public static void warn(String s) { GlobalLog.warn(LogFilter.Util, s); } + public static void error(String s) { GlobalLog.error(LogFilter.Util, s); } }