Merge pull request #623 from tWizT3ddreaMr/FullHistory

FullHistory
DevLeoko · Jul 5, 2023 · df18f2f · df18f2f
2 parents ea1a92b + c63e3ce
commit df18f2f
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 5 deletions.
diff --git a/core/src/main/java/me/leoko/advancedban/manager/PunishmentManager.java b/core/src/main/java/me/leoko/advancedban/manager/PunishmentManager.java
@@ -126,12 +126,24 @@ public void discard(String name) {
      * @return the punishments
      */
     public List<Punishment> getPunishments(String target, PunishmentType put, boolean current) {
+        return getPunishmentsOfTypes(target, put == null ? Arrays.asList(PunishmentType.values()) : Arrays.asList(put), current);
+    }
+
+    /**
+     * Get all punishments which belong to the given uuid or ip.
+     *
+     * @param target  the uuid or ip to search for
+     * @param putList a List of the basic punishment type to search for ({@link PunishmentType#BAN} would also include Tempbans).
+     * @param current if only active punishments should be included.
+     * @return the punishments
+     */
+    public List<Punishment> getPunishmentsOfTypes(String target, List<PunishmentType> putList, boolean current) {
         List<Punishment> ptList = new ArrayList<>();
 
         if (isCached(target)) {
             for (Iterator<Punishment> iterator = (current ? punishments : history).iterator(); iterator.hasNext(); ) {
                 Punishment pt = iterator.next();
-                if ((put == null || put == pt.getType().getBasic()) && pt.getUuid().equals(target)) {
+                if (putList.contains(pt.getType().getBasic()) && pt.getUuid().equals(target)) {
                     if (!current || !pt.isExpired()) {
                         ptList.add(pt);
                     } else {
@@ -144,7 +156,7 @@ public List<Punishment> getPunishments(String target, PunishmentType put, boolea
             try (ResultSet rs = DatabaseManager.get().executeResultStatement(current ? SQLQuery.SELECT_USER_PUNISHMENTS : SQLQuery.SELECT_USER_PUNISHMENTS_HISTORY, target)) {
                 while (rs.next()) {
                     Punishment punishment = getPunishmentFromResultSet(rs);
-                    if ((put == null || put == punishment.getType().getBasic()) && (!current || !punishment.isExpired())) {
+                    if (putList.contains(punishment.getType().getBasic()) && (!current || !punishment.isExpired())) {
                         ptList.add(punishment);
                     }
                 }

diff --git a/core/src/main/java/me/leoko/advancedban/manager/UpdateManager.java b/core/src/main/java/me/leoko/advancedban/manager/UpdateManager.java
@@ -36,6 +36,23 @@ public void setup() {
 
         if (mi.isUnitTesting()) return;
 
+        if(!mi.contains(mi.getConfig(), "FullHistory")){
+            try {
+                FileUtils.writeLines(new File(mi.getDataFolder(), "config.yml"), "UTF8", Arrays.asList(
+                        "# These are the Punishment types that show up when running /history on a player",
+                        "FullHistory:",
+                        "  - \"BAN\"",
+                        "  - \"IP_BAN\"",
+                        "  - \"MUTE\"",
+                        "  - \"WARNING\"",
+                        "  - \"KICK\"",
+                        "  - \"NOTE\""
+                ), true);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
         if (!mi.contains(mi.getMessages(), "UnNote.Usage")) {
             try {
                 addMessage("Check:", "  Note: \"&cNotes &8» &7%COUNT%\"", 1);

diff --git a/core/src/main/java/me/leoko/advancedban/utils/Command.java b/core/src/main/java/me/leoko/advancedban/utils/Command.java
@@ -291,9 +291,15 @@ else if(args.length == 2)
                 else
                     return list();
             }),
-            new ListProcessor(
-                    target -> PunishmentManager.get().getPunishments(target, null, false),
-                    "History", true, true),
+            input -> {
+                MethodInterface mi = Universal.get().getMethods();
+                List<PunishmentType> putList = new ArrayList<>();
+                mi.getStringList(mi.getConfig(),"FullHistory").forEach((typeString -> putList.add(PunishmentType.valueOf(typeString))));
+
+                new ListProcessor(
+                        target -> PunishmentManager.get().getPunishmentsOfTypes(target, putList, false),
+                        "History", true, true).accept(input);
+            },
             "History.Usage",
             "history"),
 

diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
@@ -153,3 +153,12 @@ Friendly Register Commands: false
 
 # If you wish to only disable tab-completion for layouts, check out the Layouts.yml file under "Use Message Layouts" and "Use Time Layouts"
 Use Tab Completion: true
+
+# These are the Punishment types that show up when running /history on a player
+FullHistory:
+  - "BAN"
+  - "IP_BAN"
+  - "MUTE"
+  - "WARNING"
+  - "KICK"
+  - "NOTE"