feat: Added "log" option for audience kicks

xpdustry · Nov 14, 2024 · cc42946 · cc42946
1 parent 8560806
commit cc42946
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 10 deletions.
diff --git a/distributor-common-api/src/main/java/com/xpdustry/distributor/api/audience/Audience.java b/distributor-common-api/src/main/java/com/xpdustry/distributor/api/audience/Audience.java
@@ -147,15 +147,37 @@ default void showLabel(final Component label, final float x, final float y, fina
      * @param reason   the reason
      * @param duration the duration
      */
-    default void kick(final Component reason, final Duration duration) {}
+    default void kick(final Component reason, final Duration duration) {
+        kick(reason, duration, true);
+    }
+
+    /**
+     * Kicks this audience from the server.
+     *
+     * @param reason   the reason
+     * @param duration the duration
+     * @param log      whether the kick should be logged
+     */
+    default void kick(final Component reason, final Duration duration, final boolean log) {}
+
+    /**
+     * Kicks this audience from the server.
+     *
+     * @param reason   the reason
+     * @param duration the duration
+     */
+    default void kick(final Packets.KickReason reason, final Duration duration) {
+        kick(reason, duration, true);
+    }
 
     /**
      * Kicks this audience from the server.
      *
      * @param reason   the reason
      * @param duration the duration
+     * @param log      whether the kick should be logged
      */
-    default void kick(final Packets.KickReason reason, final Duration duration) {}
+    default void kick(final Packets.KickReason reason, final Duration duration, final boolean log) {}
 
     /**
      * Returns the metadata of this audience.

diff --git a/...or-common-api/src/main/java/com/xpdustry/distributor/api/audience/ForwardingAudience.java b/...or-common-api/src/main/java/com/xpdustry/distributor/api/audience/ForwardingAudience.java
@@ -118,16 +118,16 @@ default void showLabel(final Component label, final float x, final float y, fina
     }
 
     @Override
-    default void kick(final Component reason, final Duration duration) {
+    default void kick(final Component reason, final Duration duration, final boolean log) {
         for (final var audience : getAudiences()) {
-            audience.kick(reason, duration);
+            audience.kick(reason, duration, log);
         }
     }
 
     @Override
-    default void kick(final Packets.KickReason reason, final Duration duration) {
+    default void kick(final Packets.KickReason reason, final Duration duration, final boolean log) {
         for (final var audience : getAudiences()) {
-            audience.kick(reason, duration);
+            audience.kick(reason, duration, log);
         }
     }
 }
diff --git a/...mon/src/main/java/com/xpdustry/distributor/common/audience/BaseNetConnectionAudience.java b/...mon/src/main/java/com/xpdustry/distributor/common/audience/BaseNetConnectionAudience.java
@@ -18,15 +18,20 @@
  */
 package com.xpdustry.distributor.common.audience;
 
+import arc.Core;
 import com.xpdustry.distributor.api.audience.Audience;
 import com.xpdustry.distributor.api.audience.PlayerAudience;
 import com.xpdustry.distributor.api.component.Component;
 import com.xpdustry.distributor.api.component.render.ComponentStringBuilder;
 import java.net.URI;
 import java.time.Duration;
+import mindustry.Vars;
 import mindustry.gen.Call;
 import mindustry.net.NetConnection;
 import mindustry.net.Packets;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 
 public class BaseNetConnectionAudience implements Audience {
 
@@ -86,13 +91,46 @@ public void showLabel(final Component label, final float x, final float y, final
     }
 
     @Override
-    public void kick(final Component reason, final Duration duration) {
-        this.connection.kick(render(reason), duration.toMillis());
+    public void kick(final Component reason, final Duration duration, final boolean log) {
+        this.kick(Packets.KickReason.kick, render(reason).replace('\n', ' '), duration.toMillis(), log);
     }
 
     @Override
-    public void kick(final Packets.KickReason reason, final Duration duration) {
-        this.connection.kick(reason, duration.toMillis());
+    public void kick(final Packets.KickReason reason, final Duration duration, final boolean log) {
+        this.kick(reason, reason.name(), duration.toMillis(), log);
+    }
+
+    private void kick(
+            final Packets.@Nullable KickReason reason, final String details, final long duration, final boolean log) {
+        if (this.connection.kicked) return;
+
+        LoggerFactory.getLogger("ROOT")
+                .atLevel(log ? Level.INFO : Level.DEBUG)
+                .setMessage("Kicking connection {} / {}; Reason: {}")
+                .addArgument(this.connection.address)
+                .addArgument(this.connection.uuid)
+                .addArgument(details)
+                .log();
+
+        if (duration > 0) {
+            Vars.netServer.admins.handleKicked(this.connection.uuid, this.connection.address, duration);
+        }
+
+        if (reason != null) {
+            Call.kick(this.connection, reason);
+        } else {
+            Call.kick(this.connection, details);
+        }
+
+        if (this.connection.uuid.startsWith("steam:")) {
+            // run with a 2-frame delay so there is time to send the kick packet, steam handles this weirdly
+            Core.app.post(() -> Core.app.post(this.connection::close));
+        } else {
+            this.connection.close();
+        }
+
+        Vars.netServer.admins.save();
+        this.connection.kicked = true;
     }
 
     protected String render(final Component component) {