From 8282ccfe11cec2405321d9d7540567b77c4f1df7 Mon Sep 17 00:00:00 2001 From: Salmonllama Date: Sat, 12 Sep 2020 16:29:14 -0400 Subject: [PATCH] "engine work" --- .../fsbot/commands/developer/BlacklistUserCommand.java | 4 ++-- .../fsbot/commands/developer/CreateGalleryCommand.java | 7 ++----- .../fsbot/commands/developer/DefaultCommand.java | 4 ++-- .../fsbot/commands/developer/InviteCommand.java | 3 ++- .../fsbot/commands/developer/PermissionCommand.java | 5 ++--- .../salmonllama/fsbot/commands/developer/TestCommand.java | 5 ++--- .../salmonllama/fsbot/commands/general/ColorCommand.java | 5 ++--- .../salmonllama/fsbot/commands/general/ColorsCommand.java | 5 ++--- .../salmonllama/fsbot/commands/general/HelpCommand.java | 4 ++-- .../salmonllama/fsbot/commands/general/OutfitCommand.java | 7 ++++--- .../salmonllama/fsbot/commands/general/PingCommand.java | 2 +- .../fsbot/commands/general/PrivacyCommand.java | 6 +++--- .../fsbot/commands/general/ShowGalleriesCommand.java | 8 ++++---- .../salmonllama/fsbot/commands/general/StatsCommand.java | 6 ++---- .../fsbot/commands/osrssearch/OsrsBodyCommand.java | 5 ++--- .../fsbot/commands/osrssearch/OsrsCapeCommand.java | 5 ++--- .../fsbot/commands/osrssearch/OsrsFeetCommand.java | 5 ++--- .../fsbot/commands/osrssearch/OsrsHandCommand.java | 5 ++--- .../fsbot/commands/osrssearch/OsrsHeadCommand.java | 5 ++--- .../fsbot/commands/osrssearch/OsrsLegsCommand.java | 5 ++--- .../fsbot/commands/osrssearch/OsrsNeckCommand.java | 5 ++--- .../fsbot/commands/osrssearch/OsrsSearchCommand.java | 5 ++--- .../fsbot/commands/osrssearch/OsrsShieldCommand.java | 5 ++--- .../fsbot/commands/osrssearch/OsrsWeaponCommand.java | 5 ++--- .../salmonllama/fsbot/commands/staff/AddColorCommand.java | 4 +--- .../dev/salmonllama/fsbot/commands/staff/EchoCommand.java | 5 ++--- .../fsbot/commands/staff/GetOutfitCommand.java | 5 ++--- .../fsbot/commands/staff/GetServersCommand.java | 5 ++--- .../fsbot/commands/staff/OutfitInfoCommand.java | 5 ++--- .../fsbot/commands/staff/RemoveOutfitCommand.java | 5 ++--- .../salmonllama/fsbot/commands/staff/RetagCommand.java | 5 ++--- .../fsbot/commands/staff/SetStatusCommand.java | 3 ++- .../fsbot/commands/staff/WelcomeMessageCommand.java | 5 ++--- .../fsbot/database/controllers/OutfitController.java | 7 ++++--- src/main/java/dev/salmonllama/fsbot/guthix/Command.java | 4 ++-- 35 files changed, 75 insertions(+), 99 deletions(-) diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/BlacklistUserCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/BlacklistUserCommand.java index a83490d..8a7ff04 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/developer/BlacklistUserCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/BlacklistUserCommand.java @@ -6,7 +6,7 @@ import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.message.embed.EmbedBuilder; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class BlacklistUserCommand extends Command { @Override public String name() { return "Blacklist User"; } @@ -14,7 +14,7 @@ public class BlacklistUserCommand extends Command { @Override public String usage() { return "blacklistuser "; } @Override public CommandCategory category() { return CommandCategory.DEVELOPER; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "owner"); } - @Override public Collection aliases() { return Arrays.asList("blacklistuser", "bluser", "sabusr"); } + @Override public List aliases() { return Arrays.asList("blacklistuser", "bluser", "sabusr"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java index 3c6d3c0..1a38b3d 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java @@ -5,19 +5,16 @@ package dev.salmonllama.fsbot.commands.developer; -import com.vdurmont.emoji.EmojiManager; import com.vdurmont.emoji.EmojiParser; import dev.salmonllama.fsbot.config.BotConfig; import dev.salmonllama.fsbot.database.controllers.GalleryController; import dev.salmonllama.fsbot.database.models.GalleryChannel; import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.message.embed.EmbedBuilder; -import org.javacord.api.util.logging.ExceptionLogger; import java.awt.*; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class CreateGalleryCommand extends Command { // TODO: This command needs help. @Override public String name() { return "Create Gallery"; } @@ -25,7 +22,7 @@ public class CreateGalleryCommand extends Command { // TODO: This command needs @Override public String usage() { return "creategallery "; } @Override public CommandCategory category() { return CommandCategory.DEVELOPER; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "owner"); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("creategallery", "addgallery", "newgallery")); } + @Override public List aliases() { return Arrays.asList("creategallery", "addgallery", "newgallery"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java index ee3ac6e..ffa135e 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java @@ -3,8 +3,8 @@ package dev.salmonllama.fsbot.commands.developer; import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.message.embed.EmbedBuilder; -import java.util.Collection; import java.util.Collections; +import java.util.List; public class DefaultCommand extends Command { @Override public String name() { return "Default"; } @@ -12,7 +12,7 @@ public class DefaultCommand extends Command { @Override public String usage() { return "you don't use this command"; } @Override public CommandCategory category() { return CommandCategory.DEVELOPER; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.OWNER); } - @Override public Collection aliases() { return Collections.singletonList("default"); } + @Override public List aliases() { return Collections.singletonList("default"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/InviteCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/InviteCommand.java index 8c49b64..01ca801 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/developer/InviteCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/InviteCommand.java @@ -12,6 +12,7 @@ import org.javacord.api.entity.channel.TextChannel; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.List; public class InviteCommand extends Command { @Override public String name() { return "Invite"; } @@ -19,7 +20,7 @@ public class InviteCommand extends Command { @Override public String usage() { return "invite"; } @Override public CommandCategory category() { return CommandCategory.DEVELOPER; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "owner"); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("invite", "inv")); } + @Override public List aliases() { return Arrays.asList("invite", "inv"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/PermissionCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/PermissionCommand.java index bc70722..caeab46 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/developer/PermissionCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/PermissionCommand.java @@ -13,9 +13,8 @@ import org.javacord.api.entity.user.User; import org.javacord.api.util.logging.ExceptionLogger; import java.awt.*; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class PermissionCommand extends Command { @Override public String name() { return "Permission"; } @@ -23,7 +22,7 @@ public class PermissionCommand extends Command { @Override public String usage() { return "permission "; } @Override public CommandCategory category() { return CommandCategory.DEVELOPER; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.OWNER); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("permission", "permissions", "perm", "perms")); } + @Override public List aliases() { return Arrays.asList("permission", "permissions", "perm", "perms"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java index 8b73033..69e1336 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java @@ -8,9 +8,8 @@ package dev.salmonllama.fsbot.commands.developer; import dev.salmonllama.fsbot.endpoints.scapefashion.ScapeFashionConnection; import dev.salmonllama.fsbot.guthix.*; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class TestCommand extends Command { @Override public String name() { return "Test"; } @@ -18,7 +17,7 @@ public class TestCommand extends Command { @Override public String usage() { return "test"; } @Override public CommandCategory category() { return CommandCategory.DEVELOPER; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.OWNER); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("test", "t")); } + @Override public List aliases() { return Arrays.asList("test", "t"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java index 3233977..c9ac0d5 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java @@ -12,9 +12,8 @@ import org.apache.logging.log4j.util.Strings; import org.javacord.api.entity.server.Server; import org.javacord.api.entity.user.User; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class ColorCommand extends Command { @Override public String name() { return "Color"; } @@ -22,7 +21,7 @@ public class ColorCommand extends Command { @Override public String usage() { return "color "; } @Override public CommandCategory category() { return CommandCategory.GENERAL; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("color", "colour")); } + @Override public List aliases() { return Arrays.asList("color", "colour"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java index 7b61b73..762003e 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java @@ -10,9 +10,8 @@ import dev.salmonllama.fsbot.database.controllers.ColorRoleController; import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.message.embed.EmbedBuilder; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class ColorsCommand extends Command { @Override public String name() { return "Colors"; } @@ -20,7 +19,7 @@ public class ColorsCommand extends Command { @Override public String usage() { return "colors"; } @Override public CommandCategory category() { return CommandCategory.GENERAL; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("colors", "colours")); } + @Override public List aliases() { return Arrays.asList("colors", "colours"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/HelpCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/HelpCommand.java index 70dbb64..22cdefd 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/HelpCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/HelpCommand.java @@ -23,7 +23,7 @@ public class HelpCommand extends Command { @Override public String usage() { return "help [String command]"; } @Override public CommandCategory category() { return CommandCategory.GENERAL; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("help", "h")); } + @Override public List aliases() { return Arrays.asList("help", "h"); } private final Guthix guthix; @@ -84,7 +84,7 @@ public class HelpCommand extends Command { for (Command cmd : guthix.listCommands()) { String cat = cmd.category().getCategory().toLowerCase(); if (cat.equals(category.toLowerCase())) { - builder.append("\n- ").append(cmd.name()); + builder.append("\n- ").append(cmd.aliases().get(0)); } } diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java index f439337..ce5dc62 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java @@ -15,6 +15,7 @@ import org.javacord.api.util.logging.ExceptionLogger; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.concurrent.CompletableFuture; public class OutfitCommand extends Command { @@ -26,7 +27,7 @@ public class OutfitCommand extends Command { @Override public String usage() { return "outfit "; } @Override public CommandCategory category() { return CommandCategory.GENERAL; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return initAliases(); } + @Override public List aliases() { return initAliases(); } @Override public void onCommand(CommandContext ctx) { @@ -192,8 +193,8 @@ public class OutfitCommand extends Command { } } - private Collection initAliases() { - Collection aliases = OutfitController.getDistinctTags().join(); + private List initAliases() { + List aliases = OutfitController.getDistinctTags().join(); aliases.addAll(NON_TAG_ALIASES); return aliases; } diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/PingCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/PingCommand.java index 1e437aa..8138376 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/PingCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/PingCommand.java @@ -15,7 +15,7 @@ public class PingCommand extends Command { @Override public String usage() { return "ping"; } @Override public CommandCategory category() { return CommandCategory.GENERAL; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Collections.singletonList("ping")); } + @Override public List aliases() { return Collections.singletonList("ping"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/PrivacyCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/PrivacyCommand.java index 0280006..753be84 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/PrivacyCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/PrivacyCommand.java @@ -3,8 +3,8 @@ package dev.salmonllama.fsbot.commands.general; import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.message.embed.EmbedBuilder; -import java.util.Collection; import java.util.Collections; +import java.util.List; public class PrivacyCommand extends Command { @Override public String name() { return "Privacy"; } @@ -12,12 +12,12 @@ public class PrivacyCommand extends Command { @Override public String usage() { return "privacy"; } @Override public CommandCategory category() { return CommandCategory.GENERAL; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return Collections.singletonList("privacy"); } + @Override public List aliases() { return Collections.singletonList("privacy"); } @Override public void onCommand(CommandContext ctx) { - String privacyUrl = "https://github.com/Salmonllama/Fashionscape-Bot/blob/database-rewrite/privacy.md"; // TODO: Change this to master + String privacyUrl = "https://github.com/Salmonllama/Fashionscape-Bot/blob/master/privacy.md"; EmbedBuilder response = new EmbedBuilder() .setTitle("Click Here to open") diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/ShowGalleriesCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/ShowGalleriesCommand.java index ff786e6..2c04ac4 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/ShowGalleriesCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/ShowGalleriesCommand.java @@ -5,9 +5,9 @@ package dev.salmonllama.fsbot.commands.general; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.stream.Collectors; import dev.salmonllama.fsbot.guthix.*; @@ -25,11 +25,11 @@ public class ShowGalleriesCommand extends Command { @Override public String usage() { return "showgalleries"; } @Override public CommandCategory category() { return CommandCategory.GENERAL; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("showgalleries", "listgalleries")); } + @Override public List aliases() { return Arrays.asList("showgalleries", "listgalleries"); } @Override public void onCommand(CommandContext ctx) { if (ctx.isPrivateMessage()) { - ctx.reply("This command can only be used within a server"); // TODO: Preset embeds again, yeah + ctx.reply("This command can only be used within a server"); return; } @@ -42,7 +42,7 @@ public class ShowGalleriesCommand extends Command { }); } - EmbedBuilder galleryEmbed(Collection galleries, Server server) { // TODO: Base FSBot embed. + EmbedBuilder galleryEmbed(Collection galleries, Server server) { EmbedBuilder embed = new EmbedBuilder() .setTitle("Server Gallery Channels"); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java index c47983d..b8f78c0 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java @@ -1,8 +1,6 @@ package dev.salmonllama.fsbot.commands.general; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; +import java.util.*; import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.message.embed.EmbedBuilder; @@ -15,7 +13,7 @@ public class StatsCommand extends Command { @Override public String usage() { return "stats"; } @Override public CommandCategory category() { return CommandCategory.GENERAL; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("stats")); } + @Override public List aliases() { return Collections.singletonList("stats"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsBodyCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsBodyCommand.java index b799eb1..e10a9d3 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsBodyCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsBodyCommand.java @@ -13,9 +13,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsBodyCommand extends Command { @Override public String name() { return "OSRS Body"; } @@ -23,7 +22,7 @@ public class OsrsBodyCommand extends Command { @Override public String usage() { return "osrsbody <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07body", "osrsbody")); } + @Override public List aliases() { return Arrays.asList("07body", "osrsbody"); } private static final Logger logger = LoggerFactory.getLogger(OsrsBodyCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsCapeCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsCapeCommand.java index 135cc89..00a04af 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsCapeCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsCapeCommand.java @@ -13,9 +13,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsCapeCommand extends Command { @Override public String name() { return "OSRS Cape"; } @@ -23,7 +22,7 @@ public class OsrsCapeCommand extends Command { @Override public String usage() { return "osrscape <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07cape", "osrscape")); } + @Override public List aliases() { return Arrays.asList("07cape", "osrscape"); } private static final Logger logger = LoggerFactory.getLogger(OsrsCapeCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsFeetCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsFeetCommand.java index dc4ad65..0ec2345 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsFeetCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsFeetCommand.java @@ -13,9 +13,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsFeetCommand extends Command { @Override public String name() { return "OSRS Feet"; } @@ -23,7 +22,7 @@ public class OsrsFeetCommand extends Command { @Override public String usage() { return "osrsfeet <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07feet", "osrsfeet")); } + @Override public List aliases() { return Arrays.asList("07feet", "osrsfeet"); } private static final Logger logger = LoggerFactory.getLogger(OsrsFeetCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHandCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHandCommand.java index 44a0f33..5307266 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHandCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHandCommand.java @@ -13,9 +13,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsHandCommand extends Command { @Override public String name() { return "OSRS Hand"; } @@ -23,7 +22,7 @@ public class OsrsHandCommand extends Command { @Override public String usage() { return "osrshand <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07hand", "osrshand")); } + @Override public List aliases() { return Arrays.asList("07hand", "osrshand"); } private static final Logger logger = LoggerFactory.getLogger(OsrsHandCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHeadCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHeadCommand.java index 140ef2e..c180bd3 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHeadCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHeadCommand.java @@ -13,9 +13,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsHeadCommand extends Command { @Override public String name() { return "OSRS Head"; } @@ -23,7 +22,7 @@ public class OsrsHeadCommand extends Command { @Override public String usage() { return "osrshead <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07head", "osrshead")); } + @Override public List aliases() { return Arrays.asList("07head", "osrshead"); } private static final Logger logger = LoggerFactory.getLogger(OsrsHeadCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsLegsCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsLegsCommand.java index 95302ff..0cc79b6 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsLegsCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsLegsCommand.java @@ -13,9 +13,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsLegsCommand extends Command { @Override public String name() { return "OSRS Legs"; } @@ -23,7 +22,7 @@ public class OsrsLegsCommand extends Command { @Override public String usage() { return "osrslegs <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07legs", "osrslegs")); } + @Override public List aliases() { return Arrays.asList("07legs", "osrslegs"); } private static final Logger logger = LoggerFactory.getLogger(OsrsLegsCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsNeckCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsNeckCommand.java index b7af727..e6ac5c8 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsNeckCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsNeckCommand.java @@ -13,9 +13,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsNeckCommand extends Command { @Override public String name() { return "OSRS Neck"; } @@ -23,7 +22,7 @@ public class OsrsNeckCommand extends Command { @Override public String usage() { return "osrsneck <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07neck", "osrsneck")); } + @Override public List aliases() { return Arrays.asList("07neck", "osrsneck"); } private static final Logger logger = LoggerFactory.getLogger(OsrsNeckCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsSearchCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsSearchCommand.java index 6cf5fcf..695fe01 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsSearchCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsSearchCommand.java @@ -12,9 +12,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsSearchCommand extends Command { @Override public String name() { return "OSRS Search"; } @@ -22,7 +21,7 @@ public class OsrsSearchCommand extends Command { @Override public String usage() { return "osrssearch <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07search", "osrssearch")); } + @Override public List aliases() { return Arrays.asList("07search", "osrssearch"); } private static final Logger logger = LoggerFactory.getLogger(OsrsSearchCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsShieldCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsShieldCommand.java index f776eae..51262ed 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsShieldCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsShieldCommand.java @@ -13,9 +13,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsShieldCommand extends Command { @Override public String name() { return "OSRS Shield"; } @@ -23,7 +22,7 @@ public class OsrsShieldCommand extends Command { @Override public String usage() { return "osrsshield <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07shield", "osrsshield")); } + @Override public List aliases() { return Arrays.asList("07shield", "osrsshield"); } private static final Logger logger = LoggerFactory.getLogger(OsrsShieldCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsWeaponCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsWeaponCommand.java index 6898449..ea2d7c9 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsWeaponCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsWeaponCommand.java @@ -13,9 +13,8 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OsrsWeaponCommand extends Command { @Override public String name() { return "OSRS Weapon"; } @@ -23,7 +22,7 @@ public class OsrsWeaponCommand extends Command { @Override public String usage() { return "osrsweapon <#color or item name>"; } @Override public CommandCategory category() { return CommandCategory.OSRS_ITEM_SEARCH; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("07weapon", "osrsweapon")); } + @Override public List aliases() { return Arrays.asList("07weapon", "osrsweapon"); } private static final Logger logger = LoggerFactory.getLogger(OsrsWeaponCommand.class); diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java index 4d0bb79..8ff0c0e 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java @@ -11,9 +11,7 @@ import dev.salmonllama.fsbot.database.models.ColorRole; import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.permission.Role; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.List; public class AddColorCommand extends Command { @@ -22,7 +20,7 @@ public class AddColorCommand extends Command { @Override public String usage() { return "addcolor "; } @Override public CommandCategory category() { return CommandCategory.STAFF; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("addcolor", "addcolour", "addclr")); } + @Override public List aliases() { return Arrays.asList("addcolor", "addcolour", "addclr"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/EchoCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/EchoCommand.java index f0a4e6a..82076fe 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/EchoCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/EchoCommand.java @@ -7,9 +7,8 @@ package dev.salmonllama.fsbot.commands.staff; import dev.salmonllama.fsbot.guthix.*; -import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; +import java.util.List; public class EchoCommand extends Command { @Override public String name() { return "Echo"; } @@ -17,7 +16,7 @@ public class EchoCommand extends Command { @Override public String usage() { return "echo "; } @Override public CommandCategory category() { return CommandCategory.STAFF; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); } - @Override public Collection aliases() { return new ArrayList<>(Collections.singletonList("echo")); } + @Override public List aliases() { return Collections.singletonList("echo"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/GetOutfitCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/GetOutfitCommand.java index 8411e23..b5d8911 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/GetOutfitCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/GetOutfitCommand.java @@ -8,9 +8,8 @@ package dev.salmonllama.fsbot.commands.staff; import dev.salmonllama.fsbot.database.controllers.OutfitController; import dev.salmonllama.fsbot.guthix.*; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class GetOutfitCommand extends Command { @Override public String name() { return "Get Outift"; } @@ -18,7 +17,7 @@ public class GetOutfitCommand extends Command { @Override public String usage() { return "getoutfit "; } @Override public CommandCategory category() { return CommandCategory.STAFF; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("getoutfit", "get")); } + @Override public List aliases() { return Arrays.asList("getoutfit", "get"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/GetServersCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/GetServersCommand.java index ac849ca..7c6207f 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/GetServersCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/GetServersCommand.java @@ -11,9 +11,8 @@ import org.javacord.api.entity.message.embed.EmbedBuilder; import org.javacord.api.entity.server.Server; import java.awt.*; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class GetServersCommand extends Command { @Override public String name() { return "Get Servers"; } @@ -21,7 +20,7 @@ public class GetServersCommand extends Command { @Override public String usage() { return "getservers"; } @Override public CommandCategory category() { return CommandCategory.STAFF; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("getservers", "servers")); } + @Override public List aliases() { return Arrays.asList("getservers", "servers"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/OutfitInfoCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/OutfitInfoCommand.java index 7f61f08..f1de22d 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/OutfitInfoCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/OutfitInfoCommand.java @@ -9,9 +9,8 @@ import dev.salmonllama.fsbot.database.controllers.OutfitController; import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.message.embed.EmbedBuilder; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class OutfitInfoCommand extends Command { @Override public String name() { return "Outfit Info"; } @@ -19,7 +18,7 @@ public class OutfitInfoCommand extends Command { @Override public String usage() { return "outfitinfo "; } @Override public CommandCategory category() { return CommandCategory.STAFF; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("outfitinfo", "oinfo")); } + @Override public List aliases() { return Arrays.asList("outfitinfo", "oinfo"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java index bb80328..c3de223 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java @@ -12,9 +12,8 @@ import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.channel.TextChannel; import org.javacord.api.entity.message.embed.EmbedBuilder; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class RemoveOutfitCommand extends Command { @Override public String name() { return "Remove Outfit"; } @@ -22,7 +21,7 @@ public class RemoveOutfitCommand extends Command { @Override public String usage() { return "remove "; } @Override public CommandCategory category() { return CommandCategory.STAFF; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("removeoutfit", "remove")); } + @Override public List aliases() { return Arrays.asList("removeoutfit", "remove"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java index dc6b58c..fc60b47 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java @@ -15,9 +15,8 @@ import org.javacord.api.entity.message.embed.EmbedBuilder; import java.awt.*; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; +import java.util.List; public class RetagCommand extends Command { @Override public String name() { return "Retag"; } @@ -25,7 +24,7 @@ public class RetagCommand extends Command { @Override public String usage() { return "retag "; } @Override public CommandCategory category() { return CommandCategory.STAFF; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); } - @Override public Collection aliases() { return new ArrayList<>(Collections.singletonList("retag")); } + @Override public List aliases() { return Collections.singletonList("retag"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/SetStatusCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/SetStatusCommand.java index 23d14c1..7199d10 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/SetStatusCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/SetStatusCommand.java @@ -13,6 +13,7 @@ import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.List; public class SetStatusCommand extends Command { @Override public String name() { return "Set Status"; } @@ -20,7 +21,7 @@ public class SetStatusCommand extends Command { @Override public String usage() { return "updatestatus "; } @Override public CommandCategory category() { return CommandCategory.STAFF; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("setstatus", "status")); } + @Override public List aliases() { return Arrays.asList("setstatus", "status"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/commands/staff/WelcomeMessageCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/staff/WelcomeMessageCommand.java index 1beb597..cc678db 100644 --- a/src/main/java/dev/salmonllama/fsbot/commands/staff/WelcomeMessageCommand.java +++ b/src/main/java/dev/salmonllama/fsbot/commands/staff/WelcomeMessageCommand.java @@ -12,9 +12,8 @@ import dev.salmonllama.fsbot.guthix.*; import org.javacord.api.entity.message.embed.EmbedBuilder; import org.javacord.api.util.logging.ExceptionLogger; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; +import java.util.List; public class WelcomeMessageCommand extends Command { @Override public String name() { return "Welcome Message"; } @@ -22,7 +21,7 @@ public class WelcomeMessageCommand extends Command { @Override public String usage() { return "welcomemessage [String newMessage]"; } @Override public CommandCategory category() { return CommandCategory.STAFF; } @Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); } - @Override public Collection aliases() { return new ArrayList<>(Arrays.asList("welcomemessage", "wmsg")); } + @Override public List aliases() { return Arrays.asList("welcomemessage", "wmsg"); } @Override public void onCommand(CommandContext ctx) { diff --git a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java index 8d6e385..ae9de84 100644 --- a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java +++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java @@ -13,6 +13,7 @@ import java.sql.SQLException; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; @@ -159,7 +160,7 @@ public class OutfitController { }); } - public static CompletableFuture> getDistinctTags() { + public static CompletableFuture> getDistinctTags() { return CompletableFuture.supplyAsync(() -> { try { return getDistinctTagsExec(); @@ -332,10 +333,10 @@ public class OutfitController { return extractCount(rs); } - private static Collection getDistinctTagsExec() throws SQLException { + private static List getDistinctTagsExec() throws SQLException { ResultSet rs = FSDB.get().select("SELECT DISTINCT tag FROM outfits"); - Collection tags = new ArrayList<>(); + List tags = new ArrayList<>(); while (rs.next()) { tags.add(rs.getString("tag")); } diff --git a/src/main/java/dev/salmonllama/fsbot/guthix/Command.java b/src/main/java/dev/salmonllama/fsbot/guthix/Command.java index 8ee9c16..c904818 100644 --- a/src/main/java/dev/salmonllama/fsbot/guthix/Command.java +++ b/src/main/java/dev/salmonllama/fsbot/guthix/Command.java @@ -5,7 +5,7 @@ package dev.salmonllama.fsbot.guthix; -import java.util.Collection; +import java.util.List; import java.util.concurrent.CompletableFuture; public abstract class Command { @@ -14,7 +14,7 @@ public abstract class Command { public abstract String usage(); public abstract CommandCategory category(); public abstract CommandPermission permission(); - public abstract Collection aliases(); + public abstract List aliases(); public abstract void onCommand(CommandContext ctx);