diff --git a/pom.xml b/pom.xml index 0845923..2cd02ef 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ net.dv8tion JDA - 3.6.0_375 + 3.6.0_376 com.jagrosh diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java index 576db8b..f2db7ca 100644 --- a/src/main/java/com/jagrosh/vortex/Vortex.java +++ b/src/main/java/com/jagrosh/vortex/Vortex.java @@ -267,7 +267,7 @@ if(!g.isAvailable()) return false; int botcount = (int)g.getMembers().stream().filter(m -> m.getUser().isBot()).count(); - if(g.getMembers().size()-botcount<5 || (botcount>20 && ((double)botcount/g.getMembers().size())>0.65)) + if(g.getMembers().size()-botcount<7 || (botcount>20 && ((double)botcount/g.getMembers().size())>0.65)) { if(database.settings.hasSettings(g)) return false; diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java index 25d5070..458fb64 100644 --- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java +++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java @@ -120,7 +120,7 @@ boolean inRaidMode = vortex.getDatabase().settings.getSettings(event.getGuild()).isInRaidMode(); AutomodSettings ams = vortex.getDatabase().automod.getSettings(event.getGuild()); - OffsetDateTime now = event.getMember().getJoinDate(); + OffsetDateTime now = OffsetDateTime.now(); boolean kicking = false; // if we're in raid mode... diff --git a/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java index eb47ed4..d4bd877 100644 --- a/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java @@ -18,7 +18,6 @@ import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.vortex.utils.FormatUtil; -import com.jagrosh.vortex.utils.OtherUtil; import java.time.format.DateTimeFormatter; import net.dv8tion.jda.core.EmbedBuilder; import net.dv8tion.jda.core.MessageBuilder; @@ -57,7 +56,7 @@ } String str = linestart+"ID: **"+guild.getId()+"**\n" +linestart+"Owner: "+FormatUtil.formatUser(guild.getOwner().getUser())+"\n" - +linestart+"Location: "+OtherUtil.regionToFlag(guild.getRegion())+" **"+guild.getRegion().getName()+"**\n" + +linestart+"Location: "+guild.getRegion().getEmoji()+" **"+guild.getRegion().getName()+"**\n" +linestart+"Creation: **"+guild.getCreationTime().format(DateTimeFormatter.RFC_1123_DATE_TIME)+"**\n" +linestart+"Users: **"+guild.getMembers().size()+"** ("+onlineCount+" online, "+botCount+" bots)\n" +linestart+"Channels: **"+guild.getTextChannels().size()+"** Text, **"+guild.getVoiceChannels().size()+"** Voice\n" diff --git a/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java b/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java index 93924d0..a2b8e52 100644 --- a/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java +++ b/src/main/java/com/jagrosh/vortex/utils/OtherUtil.java @@ -123,40 +123,4 @@ return new String[0]; } } - - public static String regionToFlag(Region region) - { - switch(region) - { - case AMSTERDAM: return "\uD83C\uDDF3\uD83C\uDDF1"; - case BRAZIL: return "\uD83C\uDDE7\uD83C\uDDF7"; - case EU_CENTRAL: return "\uD83C\uDDEA\uD83C\uDDFA"; - case EU_WEST: return "\uD83C\uDDEA\uD83C\uDDFA"; - case FRANKFURT: return "\uD83C\uDDE9\uD83C\uDDEA"; - case HONG_KONG: return "\uD83C\uDDED\uD83C\uDDF0"; - case JAPAN: return "\uD83C\uDDEF\uD83C\uDDF5"; - case LONDON: return "\uD83C\uDDEC\uD83C\uDDE7"; - case RUSSIA: return "\uD83C\uDDF7\uD83C\uDDFA"; - case SINGAPORE: return "\uD83C\uDDF8\uD83C\uDDEC"; - case SYDNEY: return "\uD83C\uDDE6\uD83C\uDDFA"; - case US_CENTRAL: return "\uD83C\uDDFA\uD83C\uDDF8"; - case US_EAST: return "\uD83C\uDDFA\uD83C\uDDF8"; - case US_SOUTH: return "\uD83C\uDDFA\uD83C\uDDF8"; - case US_WEST: return "\uD83C\uDDFA\uD83C\uDDF8"; - case VIP_AMSTERDAM: return "\uD83C\uDDF3\uD83C\uDDF1"; - case VIP_BRAZIL: return "\uD83C\uDDE7\uD83C\uDDF7"; - case VIP_EU_CENTRAL: return "\uD83C\uDDEA\uD83C\uDDFA"; - case VIP_EU_WEST: return "\uD83C\uDDEA\uD83C\uDDFA"; - case VIP_FRANKFURT: return "\uD83C\uDDE9\uD83C\uDDEA"; - case VIP_JAPAN: return "\uD83C\uDDEF\uD83C\uDDF5"; - case VIP_LONDON: return "\uD83C\uDDEC\uD83C\uDDE7"; - case VIP_SINGAPORE: return "\uD83C\uDDF8\uD83C\uDDEC"; - case VIP_SYDNEY: return "\uD83C\uDDE6\uD83C\uDDFA"; - case VIP_US_CENTRAL: return "\uD83C\uDDFA\uD83C\uDDF8"; - case VIP_US_EAST: return "\uD83C\uDDFA\uD83C\uDDF8"; - case VIP_US_SOUTH: return "\uD83C\uDDFA\uD83C\uDDF8"; - case VIP_US_WEST: return "\uD83C\uDDFA\uD83C\uDDF8"; - case UNKNOWN: default: return "\uD83C\uDFF3"; - } - } }