= Updated response method naming and formatting

This commit is contained in:
Matthew Cech
2019-06-19 21:17:08 -07:00
parent c7ad59b755
commit b0292666c0
63 changed files with 149 additions and 145 deletions
+2 -2
View File
@@ -15,7 +15,7 @@ public class CommandBeansShow extends Command
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 = "";
@@ -23,7 +23,7 @@ public class CommandBeansShow extends Command
{
mentionedBeans += mentioned.name + " has " + mentioned.GetBeans() + " ";
}
res.call(String.format(LocStrings.stub("BeansShowMentioned"), mentionedBeans));
res.send(String.format(LocStrings.stub("BeansShowMentioned"), mentionedBeans));
}
}
}
+2 -2
View File
@@ -35,7 +35,7 @@ public class CommandBenchmark extends Command
if(input.args == null || input.args.length() == 0)
{
String output = getHelpText();
res.call(output);
res.send(output);
return;
}
@@ -47,7 +47,7 @@ public class CommandBenchmark extends Command
if(commandOutput == null)
{
res.call(LocStrings.stub("BenchmarkInvalid"));
res.send(LocStrings.stub("BenchmarkInvalid"));
return;
}
+6 -6
View File
@@ -24,19 +24,19 @@ 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)
{
res.call(LocStrings.stub("BetBeansNotEnough"));
res.send(LocStrings.stub("BetBeansNotEnough"));
return;
}
@@ -47,18 +47,18 @@ public class CommandBetBeans extends Command
win = getWinning(slots);
res.call(call);
res.send(call);
if(win == 0)
{
res.call(LocStrings.stub("BetBeansLose"));
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)));
res.send(String.format(LocStrings.stub("BetBeansWin"), "" + (bet*win)));
}
private int getWinning(int [] slots)
+1 -1
View File
@@ -20,6 +20,6 @@ public class CommandBetHistory extends Command
@Override
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()));
}
}
+1 -1
View File
@@ -61,7 +61,7 @@ public class CommandBlurry extends Command
}
postProcessed = new File(name);
res.CallFile(postProcessed, "png");
res.sendFile(postProcessed, "png");
ImageUtils.BlockingFileDelete(preProcessed);
ImageUtils.BlockingFileDelete(postProcessed);
+3 -3
View File
@@ -69,14 +69,14 @@ public class CommandBoop extends Command
if(input.mentions == null)
{
boopTracker.ApplyBoop();
res.call(String.format(LocStrings.stub("BoopStandard"), user.name, boopTracker.HowMany()));
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));
res.send(String.format(LocStrings.stub("BoopPerson"), user.name, input.mentions[0].name));
return;
}
@@ -90,7 +90,7 @@ public class CommandBoop extends Command
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));
}
}
}
+1 -1
View File
@@ -62,7 +62,7 @@ public class CommandCatch extends Command
}
catchFile = new File (name);
res.CallFile(catchFile, "gif");
res.sendFile(catchFile, "gif");
// Thread cleanup...
ImageUtils.BlockingFileDelete(catchFile);
+3 -3
View File
@@ -17,18 +17,18 @@ public class CommandChangeIndicator extends Command
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()));
res.send(String.format(LocStrings.stub("ChangeIndicatorChanged"), guild.GetCommandIndicator()));
}
}
+3 -3
View File
@@ -24,14 +24,14 @@ public class CommandCharacterCreate extends Command
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"));
}
}
+3 -3
View File
@@ -21,18 +21,18 @@ public class CommandCharacterEditBio extends Command
}
catch(Exception e)
{
res.call(LocStrings.stub("CharacterEditBioNotValid"));
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.call(LocStrings.stub("CharacterEditBioSuccess"));
res.send(LocStrings.stub("CharacterEditBioSuccess"));
}
else
{
res.call(LocStrings.stub("CharacterEditBioNotAuth"));
res.send(LocStrings.stub("CharacterEditBioNotAuth"));
}
}
}
+3 -3
View File
@@ -21,18 +21,18 @@ public class CommandCharacterEditName extends Command
}
catch(Exception e)
{
res.call(LocStrings.stub("CharacterEditNameNotValid"));
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.call(LocStrings.stub("CharacterEditNameSuccess"));
res.send(LocStrings.stub("CharacterEditNameSuccess"));
}
else
{
res.call(LocStrings.stub("CharacterEditNameNotAuth"));
res.send(LocStrings.stub("CharacterEditNameNotAuth"));
}
}
}
+3 -3
View File
@@ -21,18 +21,18 @@ public class CommandCharacterEditURL extends Command
}
catch(Exception e)
{
res.call(LocStrings.stub("CharacterEditURLNotValid"));
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.call(LocStrings.stub("CharacterEditURLSuccess"));
res.send(LocStrings.stub("CharacterEditURLSuccess"));
}
else
{
res.call(LocStrings.stub("CharacterEditURLNotAuth"));
res.send(LocStrings.stub("CharacterEditURLNotAuth"));
}
}
}
+4 -4
View File
@@ -20,21 +20,21 @@ public class CommandCharacterSearch extends Command
ArrayList <KittyCharacter> characters = CharacterManager.instance.searchCharacter(input.args);
if(characters.size() < 1)
{
res.call(LocStrings.stub("CharacterSearchNoCharacterFound"));
res.send(LocStrings.stub("CharacterSearchNoCharacterFound"));
return;
}
if(characters.size() > 1)
{
res.call(LocStrings.stub("CharacterSearchMultipleCharacterHeader"));
res.send(LocStrings.stub("CharacterSearchMultipleCharacterHeader"));
for(KittyCharacter character:characters)
{
res.call(String.format(LocStrings.stub("CharacterSearchMultipleCharacter"), character.getName(), character.getOwner().name, character.getUID()));
res.send(String.format(LocStrings.stub("CharacterSearchMultipleCharacter"), character.getName(), character.getOwner().name, character.getUID()));
}
return;
}
else
{
res.call(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()));
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()));
}
}
}
+3 -3
View File
@@ -21,7 +21,7 @@ public class CommandChoose extends Command
{
if(input.args.trim().length() == 0)
{
res.call(Stats.instance.GetHelpText(input.key));
res.send(Stats.instance.GetHelpText(input.key));
return;
}
@@ -29,10 +29,10 @@ public class CommandChoose extends Command
if(choices.length == 1)
{
res.call(LocStrings.stub("ChooseOne"));
res.send(LocStrings.stub("ChooseOne"));
return;
}
res.call(String.format(LocStrings.stub("ChooseChoice"), (choices[(int) (Math.random()*choices.length)]).toString()));
res.send(String.format(LocStrings.stub("ChooseChoice"), (choices[(int) (Math.random()*choices.length)]).toString()));
}
}
+2 -2
View File
@@ -19,11 +19,11 @@ public class CommandColiru extends Command
{
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.compileCPlus(input.args));
}
}
+2 -2
View File
@@ -37,7 +37,7 @@ public class CommandColor extends Command
// Verify the color was even found
if(colorData == null)
{
res.call(LocStrings.stub("ColorNotSearchable"));
res.send(LocStrings.stub("ColorNotSearchable"));
return;
}
@@ -76,7 +76,7 @@ public class CommandColor extends Command
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.callEmbed(response);
res.send(response);
ImageUtils.BlockingFileDelete(file);
};
+1 -1
View File
@@ -34,7 +34,7 @@ public class CommandCrouton extends Command
embed.imageURL = "https://crouton.net/crouton.png";
res.callEmbed(embed);
res.send(embed);
}
}
+1 -1
View File
@@ -30,6 +30,6 @@ public class CommandDBFlush extends Command
embed.descriptionText = "**Dirty:** " + numUpdated;
embed.color = Config.ColorDefault;
res.callEmbed(embed);
res.send(embed);
}
}
+1 -1
View File
@@ -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);
}
}
+1 -1
View File
@@ -28,6 +28,6 @@ public class CommandDoWork extends Command
thispieceofshit += Math.log((double)i);
}
res.call(LocStrings.stub("DoWorkFinished"));
res.send(LocStrings.stub("DoWorkFinished"));
}
}
+2 -2
View File
@@ -41,8 +41,8 @@ public class CommandEightBall extends Command
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)]);
}
}
+8 -8
View File
@@ -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);
}
}
+3 -3
View File
@@ -17,7 +17,7 @@ public class CommandGiveBeans extends Command
// First, make sure someone is mentioned
if(input.mentions == null)
{
res.call(LocStrings.stub("GiveBeansNoneMentioned"));
res.send(LocStrings.stub("GiveBeansNoneMentioned"));
return;
}
@@ -42,7 +42,7 @@ 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;
}
@@ -50,7 +50,7 @@ public class CommandGiveBeans extends Command
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));
res.send(String.format(LocStrings.stub("GiveBeansSuccess"), input.mentions[i].name, "" + beans));
}
}
}
+3 -3
View File
@@ -25,16 +25,16 @@ public class CommandGuildRoleAdd extends Command
{
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));
}
}
}
+2 -2
View File
@@ -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));
}
}
}
+2 -2
View File
@@ -17,7 +17,7 @@ public class CommandGuildRoleList extends Command
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));
}
}
+2 -2
View File
@@ -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));
}
}
}
+3 -3
View File
@@ -25,16 +25,16 @@ public class CommandGuildRoleRemove extends Command
{
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));
}
}
}
+1 -1
View File
@@ -27,7 +27,7 @@ public class CommandHelp extends Command
help = LocStrings.stub("HelpDisplay");
}
res.call(help);
res.send(help);
}
}
+1 -1
View File
@@ -68,7 +68,7 @@ public class CommandHelpBuilder extends Command {
}
File file = new File(filename);
res.CallFile(file, "txt");
res.sendFile(file, "txt");
ImageUtils.BlockingFileDelete(file);
}
+1 -1
View File
@@ -20,6 +20,6 @@ public class CommandInfo extends Command
@Override
public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
{
res.call(LocStrings.stub("InfoResponse"));
res.send(LocStrings.stub("InfoResponse"));
}
}
+1 -1
View File
@@ -15,7 +15,7 @@ public class CommandInvite extends Command
@Override
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");
}
}
+2 -2
View File
@@ -19,10 +19,10 @@ public class CommandJDoodle extends Command
{
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));
}
}
+1 -1
View File
@@ -94,6 +94,6 @@ public class CommandLeaderboard extends Command
}
// Write out embed result
res.callEmbed(embed);
res.send(embed);
}
}
+2 -2
View File
@@ -60,7 +60,7 @@ public class CommandMap extends Command
}
catch(NumberFormatException e)
{
res.call(LocStrings.stub("MapInvalid"));
res.send(LocStrings.stub("MapInvalid"));
return;
}
@@ -87,7 +87,7 @@ public class CommandMap extends Command
body += "\n```";
// Send back the map
res.call(header + body);
res.send(header + body);
}
// Verifies and appropriately caps input as necessary
+1 -1
View File
@@ -67,7 +67,7 @@ public class CommandPerish extends Command
}
postProcessed = new File(name);
res.CallFile(postProcessed, "png");
res.sendFile(postProcessed, "png");
ImageUtils.BlockingFileDelete(preProcessed);
ImageUtils.BlockingFileDelete(postProcessed);
+1 -1
View File
@@ -21,6 +21,6 @@ public class CommandPing extends Command
@Override
public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
{
res.call(LocStrings.stub("PingResponse"));
res.send(LocStrings.stub("PingResponse"));
}
}
+3 -3
View File
@@ -22,15 +22,15 @@ public class CommandPollManage extends Command
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:
+1 -1
View File
@@ -31,6 +31,6 @@ public class CommandPollResults extends Command
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);
}
}
+2 -2
View File
@@ -15,7 +15,7 @@ public class CommandPollShow extends Command
{
if(!guild.polling)
{
res.call(LocStrings.stub("PollShowNoPoll"));
res.send(LocStrings.stub("PollShowNoPoll"));
return;
}
String poll = String.format(LocStrings.stub("PollShowPoll"), guild.poll);
@@ -25,6 +25,6 @@ public class CommandPollShow extends Command
poll += (i+1) + ": `" + guild.choices.get(i).choice + "`\n";
}
res.call(poll);
res.send(poll);
}
}
+5 -5
View File
@@ -17,7 +17,7 @@ public class CommandPollVote extends Command
{
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"));
}
}
+3 -3
View File
@@ -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"));
}
}
}
+3 -3
View File
@@ -32,7 +32,7 @@ public class CommandRPG extends Command
if(input.args == null || input.args.length() == 0)
{
String output = getHelpText();
res.call(output);
res.send(output);
return;
}
@@ -44,10 +44,10 @@ public class CommandRPG extends Command
if(result == null)
{
res.call(LocStrings.stub("RPGInvalid"));
res.send(LocStrings.stub("RPGInvalid"));
return;
}
res.call(result);
res.send(result);
}
}
+1 -1
View File
@@ -27,6 +27,6 @@ public class CommandRPStart extends Command
}
}
res.call(RPManager.instance.newRP(channel, users));
res.send(RPManager.instance.newRP(channel, users));
}
}
+2 -2
View File
@@ -22,11 +22,11 @@ public class CommandRaffleEnd extends Command
{
if(guild.endRaffle())
{
res.call(LocStrings.stub("RaffleEndSuccess"));
res.send(LocStrings.stub("RaffleEndSuccess"));
}
else
{
res.call(LocStrings.stub("RaffleEndFailure"));
res.send(LocStrings.stub("RaffleEndFailure"));
}
}
}
+2 -2
View File
@@ -22,11 +22,11 @@ public class CommandRaffleJoin extends Command
{
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"));
}
}
}
+2 -2
View File
@@ -22,11 +22,11 @@ public class CommandRaffleSpin extends Command
{
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"));
}
}
}
+2 -2
View File
@@ -33,11 +33,11 @@ public class CommandRaffleStart extends Command
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"));
}
}
}
+3 -3
View File
@@ -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"));
}
}
+4 -4
View File
@@ -16,13 +16,13 @@ public class CommandRole extends Command
{
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())
{
res.call(String.format(LocStrings.stub("RoleError"), KittyRole.Admin.toString()));
res.send(String.format(LocStrings.stub("RoleError"), KittyRole.Admin.toString()));
return;
}
@@ -46,7 +46,7 @@ public class CommandRole extends Command
break;
default:
res.call(LocStrings.stub("RoleNeededRole"));
res.send(LocStrings.stub("RoleNeededRole"));
return;
}
String users = "";
@@ -56,6 +56,6 @@ public class CommandRole extends Command
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()));
}
}
+2 -2
View File
@@ -23,11 +23,11 @@ public class CommandRoll extends Command
{
try
{
res.call(rollDice(input.args));
res.send(rollDice(input.args));
}
catch(Exception e)
{
res.call(LocStrings.stub("RollError"));
res.send(LocStrings.stub("RollError"));
}
}
+2 -2
View File
@@ -46,7 +46,7 @@ public class CommandShutdown extends Command
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"));
@@ -54,7 +54,7 @@ public class CommandShutdown extends Command
}
else
{
res.CallImmediate(LocStrings.stub("ShutdownUnsafe"));// "``");
res.sendImmediate(LocStrings.stub("ShutdownUnsafe"));// "``");
GlobalLog.Warn(LogFilter.Command, LocStrings.Lookup("ShutdownSafe"));
System.exit(0);
}
+1 -1
View File
@@ -61,7 +61,7 @@ public class CommandStark extends Command
}
postProcessed = new File(name);
res.CallFile(postProcessed, "png");
res.sendFile(postProcessed, "png");
ImageUtils.BlockingFileDelete(preProcessed);
ImageUtils.BlockingFileDelete(postProcessed);
+6 -1
View File
@@ -66,6 +66,11 @@ public class CommandStats extends Command
+ " 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);
}
}
+1 -1
View File
@@ -62,7 +62,7 @@ public class CommandTeey extends Command
}
teeyFile = new File (name);
res.CallFile(teeyFile, "gif");
res.sendFile(teeyFile, "gif");
// Thread cleanup...
ImageUtils.BlockingFileDelete(teeyFile);
+5 -5
View File
@@ -22,7 +22,7 @@ public class CommandTradeBeans extends Command
{
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)
{
res.call(LocStrings.stub("TradeBeansNotEnoughError"));
res.send(LocStrings.stub("TradeBeansNotEnoughError"));
return;
}
if(beans < 0)
{
res.call(String.format(LocStrings.stub("TradeBeansStealingBeans"), user.name));
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));
res.send(String.format(LocStrings.stub("TradeBeansSuccess"), user.name, input.mentions[0].name, beans));
}
}
+2 -2
View File
@@ -18,9 +18,9 @@ public class CommandTweet extends Command
{
//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"));
}
}
}
+3 -3
View File
@@ -21,17 +21,17 @@ public class CommandWolfram extends Command
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");
res.sendFile(pic, "png");
ImageUtils.BlockingFileDelete(pic);
}
catch (IOException e)
{
res.call(LocStrings.stub("WolframError"));
res.send(LocStrings.stub("WolframError"));
}
}
}
+1 -1
View File
@@ -62,7 +62,7 @@ public class CommandYeet extends Command
}
yeetFile = new File (name);
res.CallFile(yeetFile, "gif");
res.sendFile(yeetFile, "gif");
// Thread cleanup...
ImageUtils.BlockingFileDelete(yeetFile);