Kick user with proper ban message, tweak IP file change debounce time

README.md

@@ -43,6 +43,7 @@ https://user-images.githubusercontent.com/856222/141378688-882082be-9efa-4cfe-81
   - _Lobby: keep client in emulated server with lobby world, teleport to real server when ready ([experimental*](./docs/join-method-lobby.md))_
 - Customizable MOTD and login messages
 - Automatically manages `server.properties` (host, port and RCON settings)
+- Automatically handle banned IPs from server within `lazymc`
 - Graceful server sleep/shutdown through RCON (with `SIGTERM` fallback on Linux/Unix)
 - Restart server on crash
 - Lockout mode

src/service/ban_reload.rs

@@ -11,7 +11,7 @@ use crate::mc::ban;
 use crate::server::Server;
 
 /// File debounce time.
-const WATCH_DEBOUNCE: Duration = Duration::from_secs(1);
+const WATCH_DEBOUNCE: Duration = Duration::from_secs(2);
 
 /// Service to reload banned IPs when its file changes.
 pub fn service(config: Arc<Config>, server: Arc<Server>) {

src/status.rs

@@ -19,6 +19,9 @@ use crate::proto::packet::{self, RawPacket};
 use crate::proto::packets;
 use crate::server::{self, Server};
 
+/// The ban message prefix.
+const BAN_MESSAGE_PREFIX: &str = "Your IP address is banned from this server.\nReason: ";
+
 /// Default ban reason if unknown.
 const DEFAULT_BAN_REASON: &str = "Banned by an operator.";
 
@@ -133,13 +136,19 @@ pub async fn serve(
             // Kick if client is banned
             if let Some(ban) = server.ban_entry(&client.peer.ip()).await {
                 if ban.is_banned() {
-                    if let Some(reason) = ban.reason {
+                    let msg = if let Some(reason) = ban.reason {
                         info!(target: "lazymc", "Login from banned IP {} ({}), disconnecting", client.peer.ip(), &reason);
-                        action::kick(&client, &reason, &mut writer).await?;
+                        reason.to_string()
                     } else {
                         info!(target: "lazymc", "Login from banned IP {}, disconnecting", client.peer.ip());
-                        action::kick(&client, DEFAULT_BAN_REASON, &mut writer).await?;
+                        DEFAULT_BAN_REASON.to_string()
-                    }
+                    };
+                    action::kick(
+                        &client,
+                        &format!("{}{}", BAN_MESSAGE_PREFIX, msg),
+                        &mut writer,
+                    )
+                    .await?;
                     break;
                 }
             }