fix multiple name change in log bug

update url resolver

lists/referral_domains.txt

@@ -1,147 +1,149 @@
-// Referral Domain List
-// This list contains referral sites
-
-// IP Loggers
-2no.co
-blasze.com
-blasze.tk
-gotyouripboi.com
-iplogger.com
-iplogger.org
-iplogger.ru
-ps3cfw.com
-yip.su
-
-// Grabify (IP Loggers)
-bmwforum.co
-bucks.as
-cyberh1.xyz
-discörd.com
-disçordapp.com
-fortnight.space
-fortnitechat.site
-freegiftcards.co
-grabify.link
-joinmy.site
-leancoding.co
-minecräft.com
-quickmessage.us
-särahah.eu
-särahah.pl
-shört.co
-spötify.com
-spottyfly.com
-starbucks.bio
-starbucksisbadforyou.com
-starbucksiswrong.com
-stopify.co
-xda-developers.us
-youshouldclick.us
-yoütu.be
-yoütübe.co
-yoütübe.com
-youtubeshort.watch
-
-// Ad sites
-adblade.com
-adcash.com
-adcell.de
-adexchangecloud.com
-adf.ly
-adfoc.us
-adforce.com
-bc.vc
-bitl.cc
-btcclicks.com
-ceesty.com
-cur.lv
-fastclick.com
-getcryptotab.com
-gmads.net
-l2s.pet
-linkbucks.com
-linkshrink.net
-miniurl.pw
-nitroclicks.com
-ouo.io
-pay-ads.com
-petty.link
-pnd.tl
-restorecosm.bid
-sh.st
-short.es
-shorte.st
-shrtz.me
-udmoney.club
-uii.io
-ur-l.me
-vivads.net
-xponsor.com
-zeusclicks.com
-zipansion.com
-
-// Referral Sites
-black-friday.ga
-boost.ink
-easycommerce.cf
-featu.re
-free.gg
-justdoit.cards
-makeprogress.ga
-pointsprizes.com
-referralpay.co
-selly.gg
-shoppy.gg
-weeklyjob.online
-wn.nr
-
-// NSFW Spam Sites
-nakedphotos.club
-privatepage.vip
-viewc.site
-
-// Coin Miners
-baymack.com
-btconline.io
-btcpool.io
-freebitco.in
-minero.cc
-outbuck.com
-
-// Scams
-amazingsexdating.com
-easter-event.com
-ezrobux.gg
-fortnite.cards
-fortnite.events
-fortnite-christmas.com
-fortnite-gifts.com
-fortnite-giveaway.com
-fortnite-special.com
-fortnite-vbuck.com
-fortnite-vbucks.de
-fortnite-vbucks.net
-fortnitevb.com
-free-gg.com
-free-steam-code.com
-giveawaybot.pw
-libra-sale.io
-myetherermwallet.com
-oprewards.com
-rbxfree.com
-roblox-christmas.com
-robloxsummer.com
-steam-event.com
-steam-gift-codes.com
-steam-money.org
-steam-wallet-rewards.com
-steampromote.com
-steamquests.com
-steamreward.com
-steamspecial.com
-steamsummer.com
-streamcommunnitly.com
-whatsappx.com
-
-// Deceptive Unicode Links
-getlⅰbra.tech
+// Referral Domain List
+// This list contains referral sites
+
+// IP Loggers
+2no.co
+blasze.com
+blasze.tk
+gotyouripboi.com
+iplogger.com
+iplogger.org
+iplogger.ru
+ps3cfw.com
+yip.su
+
+// Grabify (IP Loggers)
+bmwforum.co
+bucks.as
+cyberh1.xyz
+discörd.com
+disçordapp.com
+fortnight.space
+fortnitechat.site
+freegiftcards.co
+grabify.link
+joinmy.site
+leancoding.co
+minecräft.com
+quickmessage.us
+särahah.eu
+särahah.pl
+shört.co
+spötify.com
+spottyfly.com
+starbucks.bio
+starbucksisbadforyou.com
+starbucksiswrong.com
+stopify.co
+xda-developers.us
+youshouldclick.us
+yoütu.be
+yoütübe.co
+yoütübe.com
+youtubeshort.watch
+
+// Ad sites
+adblade.com
+adcash.com
+adcell.de
+adexchangecloud.com
+adf.ly
+adfoc.us
+adforce.com
+bc.vc
+bitl.cc
+btcclicks.com
+ceesty.com
+cur.lv
+fastclick.com
+getcryptotab.com
+gmads.net
+l2s.pet
+linkbucks.com
+linkshrink.net
+miniurl.pw
+nitroclicks.com
+ouo.io
+pay-ads.com
+petty.link
+pnd.tl
+restorecosm.bid
+sh.st
+short.es
+shorte.st
+shrtz.me
+udmoney.club
+uii.io
+ur-l.me
+vivads.net
+xponsor.com
+zeusclicks.com
+zipansion.com
+
+// Referral Sites
+black-friday.ga
+boost.ink
+easycommerce.cf
+featu.re
+free.gg
+justdoit.cards
+makeprogress.ga
+pointsprizes.com
+referralpay.co
+selly.gg
+shoppy.gg
+weeklyjob.online
+wn.nr
+
+// NSFW Spam Sites
+nakedphotos.club
+privatepage.vip
+viewc.site
+
+// Coin Miners
+baymack.com
+btconline.io
+btcpool.io
+freebitco.in
+minero.cc
+outbuck.com
+
+// Scams
+amazingsexdating.com
+csgocyber.ru
+easter-event.com
+ezrobux.gg
+fortnite.cards
+fortnite.events
+fortnite-christmas.com
+fortnite-gifts.com
+fortnite-giveaway.com
+fortnite-special.com
+fortnite-vbuck.com
+fortnite-vbucks.de
+fortnite-vbucks.net
+fortnitevb.com
+free-gg.com
+free-steam-code.com
+giveawaybot.pw
+libra-sale.io
+myetherermwallet.com
+oprewards.com
+rbxfree.com
+roblox-christmas.com
+robloxsummer.com
+steam-event.com
+steam-gift-codes.com
+steam-money.org
+steam-wallet-rewards.com
+steampromote.com
+steamquests.com
+steamreward.com
+steamspecial.com
+steamsummer.com
+streamcommunnitly.com
+streancommunuty.ru
+whatsappx.com
+
+// Deceptive Unicode Links
+getlⅰbra.tech

