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

Allow 'show-warning-in-command-channel' to run even when 'remove-unnecessary-messages-from-whitelist-channel' is set to false

This commit is contained in:
Joe Shimell 2021-02-03 12:05:44 +00:00
parent 40250fc1ab
commit e7f86b8417
1 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1054,25 +1054,26 @@ public class DiscordClient extends ListenerAdapter
if(DiscordWhitelister.removeUnnecessaryMessages)
{
RemoveMessageAfterSeconds(messageReceivedEvent, DiscordWhitelister.removeMessageWaitTime);
}
if(MainConfig.getMainConfig().getBoolean("show-warning-in-command-channel"))
// Warn if enabled
if(MainConfig.getMainConfig().getBoolean("show-warning-in-command-channel"))
{
if(!DiscordWhitelister.useCustomMessages)
{
if(!DiscordWhitelister.useCustomMessages)
{
MessageEmbed messageEmbed = CreateEmbeddedMessage("This Channel is for Commands Only", (author.getAsMention() + ", this channel is for commands only, please use another channel."),
EmbedMessageType.FAILURE).build();
QueueAndRemoveAfterSeconds(channel, messageEmbed);
}
else
{
String customTitle = DiscordWhitelister.getCustomMessagesConfig().getString("command-channel-title");
MessageEmbed messageEmbed = CreateEmbeddedMessage("This Channel is for Commands Only", (author.getAsMention() + ", this channel is for commands only, please use another channel."),
EmbedMessageType.FAILURE).build();
QueueAndRemoveAfterSeconds(channel, messageEmbed);
}
else
{
String customTitle = DiscordWhitelister.getCustomMessagesConfig().getString("command-channel-title");
String customMessage = DiscordWhitelister.getCustomMessagesConfig().getString("command-channel-message");
customMessage = customMessage.replaceAll("\\{Sender}", author.getAsMention());
String customMessage = DiscordWhitelister.getCustomMessagesConfig().getString("command-channel-message");
customMessage = customMessage.replaceAll("\\{Sender}", author.getAsMention());
MessageEmbed messageEmbed = DiscordClient.CreateEmbeddedMessage(customTitle, customMessage, DiscordClient.EmbedMessageType.FAILURE).build();
QueueAndRemoveAfterSeconds(channel, messageEmbed);
}
MessageEmbed messageEmbed = DiscordClient.CreateEmbeddedMessage(customTitle, customMessage, DiscordClient.EmbedMessageType.FAILURE).build();
QueueAndRemoveAfterSeconds(channel, messageEmbed);
}
}
}
@ -1438,28 +1439,6 @@ public class DiscordClient extends ListenerAdapter
removeTimerThread.start();
}
// public static void SendAndRemoveMessagesAfterSeconds(MessageReceivedEvent messageReceivedEvent, List<Object> messages, Integer timeToWait)
// {
// TextChannel textChannel = messageReceivedEvent.getTextChannel();
//
// for (Object o : messages)
// {
// // Only Remove supplied Messages
// if(o instanceof Message)
// {
// if(DiscordWhitelister.removeUnnecessaryMessages)
// RemoveMessageAfterSeconds(messageReceivedEvent, DiscordWhitelister.removeMessageWaitTime);
// }
// else if(o instanceof MessageEmbed)
// {
// if(DiscordWhitelister.removeUnnecessaryMessages)
// textChannel.sendMessage((MessageEmbed) o).queue(message -> message.delete().queueAfter(timeToWait, TimeUnit.SECONDS));
// else
// textChannel.sendMessage((MessageEmbed) o).queue();
// }
// }
// }
public static void QueueAndRemoveAfterSeconds(TextChannel textChannel, MessageEmbed messageEmbed)
{
if(DiscordWhitelister.removeUnnecessaryMessages)