Merge pull request #283 from TFPatches/development

October 2020 Update

Author: script-head

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2020.9</version>
+    <version>2020.10</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/me/totalfreedom/totalfreedommod/Monitors.java

@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Map;
 import lombok.Getter;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;

src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java

@@ -43,7 +43,7 @@ public void updateAccountStatus(StaffMember staffMember)
             return;
         }
 
-        if (!staffMember.isActive() || staffMember.getRank() != Rank.ADMIN)
+        if (!staffMember.isActive() || staffMember.getRank() != Rank.SENIOR_ADMIN)
         {
             FLog.debug("Disabling ptero acc");
             removeAccountFromServer(id);

src/main/java/me/totalfreedom/totalfreedommod/Reddit.java

@@ -31,7 +31,7 @@ public class Reddit extends FreedomService
     private final String CLIENT_ID = ConfigEntry.REDDIT_CLIENT_ID.getString();
     private final String CLIENT_SECRET = ConfigEntry.REDDIT_CLIENT_SECRET.getString();
 
-    private final UserAgent userAgent = new UserAgent("bot", "me.totalfreedom.reddit", plugin.build.version, USERNAME);
+    private final UserAgent userAgent = new UserAgent("bot", "me.totalfreedom.reddit", TotalFreedomMod.build.version, USERNAME);
     private final Credentials credentials = Credentials.script(USERNAME, PASSWORD, CLIENT_ID, CLIENT_SECRET);
 
     private RedditClient reddit = null;
@@ -202,18 +202,16 @@ public void loadFlairList()
         flairList.put(Title.OWNER, ConfigEntry.REDDIT_SERVER_OWNER_FLAIR_ID.getString());
         flairList.put(Title.EXECUTIVE, ConfigEntry.REDDIT_EXECUTIVE_FLAIR_ID.getString());
         flairList.put(Title.DEVELOPER, ConfigEntry.REDDIT_DEVELOPER_FLAIR_ID.getString());
-        flairList.put(Rank.ADMIN, ConfigEntry.REDDIT_ADMIN_FLAIR_ID.getString());
-        flairList.put(Rank.MOD, ConfigEntry.REDDIT_MOD_FLAIR_ID.getString());
-        flairList.put(Rank.TRIAL_MOD, ConfigEntry.REDDIT_TRIAL_MOD_FLAIR_ID.getString());
+        flairList.put(Rank.SENIOR_ADMIN, ConfigEntry.REDDIT_SENIOR_ADMIN_FLAIR_ID.getString());
+        flairList.put(Rank.ADMIN, ConfigEntry.REDDIT_NEW_ADMIN_FLAIR_ID.getString());
         flairList.put(Title.MASTER_BUILDER, ConfigEntry.REDDIT_MASTER_BUILDER_FLAIR_ID.getString());
 
-        // Work around because the current flair id keeps returning null, either a JRAW bug or a reddit bug
+        // Work around because the current flair ID keeps returning null, either a JRAW bug or a Reddit bug
         flairNameList.put(Title.OWNER, "Server Owner");
         flairNameList.put(Title.EXECUTIVE, "Executive");
         flairNameList.put(Title.DEVELOPER, "Developer");
+        flairNameList.put(Rank.SENIOR_ADMIN, "Senior Admin");
         flairNameList.put(Rank.ADMIN, "Admin");
-        flairNameList.put(Rank.MOD, "Mod");
-        flairNameList.put(Rank.TRIAL_MOD, "Trial Mod");
         flairNameList.put(Title.MASTER_BUILDER, "Master Builder");
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java

@@ -71,6 +71,10 @@ public Ban(String username, UUID uuid, List<String> ips, String by, Date at, Dat
         dedupeIps();
         this.by = by;
         this.at = at;
+        if (expire == null)
+        {
+            expire = FUtil.parseDateOffset("24h");
+        }
         this.expiryUnix = FUtil.getUnixTime(expire);
         this.reason = reason;
     }

src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java

@@ -43,7 +43,7 @@ public static CommandBlockerRank fromSender(CommandSender sender)
         StaffMember staffMember = TotalFreedomMod.plugin().sl.getAdmin(sender);
         if (staffMember != null)
         {
-            if (staffMember.getRank() == Rank.ADMIN)
+            if (staffMember.getRank() == Rank.SENIOR_ADMIN)
             {
                 return SENIOR;
             }

src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java

@@ -83,8 +83,8 @@ public void onTelnetRequestDataTags(TelnetRequestDataTagsEvent event)
                 boolean active = staffMember.isActive();
 
                 isAdmin = active;
-                isSeniorAdmin = active && staffMember.getRank() == Rank.ADMIN;
-                isTelnetAdmin = active && (isSeniorAdmin || staffMember.getRank() == Rank.MOD);
+                isSeniorAdmin = active && staffMember.getRank() == Rank.SENIOR_ADMIN;
+                isTelnetAdmin = active && (isSeniorAdmin || staffMember.getRank() == Rank.ADMIN);
             }
 
             playerTags.put("tfm.admin.isAdmin", isAdmin);

src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java

@@ -28,7 +28,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
             return true;
         }
 
-        checkRank(Rank.TRIAL_MOD);
+        checkRank(Rank.ADMIN);
 
         if (args[0].equals("-a"))
         {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_aeclear.java

@@ -9,7 +9,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.TRIAL_MOD, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
 @CommandParameters(description = "Clears lingering potion area effect clouds.", usage = "/<command>", aliases = "aec")
 public class Command_aeclear extends FreedomCommand
 {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java

@@ -6,7 +6,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.MOD, source = SourceType.BOTH)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
 @CommandParameters(description = "Make an announcement anonymously to operators.", usage = "/<command> <message>")
 public class Command_announce extends FreedomCommand
 {