Fashionscape/discord-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"engine work"

Browse Source
This commit is contained in:
Salmonllama 2020-09-12 16:29:14 -04:00
parent ee066fb084
commit 8282ccfe11
35 changed files with 75 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dev/salmonllama/fsbot/commands/developer/BlacklistUserCommand.java
View File

@ -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 <userId> <reason>"; }
@Override public CommandCategory category() { return CommandCategory.DEVELOPER; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "owner"); }
@Override public Collection<String> aliases() { return Arrays.asList("blacklistuser", "bluser", "sabusr"); }
@Override public List<String> aliases() { return Arrays.asList("blacklistuser", "bluser", "sabusr"); }
@Override
public void onCommand(CommandContext ctx) {

7
src/main/java/dev/salmonllama/fsbot/commands/developer/CreateGalleryCommand.java
View File

@ -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 <String tag>"; }
@Override public CommandCategory category() { return CommandCategory.DEVELOPER; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "owner"); }
@Override public Collection<String> aliases() { return new ArrayList<>(Arrays.asList("creategallery", "addgallery", "newgallery")); }
@Override public List<String> aliases() { return Arrays.asList("creategallery", "addgallery", "newgallery"); }
@Override
public void onCommand(CommandContext ctx) {

4
src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java
View File

@ -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<String> aliases() { return Collections.singletonList("default"); }
@Override public List<String> aliases() { return Collections.singletonList("default"); }
@Override
public void onCommand(CommandContext ctx) {

3
src/main/java/dev/salmonllama/fsbot/commands/developer/InviteCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("invite", "inv")); }
@Override public List<String> aliases() { return Arrays.asList("invite", "inv"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/developer/PermissionCommand.java
View File

@ -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 <list|add|remove> <keyword>"; }
@Override public CommandCategory category() { return CommandCategory.DEVELOPER; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.OWNER); }
@Override public Collection<String> aliases() { return new ArrayList<>(Arrays.asList("permission", "permissions", "perm", "perms")); }
@Override public List<String> aliases() { return Arrays.asList("permission", "permissions", "perm", "perms"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/developer/TestCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("test", "t")); }
@Override public List<String> aliases() { return Arrays.asList("test", "t"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/general/ColorCommand.java
View File

@ -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 <colorName>"; }
@Override public CommandCategory category() { return CommandCategory.GENERAL; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); }
@Override public Collection<String> aliases() { return new ArrayList<>(Arrays.asList("color", "colour")); }
@Override public List<String> aliases() { return Arrays.asList("color", "colour"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/general/ColorsCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("colors", "colours")); }
@Override public List<String> aliases() { return Arrays.asList("colors", "colours"); }
@Override
public void onCommand(CommandContext ctx) {

4
src/main/java/dev/salmonllama/fsbot/commands/general/HelpCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("help", "h")); }
@Override public List<String> 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));
}
}

7
src/main/java/dev/salmonllama/fsbot/commands/general/OutfitCommand.java
View File

