diff --git a/lists/referral_domains.txt b/lists/referral_domains.txt
index 091205d..35ba5f4 100644
--- a/lists/referral_domains.txt
+++ b/lists/referral_domains.txt
@@ -47,6 +47,7 @@
// Referral Sites
wn.nr
featu.re
+pointsprizes.com
// Scams
free-gg.com
diff --git a/lists/safe_domains.txt b/lists/safe_domains.txt
index d9eaff7..1eb09fe 100644
--- a/lists/safe_domains.txt
+++ b/lists/safe_domains.txt
@@ -79,6 +79,7 @@
honeyhunterworld.com
gamespot.com
kiranico.com
+gbatemp.net
// Misc
google.com
diff --git a/pom.xml b/pom.xml
index 559fc7e..3103f4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
net.dv8tion
JDA
- 3.6.0_367
+ 3.6.0_373
com.jagrosh
diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java
index 8c55d40..ee02127 100644
--- a/src/main/java/com/jagrosh/vortex/Vortex.java
+++ b/src/main/java/com/jagrosh/vortex/Vortex.java
@@ -94,7 +94,6 @@
logwebhook = new WebhookClientBuilder(tokens.get(7)).build();
automod = new AutoMod(this);
strikehandler = new StrikeHandler(this);
-
CommandClient client = new CommandClientBuilder()
.setPrefix(Constants.PREFIX)
.setGame(Game.watching("Type "+Constants.PREFIX+"help"))
diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java
index 3e023c0..25d5070 100644
--- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java
+++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java
@@ -20,7 +20,6 @@
import com.jagrosh.vortex.database.managers.AutomodManager;
import com.jagrosh.vortex.database.managers.AutomodManager.AutomodSettings;
import com.jagrosh.vortex.utils.FixedCache;
-import com.jagrosh.vortex.utils.FormatUtil;
import com.jagrosh.vortex.utils.OtherUtil;
import java.time.OffsetDateTime;
import java.time.temporal.ChronoUnit;
@@ -442,7 +441,7 @@
List links = new LinkedList<>();
Matcher m = LINK.matcher(message.getContentRaw());
while(m.find())
- links.add(m.group());
+ links.add(m.group().endsWith(">") ? m.group().substring(0,m.group().length()-1) : m.group());
if(!links.isEmpty())
vortex.getThreadpool().execute(() ->
{
@@ -511,7 +510,14 @@
{
StringBuilder sb = new StringBuilder(m.getContentRaw());
m.getAttachments().forEach(at -> sb.append("\n").append(at.getFileName()));
- return sb.toString().trim().replaceAll(CONDENSER, "$1");
+ try
+ {
+ return sb.toString().trim().replaceAll(CONDENSER, "$1");
+ }
+ catch(Exception ex)
+ {
+ return sb.toString().trim();
+ }
}
private static OffsetDateTime latestTime(Message m)
diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java
index 8e71791..2976e3c 100644
--- a/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/moderation/CleanCmd.java
@@ -70,6 +70,8 @@
this.help = "cleans messages matching filters";
this.botPermissions = new Permission[]{Permission.MESSAGE_MANAGE, Permission.MESSAGE_HISTORY};
this.guildOnly = true;
+ this.cooldown = 10;
+ this.cooldownScope = CooldownScope.CHANNEL;
}
@Override
@@ -129,7 +131,10 @@
num=100;
}
if(num>1000 || num<2)
+ {
+ event.getClient().applyCooldown(getCooldownKey(event), 1);
throw new CommandErrorException("Number of messages must be between 2 and 1000");
+ }
int val2 = num+1;
String p = pattern;
@@ -184,6 +189,7 @@
if(del.isEmpty())
{
event.replyWarning("There were no messages to clean!"+(week2?week2limit:""));
+ event.getClient().applyCooldown(getCooldownKey(event), 1);
return;
}
try{
@@ -202,9 +208,11 @@
}catch(Exception e)
{
event.replyError("Failed to delete "+del.size()+" messages.");
+ event.getClient().applyCooldown(getCooldownKey(event), 1);
return;
}
event.replySuccess("Cleaned **"+del.size()+"** messages."+(week2?week2limit:""));
+ event.getClient().applyCooldown(getCooldownKey(event), 1);
if(vortex.getDatabase().settings.getSettings(event.getGuild()).getModLogChannel(event.getGuild())==null)
return;
final String params;