Upstream
/
DiscordWhitelisterSpigot
mirror of https://github.com/Shimeo98/DiscordWhitelisterSpigot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed a bug where the bot did not check if the user was already on the whitelist, when not using Easy Whitelist

This commit is contained in:
JoeShimell 2020-05-01 21:07:06 +01:00
parent 1041bf9503
commit 5b815d7cc3
2 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@ -2,13 +2,6 @@
A simple spigot plugin which allows whitelisting through a discord text channel. This provides an easy way for users to whitelist without needing to be on the minecraft server.
### Backwards compatibility
Version 1.2.0 and greater are not compatible with version 1.1.x and lower.
The layout of the internal user-list.yml got updated.
You need to remove it manually and let the plugin on v1.2.x create a new one.
If you upgrade without knowing what you are doing. Registration will not work correctly.
### Features:
- 3 separate role groups:
@ -25,6 +18,11 @@ If you upgrade without knowing what you are doing. Registration will not work co
- Use `!whitelist add "minecraftUsername"` in a valid channel to whitelist people on your minecraft server
- Use `!whitelist remove "minecraftUsername"` in a valid channel to remove people from the whitelist on your minecraft server
- Use `!whitelist` in a valid channel to get info about the bot and how to use it
- Custom Message Support:
- Allows editing of server response messages (file is located at `(server-root)/plugins/DiscordWhitelister/custom-messages.yml)`
- This feature is disabled by default and can be enabled in the config file (`use-custom-messages`)
- Note: Only message variables ({Sender} for example) in the original messages will be evaluated. For example: using {MaxWhitelistAmount} in the "insufficient-permissions" string/message will not work as it was never in the original string/message.
- Automatically add/remove a role when adding/removing to/from the whitelist
- This feature is meant to be used when users can add themselves to the whitelist.
@ -41,5 +39,12 @@ If you upgrade without knowing what you are doing. Registration will not work co
### Set Up:
Config file is located at: (server-root)/plugins/DiscordWhitelister - this needs a valid bot token and valid channel id(s) to work.
Config file is located at: `(server-root)/plugins/DiscordWhitelister/discord-whitelister.yml`, **this needs a valid bot token and valid channel id(s) to work**.
To create a Discord application and/or find your discord bot token, follow this link: https://discordapp.com/developers/applications/
Here is a short video showing all the steps needed to configure the bot: https://youtu.be/OqaeItuLefU
### Backwards compatibility (Only applies to versions lower than v1.2.0)
Version 1.2.0 onwards are not compatible with version 1.1.x and lower. This is due to the layout of user-list.yml being changed. You will need to remove user-list.yml manually and let the plugin create a new one.
If you upgrade without doing so, registration will not work correctly.

61
src/main/java/uk/co/angrybee/joe/DiscordClient.java
View File

@ -386,10 +386,14 @@ public class DiscordClient extends ListenerAdapter {
DiscordWhitelister.getPlugin().getLogger().info(author.getName() + "(" + author.getId() + ") attempted to whitelist: " + finalNameToAdd);
}
if (DiscordWhitelister.useEasyWhitelist) {
try {
if (DiscordWhitelister.useEasyWhitelist)
{
try
{
tempFileConfiguration.load(new File(DiscordWhitelister.easyWhitelist.getDataFolder(), "config.yml"));
} catch (IOException | InvalidConfigurationException e) {
}
catch (IOException | InvalidConfigurationException e)
{
EmbedBuilder failure = new EmbedBuilder();
failure.setColor(new Color(231, 76, 60));
failure.addField("Internal Error", (author.getAsMention() + ", something went wrong while accessing EasyWhitelist file. Please contact a staff member."), false);
@ -399,31 +403,42 @@ public class DiscordClient extends ListenerAdapter {
}
}
if (DiscordWhitelister.useEasyWhitelist || checkWhitelistJSON(whitelistJSON, finalNameToAdd))
boolean alreadyOnWhitelist = false;
if(DiscordWhitelister.useEasyWhitelist)
{
if (tempFileConfiguration.getStringList("whitelisted").contains(finalNameToAdd))
{
EmbedBuilder embedBuilderAlreadyWhitelisted = new EmbedBuilder();
embedBuilderAlreadyWhitelisted.setColor(new Color(104, 109, 224));
if(!DiscordWhitelister.useCustomMessages)
{
embedBuilderAlreadyWhitelisted.addField("User already on the whitelist", (author.getAsMention() + ", cannot add user as `" + finalNameToAdd + "` is already on the whitelist!"), false);
}
else
{
String customTitle = DiscordWhitelister.getCustomMessagesConfig().getString("already-on-whitelist-title");
String customMessage = DiscordWhitelister.getCustomMessagesConfig().getString("already-on-whitelist");
customMessage = customMessage.replaceAll("\\{Sender}", author.getAsMention());
customMessage = customMessage.replaceAll("\\{MinecraftUsername}", finalNameToAdd);
embedBuilderAlreadyWhitelisted.addField(customTitle, customMessage, false);
}
channel.sendMessage(embedBuilderAlreadyWhitelisted.build()).queue();
return;
alreadyOnWhitelist = true;
}
}
else if (checkWhitelistJSON(whitelistJSON, finalNameToAdd))
{
alreadyOnWhitelist = true;
}
if(alreadyOnWhitelist)
{
EmbedBuilder embedBuilderAlreadyWhitelisted = new EmbedBuilder();
embedBuilderAlreadyWhitelisted.setColor(new Color(104, 109, 224));
if(!DiscordWhitelister.useCustomMessages)
{
embedBuilderAlreadyWhitelisted.addField("User already on the whitelist", (author.getAsMention() + ", cannot add user as `" + finalNameToAdd + "` is already on the whitelist!"), false);
}
else
{
String customTitle = DiscordWhitelister.getCustomMessagesConfig().getString("already-on-whitelist-title");
String customMessage = DiscordWhitelister.getCustomMessagesConfig().getString("already-on-whitelist");
customMessage = customMessage.replaceAll("\\{Sender}", author.getAsMention());
customMessage = customMessage.replaceAll("\\{MinecraftUsername}", finalNameToAdd);
embedBuilderAlreadyWhitelisted.addField(customTitle, customMessage, false);
}
channel.sendMessage(embedBuilderAlreadyWhitelisted.build()).queue();
return;
}
if (DiscordWhitelister.getRemovedList().get(finalNameToAdd) != null) // If the user has been removed before
{