Skip to content

Add cleanup bypass permission #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add cleanup bypass permission #423

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88213ba
Add cleanup bypass permission
Rubenicos Aug 8, 2024
6104a41
Add count argument to cleanup command
Rubenicos Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions src/main/java/dev/espi/protectionstones/commands/ArgAdminCleanup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import dev.espi.protectionstones.PSRegion;
import dev.espi.protectionstones.ProtectionStones;
import dev.espi.protectionstones.utils.WGUtils;
import net.luckperms.api.node.matcher.NodeMatcher;
import net.luckperms.api.node.types.PermissionNode;
import org.bukkit.*;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
Expand All @@ -31,6 +33,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.ExecutionException;

class ArgAdminCleanup {

Expand All @@ -39,12 +42,12 @@ class ArgAdminCleanup {

// /ps admin cleanup [remove/preview]
static boolean argumentAdminCleanup(CommandSender p, String[] preParseArgs) {
if (preParseArgs.length < 3 || !Arrays.asList("remove", "preview").contains(preParseArgs[2].toLowerCase())) {
if (preParseArgs.length < 3 || !Arrays.asList("remove", "preview", "count").contains(preParseArgs[2].toLowerCase())) {
PSL.msg(p, ArgAdmin.getCleanupHelp());
return true;
}

String cleanupOperation = preParseArgs[2].toLowerCase(); // [remove|preview]
String cleanupOperation = preParseArgs[2].toLowerCase(); // [remove|preview|count]

World w;
String alias = null;
Expand Down Expand Up @@ -100,8 +103,24 @@ static boolean argumentAdminCleanup(CommandSender p, String[] preParseArgs) {

HashSet<UUID> activePlayers = new HashSet<>();

// loop over offline players and add to list if they haven't joined recently
for (OfflinePlayer op : Bukkit.getServer().getOfflinePlayers()) {
int bypassCount = 0;

// loop over all luckperms players and add to list if they have bypass permission
if (ProtectionStones.getInstance().isLuckPermsSupportEnabled()) {
try {
activePlayers.addAll(ProtectionStones.getInstance().getLuckPerms()
.getUserManager()
.searchAll(NodeMatcher.key("protectionstones.cleanup.bypass")).thenApply(Map::keySet).get());

bypassCount = activePlayers.size();
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
}

// loop over offline players and add to list if they haven't joined recently}
final OfflinePlayer[] players = Bukkit.getServer().getOfflinePlayers();
for (OfflinePlayer op : players) {
long lastPlayed = (System.currentTimeMillis() - op.getLastPlayed()) / 86400000L;
try {
// a player is active if they have joined within the days
Expand Down Expand Up @@ -137,6 +156,20 @@ static boolean argumentAdminCleanup(CommandSender p, String[] preParseArgs) {
}
}

if (cleanupOperation.equalsIgnoreCase("count")) {
p.sendMessage(ChatColor.GOLD + "PLAYERS");
p.sendMessage(ChatColor.GOLD + "| " + ChatColor.YELLOW + "Bypass: " + ChatColor.WHITE + bypassCount);
p.sendMessage(ChatColor.GOLD + "| " + ChatColor.YELLOW + "Active: " + ChatColor.WHITE + (activePlayers.size() - bypassCount));
p.sendMessage(ChatColor.GOLD + "| " + ChatColor.YELLOW + "Inactive: " + ChatColor.WHITE + (players.length - activePlayers.size()));
p.sendMessage(ChatColor.GOLD + "|_" + ChatColor.YELLOW + "Total: " + ChatColor.WHITE + players.length);
p.sendMessage(" ");
p.sendMessage(ChatColor.GOLD + "REGIONS");
p.sendMessage(ChatColor.GOLD + "| " + ChatColor.YELLOW + "Active: " + ChatColor.WHITE + (regions.size() - toDelete.size()));
p.sendMessage(ChatColor.GOLD + "| " + ChatColor.YELLOW + "Inactive: " + ChatColor.WHITE + toDelete.size());
p.sendMessage(ChatColor.GOLD + "|_" + ChatColor.YELLOW + "Total: " + ChatColor.WHITE + regions.size());
return;
}

// start recursive iteration to delete a region each tick
Iterator<PSRegion> deleteRegionsIterator = toDelete.iterator();
regionLoop(deleteRegionsIterator, p, cleanupOperation.equalsIgnoreCase("remove"));
Expand Down