feat(mute): add online-only temp mutes with pause/resume on disconnect (#1029)

Adds `-o` flag to `/tempmute` that pauses the mute timer when the player
goes offline and resumes when they reconnect. Includes race condition
fixes for cross-server sync and expiry handling.

fixes #934

Author: confuser

common/src/main/java/me/confuser/banmanager/common/commands/CommandParser.java

@@ -26,6 +26,10 @@ public class CommandParser {
   @Getter
   private boolean soft = false;
 
+  @Argument(alias = "o")
+  @Getter
+  private boolean onlineOnly = false;
+
   @Getter
   private Reason reason;
 

common/src/main/java/me/confuser/banmanager/common/commands/InfoCommand.java

@@ -541,7 +541,13 @@ public void playerInfo(CommonSender sender, String name, Integer index, InfoComm
 
         Message message;
 
-        if (mute.getExpires() == 0) {
+        if (mute.isOnlineOnly() && mute.isPaused()) {
+          message = Message.get("info.mute.temporaryOnlinePaused");
+          message.set("remaining", DateUtils.formatDifference(mute.getPausedRemaining()));
+        } else if (mute.isOnlineOnly() && mute.getExpires() > 0) {
+          message = Message.get("info.mute.temporaryOnline");
+          message.set("expires", DateUtils.getDifferenceFormat(mute.getExpires()));
+        } else if (mute.getExpires() == 0) {
           message = Message.get("info.mute.permanent");
         } else {
           message = Message.get("info.mute.temporary");

common/src/main/java/me/confuser/banmanager/common/commands/TempMuteCommand.java

@@ -34,6 +34,13 @@ public boolean onCommand(final CommonSender sender, CommandParser parser) {
       return true;
     }
 
+    final boolean isOnlineOnly = parser.isOnlineOnly();
+
+    if (isOnlineOnly && !sender.hasPermission(getPermission() + ".online")) {
+      sender.sendMessage(Message.getString("sender.error.noPermission"));
+      return true;
+    }
+
     if (parser.args.length < 3) {
       return false;
     }
@@ -158,7 +165,17 @@ public boolean onCommand(final CommonSender sender, CommandParser parser) {
         }
       }
 
-      PlayerMuteData mute = new PlayerMuteData(player, actor, reason.getMessage(), isSilent, isSoft, expires);
+      PlayerMuteData mute;
+      long now = System.currentTimeMillis() / 1000L;
+      long durationSeconds = expires - now;
+
+      if (isOnlineOnly && onlinePlayer == null) {
+        mute = new PlayerMuteData(player, actor, reason.getMessage(), isSilent, isSoft, 0, true);
+        mute.setPausedRemaining(durationSeconds);
+      } else {
+        mute = new PlayerMuteData(player, actor, reason.getMessage(), isSilent, isSoft, expires, isOnlineOnly);
+      }
+
       boolean created;
 
       try {
@@ -179,14 +196,20 @@ public boolean onCommand(final CommonSender sender, CommandParser parser) {
 
       if (isSoft || onlinePlayer1 == null) return;
 
-      Message muteMessage = Message.get("tempmute.player.disallowed")
+      String messageKey = isOnlineOnly ? "tempmute.player.disallowedOnline" : "tempmute.player.disallowed";
+      Message muteMessage = Message.get(messageKey)
                                    .set("displayName", onlinePlayer1.getDisplayName())
                                    .set("player", player.getName())
                                    .set("playerId", player.getUUID().toString())
                                    .set("reason", mute.getReason())
                                    .set("actor", actor.getName())
-                                   .set("id", mute.getId())
-                                   .set("expires", DateUtils.getDifferenceFormat(mute.getExpires()));
+                                   .set("id", mute.getId());
+
+      if (mute.isPaused()) {
+        muteMessage.set("expires", DateUtils.formatDifference(mute.getPausedRemaining()));
+      } else {
+        muteMessage.set("expires", DateUtils.getDifferenceFormat(mute.getExpires()));
+      }
 
       onlinePlayer1.sendMessage(muteMessage.toString());
 

common/src/main/java/me/confuser/banmanager/common/data/PlayerMuteData.java

@@ -41,6 +41,14 @@ public class PlayerMuteData {
   @Getter
   private boolean silent = false;
 
+  @DatabaseField
+  @Getter
+  private boolean onlineOnly = false;
+
+  @DatabaseField(columnDefinition = "BIGINT UNSIGNED NOT NULL DEFAULT 0")
+  @Getter
+  private long pausedRemaining = 0;
+
   PlayerMuteData() {
 
   }
@@ -59,6 +67,12 @@ public PlayerMuteData(PlayerData player, PlayerData actor, String reason, boolea
     this.expires = expires;
   }
 
+  public PlayerMuteData(PlayerData player, PlayerData actor, String reason, boolean silent, boolean soft, long expires, boolean onlineOnly) {
+    this(player, actor, reason, silent, soft, expires);
+
+    this.onlineOnly = onlineOnly;
+  }
+
   // Only use for imports!
   public PlayerMuteData(PlayerData player, PlayerData actor, String reason, boolean silent, boolean soft, long expires, long created) {
     this(player, actor, reason, silent, soft, expires);
@@ -73,19 +87,45 @@ public PlayerMuteData(int id, PlayerData player, PlayerData actor, String reason
     this.updated = updated;
   }
 
+  public PlayerMuteData(int id, PlayerData player, PlayerData actor, String reason, boolean silent, boolean soft, long expires, long created, long updated, boolean onlineOnly, long pausedRemaining) {
+    this(id, player, actor, reason, silent, soft, expires, created, updated);
+
+    this.onlineOnly = onlineOnly;
+    this.pausedRemaining = pausedRemaining;
+  }
+
   public PlayerMuteData(PlayerMuteRecord record) {
     this(record.getPlayer(), record.getPastActor(), record.getReason(), record.isSilent(), record.isSoft(), record.getExpired(), record.getPastCreated());
+    if (record.isOnlineOnly() && record.getRemainingOnlineTime() > 0) {
+      this.onlineOnly = true;
+      this.expires = 0;
+      this.pausedRemaining = record.getRemainingOnlineTime();
+    }
   }
 
   public boolean hasExpired() {
     return getExpires() != 0 && getExpires() <= (System.currentTimeMillis() / 1000L);
   }
 
+  public boolean isPaused() {
+    return onlineOnly && pausedRemaining > 0;
+  }
+
+  public void setExpires(long expires) {
+    this.expires = expires;
+  }
+
+  public void setPausedRemaining(long pausedRemaining) {
+    this.pausedRemaining = pausedRemaining;
+  }
+
   public boolean equalsMute(PlayerMuteData mute) {
     return mute.getReason().equals(this.reason)
             && mute.getExpires() == expires
             && mute.getCreated() == this.created
             && mute.getPlayer().getUUID().equals(this.getPlayer().getUUID())
-            && mute.getActor().getUUID().equals(this.actor.getUUID());
+            && mute.getActor().getUUID().equals(this.actor.getUUID())
+            && mute.isOnlineOnly() == this.onlineOnly
+            && mute.getPausedRemaining() == this.pausedRemaining;
   }
 }

common/src/main/java/me/confuser/banmanager/common/data/PlayerMuteRecord.java

@@ -52,6 +52,14 @@ public class PlayerMuteRecord {
   @Getter
   private boolean silent = false;
 
+  @DatabaseField
+  @Getter
+  private boolean onlineOnly = false;
+
+  @DatabaseField(columnDefinition = "BIGINT UNSIGNED NOT NULL DEFAULT 0")
+  @Getter
+  private long remainingOnlineTime = 0;
+
   PlayerMuteRecord() {
 
   }
@@ -64,6 +72,16 @@ public PlayerMuteRecord(PlayerMuteData mute, PlayerData actor, String reason) {
     createdReason = reason;
     silent = mute.isSilent();
     soft = mute.isSoft();
+    onlineOnly = mute.isOnlineOnly();
+
+    if (mute.isOnlineOnly()) {
+      if (mute.isPaused()) {
+        remainingOnlineTime = mute.getPausedRemaining();
+      } else if (mute.getExpires() > 0) {
+        long now = System.currentTimeMillis() / 1000L;
+        remainingOnlineTime = Math.max(0, mute.getExpires() - now);
+      }
+    }
 
     this.reason = mute.getReason();
     this.actor = actor;
@@ -77,6 +95,16 @@ public PlayerMuteRecord(PlayerMuteData mute, PlayerData actor, long created) {
     pastCreated = mute.getCreated();
     silent = mute.isSilent();
     soft = mute.isSoft();
+    onlineOnly = mute.isOnlineOnly();
+
+    if (mute.isOnlineOnly()) {
+      if (mute.isPaused()) {
+        remainingOnlineTime = mute.getPausedRemaining();
+      } else if (mute.getExpires() > 0) {
+        long now = System.currentTimeMillis() / 1000L;
+        remainingOnlineTime = Math.max(0, mute.getExpires() - now);
+      }
+    }
 
     this.actor = actor;
     this.created = created;

common/src/main/java/me/confuser/banmanager/common/listeners/CommonJoinListener.java

@@ -263,6 +263,16 @@ public void onJoin(final CommonPlayer player) {
       }
 
       UUID id = player.getUniqueId();
+
+      PlayerMuteData mute = plugin.getPlayerMuteStorage().getMute(id);
+      if (mute != null && mute.isOnlineOnly() && mute.isPaused()) {
+        try {
+          plugin.getPlayerMuteStorage().resumeMute(mute);
+        } catch (SQLException e) {
+          e.printStackTrace();
+        }
+      }
+
       CloseableIterator<PlayerNoteData> notesItr = null;
 
       try {

common/src/main/java/me/confuser/banmanager/common/listeners/CommonLeaveListener.java

@@ -2,6 +2,7 @@
 
 import me.confuser.banmanager.common.BanManagerPlugin;
 import me.confuser.banmanager.common.data.PlayerHistoryData;
+import me.confuser.banmanager.common.data.PlayerMuteData;
 
 import java.sql.SQLException;
 import java.util.UUID;
@@ -33,5 +34,21 @@ public void onLeave(UUID id, String name) {
         }
       });
     }
+
+    PlayerMuteData mute = plugin.getPlayerMuteStorage().getMute(id);
+    if (mute != null && mute.isOnlineOnly() && !mute.isPaused() && mute.getExpires() > 0) {
+      long now = System.currentTimeMillis() / 1000L;
+      long remaining = mute.getExpires() - now;
+
+      if (remaining > 0) {
+        plugin.getScheduler().runAsync(() -> {
+          try {
+            plugin.getPlayerMuteStorage().pauseMute(mute, remaining);
+          } catch (SQLException e) {
+            e.printStackTrace();
+          }
+        });
+      }
+    }
   }
 }

common/src/main/java/me/confuser/banmanager/common/listeners/CommonMuteListener.java

@@ -21,9 +21,17 @@ public void notifyOnMute(PlayerMuteData data, boolean silent) {
     String broadcastPermission;
     Message message;
 
-    if (data.getExpires() == 0) {
+    if (data.getExpires() == 0 && !data.isOnlineOnly()) {
       broadcastPermission = "bm.notify.mute";
       message = Message.get("mute.notify");
+    } else if (data.isOnlineOnly()) {
+      broadcastPermission = "bm.notify.tempmute";
+      message = Message.get("tempmute.notifyOnline");
+      if (data.isPaused()) {
+        message.set("expires", DateUtils.formatDifference(data.getPausedRemaining()));
+      } else {
+        message.set("expires", DateUtils.getDifferenceFormat(data.getExpires()));
+      }
     } else {
       broadcastPermission = "bm.notify.tempmute";
       message = Message.get("tempmute.notify");

common/src/main/java/me/confuser/banmanager/common/runnables/ExpiresSync.java

@@ -65,7 +65,7 @@ public void run() {
       while (mutes.hasNext()) {
         PlayerMuteData mute = mutes.next();
 
-        muteStorage.unmute(mute, plugin.getPlayerStorage().getConsole(), "");
+        muteStorage.unmuteIfExpired(mute, plugin.getPlayerStorage().getConsole());
       }
     } catch (SQLException e) {
       e.printStackTrace();

common/src/main/java/me/confuser/banmanager/common/runnables/GlobalMuteSync.java

@@ -86,11 +86,12 @@ private void newUnmutes() {
       while (itr.hasNext()) {
         GlobalPlayerMuteRecordData record = itr.next();
 
-        if (!localMuteStorage.isMuted(record.getUUID())) {
+        PlayerMuteData localMute = localMuteStorage.getMute(record.getUUID());
+        if (localMute == null) {
           continue;
         }
 
-        localMuteStorage.unmute(localMuteStorage.getMute(record.getUUID()), record.getActor(plugin));
+        localMuteStorage.unmute(localMute, record.getActor(plugin));
 
       }
     } catch (SQLException e) {