src/main/java/com/jagrosh/vortex/automod/URLResolver.java

@@ -73,9 +73,10 @@ public synchronized List<String> findRedirects(String url)
                 return cache.get(url);
             try
             {
-                List<String> resolved = resolve(client
-                        .newCall(request.post(new FormBody.Builder().add(form, url).build()).build())
-                        .execute().body().string());
+                String resp = client
+                        .newCall(request.post(new FormBody.Builder().add(form, url).add("f", "true").build()).build())
+                        .execute().body().string();
+                List<String> resolved = resolve(resp);
                 cache.put(url, resolved);
                 System.out.println("Link Resolving: "+url+" -> "+resolved);
                 return resolved;
@@ -89,18 +90,16 @@ public synchronized List<String> findRedirects(String url)
         private List<String> resolve(String text)
         {
             List<String> list = new LinkedList<>();
-            boolean skip = true; // first link is always the link we gave
             for(int i=0; i<text.length(); )
             {
                 i = text.indexOf(prefix, i);
                 if(i==-1)
                     break;
                 int first = i + prefix.length();
                 i = text.indexOf(suffix,first);
-                if(skip)
-                    skip = false;
-                else
-                    list.add(text.substring(first,i).trim());
+                String url = text.substring(first,i).trim();
+                if(list.isEmpty() || !list.get(list.size()-1).equals(url))
+                    list.add(url);
             }
             return list;
         }

src/main/java/com/jagrosh/vortex/commands/settings/ServerlogCmd.java

@@ -18,6 +18,7 @@
 import com.jagrosh.jdautilities.command.CommandEvent;
 import com.jagrosh.vortex.Vortex;
 import com.jagrosh.vortex.commands.LogCommand;
+import com.jagrosh.vortex.database.managers.PremiumManager;
 import net.dv8tion.jda.api.entities.TextChannel;
 
 /**
@@ -47,10 +48,15 @@ protected void showCurrentChannel(CommandEvent event)
     @Override
     protected void setLogChannel(CommandEvent event, TextChannel tc)
     {
-        vortex.getDatabase().settings.setServerLogChannel(event.getGuild(), tc);
-        if(tc==null)
-            event.replySuccess("Server Logs will not be sent");
+        if(vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PLUS))
+        {
+            vortex.getDatabase().settings.setServerLogChannel(event.getGuild(), tc);
+            if(tc==null)
+                event.replySuccess("Server Logs will not be sent");
+            else
+                event.replySuccess("Server Logs will now be sent in "+tc.getAsMention());
+        }
         else
-            event.replySuccess("Server Logs will now be sent in "+tc.getAsMention());
+            event.reply(PremiumManager.Level.PLUS.getRequirementMessage());
     }
 }

src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java

@@ -29,6 +29,7 @@
 import java.time.zone.ZoneRulesException;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Guild.VerificationLevel;
 import net.dv8tion.jda.api.entities.MessageEmbed.Field;

src/main/java/com/jagrosh/vortex/logging/BasicLogger.java

@@ -206,11 +206,12 @@ public void logRedirectPath(Message message, String link, List<String> redirects
 
 
     // Server Logs
-
+    // Name change logs need to be handled specially because they are not guild-specific events, but only one
+    // bot (pro vs normal) should ever log them.
     public void logNameChange(UserUpdateNameEvent event)
     {
         OffsetDateTime now = OffsetDateTime.now();
-        event.getUser().getMutualGuilds().stream()
+        vortex.getShardManager().getMutualGuilds(event.getUser().getIdLong()).stream()
             .map(guild -> vortex.getDatabase().settings.getSettings(guild).getServerLogChannel(guild))
             .filter(tc -> tc!=null)
             .forEachOrdered(tc ->
@@ -223,7 +224,7 @@ public void logNameChange(UserUpdateNameEvent event)
     public void logNameChange(UserUpdateDiscriminatorEvent event)
     {
         OffsetDateTime now = OffsetDateTime.now();
-        event.getUser().getMutualGuilds().stream()
+        vortex.getShardManager().getMutualGuilds(event.getUser().getIdLong()).stream()
             .map(guild -> vortex.getDatabase().settings.getSettings(guild).getServerLogChannel(guild))
             .filter(tc -> tc!=null)
             .forEachOrdered(tc ->