diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java index dff4d18..bb6f170 100644 --- a/src/main/java/com/jagrosh/vortex/Vortex.java +++ b/src/main/java/com/jagrosh/vortex/Vortex.java @@ -287,8 +287,10 @@ return false; if(Constants.OWNER_ID.equals(g.getOwnerId())) return false; - int botcount = (int)g.getMemberCache().stream().filter(m -> m.getUser().isBot()).count(); - if(g.getMemberCache().size()-botcount<15 || (botcount>20 && ((double)botcount/g.getMemberCache().size())>0.5)) + int botcount = (int) g.getMemberCache().stream().filter(m -> m.getUser().isBot()).count(); + int totalcount = (int) g.getMemberCache().size(); + int humancount = totalcount - botcount; + if(humancount < 30 || botcount > humancount) { if(database.settings.hasSettings(g)) return false; diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/ExportCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/ExportCmd.java index dc36123..8a6eec5 100644 --- a/src/main/java/com/jagrosh/vortex/commands/tools/ExportCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/tools/ExportCmd.java @@ -58,7 +58,8 @@ .put("tempmutes", db.tempmutes.getAllMutesJson(g)) .put("tempbans", db.tempbans.getAllBansJson(g)) .put("inviteWhitelist", db.inviteWhitelist.getWhitelistJson(g)) - .put("filters", db.filters.getFiltersJson(g)); + .put("filters", db.filters.getFiltersJson(g)) + .put("premium", db.premium.getPremiumInfoJson(g)); event.getChannel().sendFile(obj.toString(1).getBytes(), "vortex_data_" + g.getId() + ".json").queue(); } } diff --git a/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java b/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java index 28b9286..165730e 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java @@ -137,7 +137,7 @@ { List list = readWhitelist(guild); JSONArray arr = new JSONArray(); - list.forEach(id -> list.add(id)); + list.forEach(id -> arr.put(id)); return arr; } diff --git a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java index 2d18900..cf7f780 100644 --- a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java +++ b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java @@ -30,6 +30,7 @@ import java.util.LinkedList; import java.util.List; import net.dv8tion.jda.core.entities.Guild; +import org.json.JSONObject; /** * @@ -72,6 +73,14 @@ }); } + public JSONObject getPremiumInfoJson(Guild guild) + { + PremiumInfo info = getPremiumInfo(guild); + return new JSONObject() + .put("level", info.level.name()) + .put("until", info.until == null ? 0 : info.until.getEpochSecond()); + } + public void addPremiumForever(Guild guild, Level level) { readWrite(selectAll(GUILD_ID.is(guild.getIdLong())), rs ->