@ -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 <String tag>"; }
@Override public CommandCategory category() { return CommandCategory.GENERAL; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.NONE); }
@Override public Collection<String> aliases() { return initAliases(); }
@Override public List<String> aliases() { return initAliases(); }
@Override
public void onCommand(CommandContext ctx) {
@ -192,8 +193,8 @@ public class OutfitCommand extends Command {
}
}
private Collection<String> initAliases() {
Collection<String> aliases = OutfitController.getDistinctTags().join();
private List<String> initAliases() {
List<String> aliases = OutfitController.getDistinctTags().join();
aliases.addAll(NON_TAG_ALIASES);
return aliases;
}

2
src/main/java/dev/salmonllama/fsbot/commands/general/PingCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Collections.singletonList("ping")); }
@Override public List<String> aliases() { return Collections.singletonList("ping"); }
@Override
public void onCommand(CommandContext ctx) {

6
src/main/java/dev/salmonllama/fsbot/commands/general/PrivacyCommand.java
View File

@ -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<String> aliases() { return Collections.singletonList("privacy"); }
@Override public List<String> 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")

8
src/main/java/dev/salmonllama/fsbot/commands/general/ShowGalleriesCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("showgalleries", "listgalleries")); }
@Override public List<String> 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<GalleryChannel> galleries, Server server) { // TODO: Base FSBot embed.
EmbedBuilder galleryEmbed(Collection<GalleryChannel> galleries, Server server) {
EmbedBuilder embed = new EmbedBuilder()
.setTitle("Server Gallery Channels");

6
src/main/java/dev/salmonllama/fsbot/commands/general/StatsCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("stats")); }
@Override public List<String> aliases() { return Collections.singletonList("stats"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsBodyCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07body", "osrsbody")); }
@Override public List<String> aliases() { return Arrays.asList("07body", "osrsbody"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsBodyCommand.class);

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsCapeCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07cape", "osrscape")); }
@Override public List<String> aliases() { return Arrays.asList("07cape", "osrscape"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsCapeCommand.class);

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsFeetCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07feet", "osrsfeet")); }
@Override public List<String> aliases() { return Arrays.asList("07feet", "osrsfeet"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsFeetCommand.class);

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHandCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07hand", "osrshand")); }
@Override public List<String> aliases() { return Arrays.asList("07hand", "osrshand"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsHandCommand.class);

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsHeadCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07head", "osrshead")); }
@Override public List<String> aliases() { return Arrays.asList("07head", "osrshead"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsHeadCommand.class);

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsLegsCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07legs", "osrslegs")); }
@Override public List<String> aliases() { return Arrays.asList("07legs", "osrslegs"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsLegsCommand.class);

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsNeckCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07neck", "osrsneck")); }
@Override public List<String> aliases() { return Arrays.asList("07neck", "osrsneck"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsNeckCommand.class);

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsSearchCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07search", "osrssearch")); }
@Override public List<String> aliases() { return Arrays.asList("07search", "osrssearch"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsSearchCommand.class);

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsShieldCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07shield", "osrsshield")); }
@Override public List<String> aliases() { return Arrays.asList("07shield", "osrsshield"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsShieldCommand.class);

5
src/main/java/dev/salmonllama/fsbot/commands/osrssearch/OsrsWeaponCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("07weapon", "osrsweapon")); }
@Override public List<String> aliases() { return Arrays.asList("07weapon", "osrsweapon"); }
private static final Logger logger = LoggerFactory.getLogger(OsrsWeaponCommand.class);

4
src/main/java/dev/salmonllama/fsbot/commands/staff/AddColorCommand.java
View File

@ -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 <colorName> <roleId>"; }
@Override public CommandCategory category() { return CommandCategory.STAFF; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); }
@Override public Collection<String> aliases() { return new ArrayList<>(Arrays.asList("addcolor", "addcolour", "addclr")); }
@Override public List<String> aliases() { return Arrays.asList("addcolor", "addcolour", "addclr"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/staff/EchoCommand.java
View File

@ -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 <message>"; }
@Override public CommandCategory category() { return CommandCategory.STAFF; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); }
@Override public Collection<String> aliases() { return new ArrayList<>(Collections.singletonList("echo")); }
@Override public List<String> aliases() { return Collections.singletonList("echo"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/staff/GetOutfitCommand.java
View File

@ -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 <String id>"; }
@Override public CommandCategory category() { return CommandCategory.STAFF; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); }
@Override public Collection<String> aliases() { return new ArrayList<>(Arrays.asList("getoutfit", "get")); }
@Override public List<String> aliases() { return Arrays.asList("getoutfit", "get"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/staff/GetServersCommand.java
View File

@ -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<String> aliases() { return new ArrayList<>(Arrays.asList("getservers", "servers")); }
@Override public List<String> aliases() { return Arrays.asList("getservers", "servers"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/staff/OutfitInfoCommand.java
View File

@ -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 <String id>"; }
@Override public CommandCategory category() { return CommandCategory.STAFF; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); }
@Override public Collection<String> aliases() { return new ArrayList<>(Arrays.asList("outfitinfo", "oinfo")); }
@Override public List<String> aliases() { return Arrays.asList("outfitinfo", "oinfo"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/staff/RemoveOutfitCommand.java
View File

@ -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 <String id>"; }
@Override public CommandCategory category() { return CommandCategory.STAFF; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); }
@Override public Collection<String> aliases() { return new ArrayList<>(Arrays.asList("removeoutfit", "remove")); }
@Override public List<String> aliases() { return Arrays.asList("removeoutfit", "remove"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/staff/RetagCommand.java
View File

@ -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 <String id> <String newtag>"; }
@Override public CommandCategory category() { return CommandCategory.STAFF; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); }
@Override public Collection<String> aliases() { return new ArrayList<>(Collections.singletonList("retag")); }
@Override public List<String> aliases() { return Collections.singletonList("retag"); }
@Override
public void onCommand(CommandContext ctx) {

3
src/main/java/dev/salmonllama/fsbot/commands/staff/SetStatusCommand.java
View File

@ -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 <String status>"; }
@Override public CommandCategory category() { return CommandCategory.STAFF; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); }
@Override public Collection<String> aliases() { return new ArrayList<>(Arrays.asList("setstatus", "status")); }
@Override public List<String> aliases() { return Arrays.asList("setstatus", "status"); }
@Override
public void onCommand(CommandContext ctx) {

5
src/main/java/dev/salmonllama/fsbot/commands/staff/WelcomeMessageCommand.java
View File

@ -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 opt> [String newMessage]"; }
@Override public CommandCategory category() { return CommandCategory.STAFF; }
@Override public CommandPermission permission() { return new CommandPermission(PermissionType.STATIC, "staff"); }
@Override public Collection<String> aliases() { return new ArrayList<>(Arrays.asList("welcomemessage", "wmsg")); }
@Override public List<String> aliases() { return Arrays.asList("welcomemessage", "wmsg"); }
@Override
public void onCommand(CommandContext ctx) {

7
src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
View File

@ -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<Collection<String>> getDistinctTags() {
public static CompletableFuture<List<String>> getDistinctTags() {
return CompletableFuture.supplyAsync(() -> {
try {
return getDistinctTagsExec();
@ -332,10 +333,10 @@ public class OutfitController {
return extractCount(rs);
}
private static Collection<String> getDistinctTagsExec() throws SQLException {
private static List<String> getDistinctTagsExec() throws SQLException {
ResultSet rs = FSDB.get().select("SELECT DISTINCT tag FROM outfits");
Collection<String> tags = new ArrayList<>();
List<String> tags = new ArrayList<>();
while (rs.next()) {
tags.add(rs.getString("tag"));
}

4
src/main/java/dev/salmonllama/fsbot/guthix/Command.java
View File

@ -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<String> aliases();
public abstract List<String> aliases();
public abstract void onCommand(CommandContext ctx);