Finish showing kick message

Author: CodeDoctorDE

app/lib/pages/game/error.dart

@@ -41,24 +41,24 @@ class GameErrorView extends StatelessWidget {
       final link = error.link;
       content = [
         Text(error.message),
-        const SizedBox(height: 4),
+        const SizedBox(height: 8),
         if (link != null)
-          Row(
-            children: [
-              Expanded(
-                  child: TextFormField(
-                initialValue: link,
-                readOnly: true,
-                decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).link,
-                  suffixIcon: IconButton(
-                    icon: const Icon(PhosphorIconsLight.paperPlaneRight),
-                    onPressed: () => launchUrlString(link,
-                        mode: LaunchMode.externalApplication),
-                  ),
+          ConstrainedBox(
+            constraints:
+                const BoxConstraints(maxWidth: LeapBreakpoints.compact),
+            child: TextFormField(
+              initialValue: link,
+              readOnly: true,
+              decoration: InputDecoration(
+                labelText: AppLocalizations.of(context).link,
+                filled: true,
+                suffixIcon: IconButton(
+                  icon: const Icon(PhosphorIconsLight.paperPlaneRight),
+                  onPressed: () => launchUrlString(link,
+                      mode: LaunchMode.externalApplication),
                 ),
-              ))
-            ],
+              ),
+            ),
           )
       ];
     }
@@ -67,12 +67,12 @@ class GameErrorView extends StatelessWidget {
         alignment: Alignment.center,
         children: [
           const DotsBackground(),
-          Card.filled(
+          Card(
             child: Container(
               constraints: const BoxConstraints(
-                maxWidth: LeapBreakpoints.large,
+                maxWidth: LeapBreakpoints.expanded,
               ),
-              padding: const EdgeInsets.all(8.0),
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
               child: SingleChildScrollView(
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
@@ -106,7 +106,7 @@ class GameErrorView extends StatelessWidget {
                         ),
                       ],
                     ),
-                    if (state.error != null) ...[
+                    if (state.error != null && state.error is! KickMessage) ...[
                       const SizedBox(height: 16),
                       Text(state.error.toString()),
                     ],

app/pubspec.lock

@@ -840,8 +840,8 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/networker/networker_socket"
-      ref: dfc9c68412354184f7e92c4c572634748d855948
-      resolved-ref: dfc9c68412354184f7e92c4c572634748d855948
+      ref: "292186c11472eff9a964893b9b7c6027c000fd81"
+      resolved-ref: "292186c11472eff9a964893b9b7c6027c000fd81"
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "1.0.0"

app/pubspec.yaml

@@ -60,7 +60,7 @@ dependencies:
   networker_socket:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs.git
-      ref: dfc9c68412354184f7e92c4c572634748d855948
+      ref: 292186c11472eff9a964893b9b7c6027c000fd81
       path: packages/networker/networker_socket
   swamp_api:
     git:

server/lib/src/programs/kick.dart

@@ -1,4 +1,5 @@
 import 'package:consoler/consoler.dart';
+import 'package:setonix_api/event.dart';
 import 'package:setonix_server/src/server.dart';
 
 class KickProgram extends ConsoleProgram {
@@ -10,19 +11,28 @@ class KickProgram extends ConsoleProgram {
   String getDescription() => "Kick a player";
 
   @override
-  String getUsage() => 'kick <ID>';
+  String getUsage() => 'kick <ID> [<Reason>] [<Link>]';
 
   @override
   void run(String label, List<String> args) {
-    if (args.length != 1) {
+    if (args.isEmpty || args.length > 3) {
       server.log("Wrong usage, use ${getUsage()}", level: LogLevel.error);
     }
     final arg = int.tryParse(args[0]);
     if (arg == null) {
       server.log("ID should be a number", level: LogLevel.error);
       return;
     }
-    final result = server.kick(arg);
+    KickMessage? reason;
+    if (args.length > 1) {
+      final reasonText = args[1];
+      final link = args.length > 2 ? args[2] : null;
+      reason = KickMessage(
+        message: reasonText,
+        link: link,
+      );
+    }
+    final result = server.kick(arg, reason);
     if (result) {
       server.log("$arg successfully kicked.", level: LogLevel.info);
     } else {

server/lib/src/programs/reset.dart

@@ -11,7 +11,7 @@ class ResetProgram extends ConsoleProgram {
       "Reset the world. Specify a game mode to allow playing games.";
 
   @override
-  String getUsage() => 'reset [<World>]';
+  String getUsage() => '[<World>]';
 
   @override
   Future<void> run(String label, List<String> args) async {

server/lib/src/server.dart

@@ -16,6 +16,8 @@ import 'package:setonix_server/src/programs/say.dart';
 import 'package:setonix_server/src/programs/stop.dart';
 import 'package:setonix_plugin/setonix_plugin.dart';
 
+import 'programs/kick.dart';
+
 String limitOutput(Object? value, [int limit = 500]) {
   final string = value.toString();
   if (string.length > limit) {
@@ -166,6 +168,7 @@ final class SetonixServer {
       'players': PlayersProgram(this),
       'say': SayProgram(this),
       'reset': ResetProgram(this),
+      'kick': KickProgram(this),
       null: UnknownProgram(),
     });
   }
@@ -239,10 +242,11 @@ final class SetonixServer {
     _onClientEvent(NetworkerPacket(event, kAuthorityChannel), force: force);
   }
 
-  bool kick(int id) {
+  bool kick(int id, [KickMessage? reason]) {
     final info = _server?.getConnectionInfo(id);
     if (info == null) return false;
-    info.close();
+    info.close(WebSocketStatus.goingAway,
+        reason?.toJson() ?? 'You have been kicked from the server.');
     return true;
   }
 

server/pubspec.lock

@@ -417,8 +417,8 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/networker/networker_socket"
-      ref: c296aa4e7667fad124da675f11ca543c44865a61
-      resolved-ref: c296aa4e7667fad124da675f11ca543c44865a61
+      ref: "292186c11472eff9a964893b9b7c6027c000fd81"
+      resolved-ref: "292186c11472eff9a964893b9b7c6027c000fd81"
       url: "https://github.com/LinwoodDev/dart_pkgs.git"
     source: git
     version: "1.0.0"

server/pubspec.yaml

@@ -18,7 +18,7 @@ dependencies:
   networker_socket:
     git:
       url: https://github.com/LinwoodDev/dart_pkgs.git
-      ref: c296aa4e7667fad124da675f11ca543c44865a61
+      ref: 292186c11472eff9a964893b9b7c6027c000fd81
       path: packages/networker/networker_socket
   consoler:
     git: