BetterChat timestamp seconds

closes #3946

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/systems/modules/misc/BetterChat.java

@@ -74,6 +74,15 @@ public class BetterChat extends Module {
         .build()
     );
 
+    private final Setting<Boolean> showSeconds = sgGeneral.add(new BoolSetting.Builder()
+        .name("show-seconds")
+        .description("Shows seconds in the chat message timestamps")
+        .defaultValue(false)
+        .visible(timestamps::get)
+        .onChanged(o -> updateDateFormat())
+        .build()
+    );
+
     private final Setting<Boolean> playerHeads = sgGeneral.add(new BoolSetting.Builder()
         .name("player-heads")
         .description("Displays player heads next to their messages.")
@@ -229,11 +238,10 @@ public class BetterChat extends Module {
 
     private static final Pattern antiSpamRegex = Pattern.compile(" \\(([0-9]{1,9})\\)$");
     private static final Pattern antiClearRegex = Pattern.compile("\\n(\\n|\\s)+\\n");
-    private static final Pattern timestampRegex = Pattern.compile("^(<[0-9]{2}:[0-9]{2}>\\s)");
+    private static final Pattern timestampRegex = Pattern.compile("^(<[0-9]{2}:[0-9]{2}(?::[0-9]{2})?> )");
     private static final Pattern usernameRegex = Pattern.compile("^(?:<[0-9]{2}:[0-9]{2}>\\s)?<(.*?)>.*");
 
     private final Char2CharMap SMALL_CAPS = new Char2CharOpenHashMap();
-    private final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
     public final IntList lines = new IntArrayList();
 
     public BetterChat() {
@@ -335,7 +343,7 @@ private Text appendAntiSpam(Text text) {
 
             Matcher timestampMatcher = timestampRegex.matcher(stringToCheck);
             if (timestampMatcher.find()) {
-                stringToCheck = stringToCheck.substring(8);
+                stringToCheck = stringToCheck.substring(timestampMatcher.end());
             }
 
             if (textString.equals(stringToCheck)) {
@@ -481,6 +489,14 @@ private GameProfile getSender(IChatHudLine line, String text) {
         return sender;
     }
 
+    // Timestamps
+
+    private SimpleDateFormat dateFormat;
+
+    private void updateDateFormat() {
+        dateFormat = new SimpleDateFormat(showSeconds.get() ? "HH:mm:ss" : "HH:mm");
+    }
+
     // Annoy
 
     private String applyAnnoy(String message) {