Compare commits
2 Commits
d88513ee49
...
ddbf910f87
Author | SHA1 | Date |
---|---|---|
Joe | ddbf910f87 | |
Joe | 53a66fc228 |
33
pom.xml
33
pom.xml
|
@ -67,11 +67,11 @@
|
|||
<!-- <version>1.1.1</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
<artifactId>logback-classic</artifactId>
|
||||
<version>1.4.14</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>ch.qos.logback</groupId>-->
|
||||
<!-- <artifactId>logback-classic</artifactId>-->
|
||||
<!-- <version>1.4.14</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
|
@ -79,11 +79,11 @@
|
|||
<version>1.4.14</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>2.0.10</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.slf4j</groupId>-->
|
||||
<!-- <artifactId>slf4j-api</artifactId>-->
|
||||
<!-- <version>2.0.10</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.yaml</groupId>
|
||||
|
@ -222,21 +222,16 @@
|
|||
<shadedPattern>uk.co.angrybee.joe.shaded.javax.annotation</shadedPattern>
|
||||
</relocation>
|
||||
|
||||
<relocation>
|
||||
<pattern>org.slf4j</pattern>
|
||||
<shadedPattern>uk.co.angrybee.joe.shaded.org.slf4j</shadedPattern>
|
||||
</relocation>
|
||||
<!-- <relocation>-->
|
||||
<!-- <pattern>org.slf4j</pattern>-->
|
||||
<!-- <shadedPattern>uk.co.angrybee.joe.shaded.org.slf4j</shadedPattern>-->
|
||||
<!-- </relocation>-->
|
||||
|
||||
<relocation>
|
||||
<pattern>org.yaml.snakeyaml</pattern>
|
||||
<shadedPattern>uk.co.angrybee.joe.shaded.org.yaml.snakeyaml</shadedPattern>
|
||||
</relocation>
|
||||
|
||||
<!-- <relocation>-->
|
||||
<!-- <pattern>org.json.simple</pattern>-->
|
||||
<!-- <shadedPattern>uk.co.angrybee.joe.shaded.org.json.simple</shadedPattern>-->
|
||||
<!-- </relocation>-->
|
||||
|
||||
<relocation>
|
||||
<pattern>org.jetbrains.annotations</pattern>
|
||||
<shadedPattern>uk.co.angrybee.joe.shaded.org.jetbrains.annotations</shadedPattern>
|
||||
|
|
|
@ -114,26 +114,6 @@ public class DiscordClient extends ListenerAdapter {
|
|||
|
||||
CommandListUpdateAction commands = javaDiscordAPI.updateCommands();
|
||||
|
||||
// commands.addCommands(
|
||||
// new CommandData("whitelist", "Edit the whitelist.")
|
||||
// .addSubcommands(
|
||||
// new SubcommandData("add", "Add a user to the whitelist")
|
||||
// .addOption(STRING, "minecraft_username", "Minecraft username to add", true)
|
||||
// .addOption(USER, "discord_user", "Discord user to bind to", false),
|
||||
// new SubcommandData("remove", "Remove user from the whitelist")
|
||||
// .addOption(STRING, "minecraft_username", "Minecraft username to remove", true),
|
||||
// new SubcommandData("clear", "Clear whitelists assigned to your account"),
|
||||
// new SubcommandData("whois", "Find the Discord name linked to a Minecraft name")
|
||||
// .addOption(STRING, "minecraft_username", "Minecraft name to search", false)
|
||||
// .addOption(USER, "discord_user", "Minecraft name to search", false)),
|
||||
//
|
||||
// new CommandData("clearname", "Clear name from all lists")
|
||||
// .addOption(STRING, "minecraft_username", "Minecraft username to clear", true),
|
||||
// new CommandData("clearban", "Clear ban from user")
|
||||
// .addOption(STRING, "minecraft_username", "Minecraft username to unban", true),
|
||||
// new CommandData("help", "Show bot info"))
|
||||
// .queue();
|
||||
|
||||
commands.addCommands(
|
||||
Commands.slash("whitelist", "Edit the whitelist.")
|
||||
.addSubcommands(
|
||||
|
|
|
@ -13,7 +13,7 @@ public class ShutdownEvents extends ListenerAdapter
|
|||
CheckIntents(shutdownEvent.getCloseCode());
|
||||
}
|
||||
|
||||
// Check for the 'SERVER MEMBERS INTENT' and inform users if not enabled
|
||||
// Check for the 'SERVER MEMBERS INTENT' & 'MESSAGE_CONTENT' and inform users if not enabled
|
||||
private void CheckIntents(CloseCode closeCode)
|
||||
{
|
||||
if(closeCode == null)
|
||||
|
@ -22,7 +22,7 @@ public class ShutdownEvents extends ListenerAdapter
|
|||
if(closeCode == CloseCode.DISALLOWED_INTENTS)
|
||||
{
|
||||
DiscordWhitelister.getPluginLogger().severe("\u001B[31m" + "Cannot connect as this bot is not eligible to request the privileged intent 'GUILD_MEMBERS'" + "\u001B[0m");
|
||||
DiscordWhitelister.getPluginLogger().severe( "\u001B[31m" + "To fix this, please enable 'SERVER MEMBERS INTENT' located " +
|
||||
DiscordWhitelister.getPluginLogger().severe( "\u001B[31m" + "To fix this, please enable 'SERVER MEMBERS INTENT' & 'MESSAGE_CONTENT' located " +
|
||||
"at https://discord.com/developers/applications -> the application you're using to run this bot -> the button called 'bot' on the left" + "\u001B[0m");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,12 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<appender name="STDOUT" class="uk.co.angrybee.joe.shaded.ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>[DiscordWhitelister] %boldCyan(%-34.-34thread) %red(%10.10X{jda.shard}) %boldGreen(%-15.-15logger{0}) %highlight(%-6level) %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE configuration>
|
||||
|
||||
<configuration>
|
||||
<import class="uk.co.angrybee.joe.shaded.ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
|
||||
<import class="uk.co.angrybee.joe.shaded.ch.qos.logback.core.ConsoleAppender"/>
|
||||
|
||||
<appender name="STDOUT" class="uk.co.angrybee.joe.shaded.ch.qos.logback.core.ConsoleAppender">
|
||||
<append>true</append>
|
||||
<immediateFlush>true</immediateFlush>
|
||||
<encoder class="PatternLayoutEncoder">
|
||||
<!-- <pattern>[DiscordWhitelister] %boldCyan(%-34.-34thread) %red(%10.10X{jda.shard}) %boldGreen(%-15.-15logger{0}) %highlight(%-6level) %msg%n</pattern>-->
|
||||
<pattern>[DiscordWhitelister] %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
</configuration>
|
||||
|
||||
<root level="info">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
Loading…
Reference in New Issue