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:
parent
40250fc1ab
commit
e7f86b8417
|
@ -1054,25 +1054,26 @@ public class DiscordClient extends ListenerAdapter
|
||||||
if(DiscordWhitelister.removeUnnecessaryMessages)
|
if(DiscordWhitelister.removeUnnecessaryMessages)
|
||||||
{
|
{
|
||||||
RemoveMessageAfterSeconds(messageReceivedEvent, DiscordWhitelister.removeMessageWaitTime);
|
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();
|
||||||
MessageEmbed messageEmbed = CreateEmbeddedMessage("This Channel is for Commands Only", (author.getAsMention() + ", this channel is for commands only, please use another channel."),
|
QueueAndRemoveAfterSeconds(channel, messageEmbed);
|
||||||
EmbedMessageType.FAILURE).build();
|
}
|
||||||
QueueAndRemoveAfterSeconds(channel, messageEmbed);
|
else
|
||||||
}
|
{
|
||||||
else
|
String customTitle = DiscordWhitelister.getCustomMessagesConfig().getString("command-channel-title");
|
||||||
{
|
|
||||||
String customTitle = DiscordWhitelister.getCustomMessagesConfig().getString("command-channel-title");
|
|
||||||
|
|
||||||
String customMessage = DiscordWhitelister.getCustomMessagesConfig().getString("command-channel-message");
|
String customMessage = DiscordWhitelister.getCustomMessagesConfig().getString("command-channel-message");
|
||||||
customMessage = customMessage.replaceAll("\\{Sender}", author.getAsMention());
|
customMessage = customMessage.replaceAll("\\{Sender}", author.getAsMention());
|
||||||
|
|
||||||
MessageEmbed messageEmbed = DiscordClient.CreateEmbeddedMessage(customTitle, customMessage, DiscordClient.EmbedMessageType.FAILURE).build();
|
MessageEmbed messageEmbed = DiscordClient.CreateEmbeddedMessage(customTitle, customMessage, DiscordClient.EmbedMessageType.FAILURE).build();
|
||||||
QueueAndRemoveAfterSeconds(channel, messageEmbed);
|
QueueAndRemoveAfterSeconds(channel, messageEmbed);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1438,28 +1439,6 @@ public class DiscordClient extends ListenerAdapter
|
||||||
removeTimerThread.start();
|
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)
|
public static void QueueAndRemoveAfterSeconds(TextChannel textChannel, MessageEmbed messageEmbed)
|
||||||
{
|
{
|
||||||
if(DiscordWhitelister.removeUnnecessaryMessages)
|
if(DiscordWhitelister.removeUnnecessaryMessages)
|
||||||
|
|
Loading…
Reference in New Issue