Allow referencing user with name and fingerprint

Author: CodeDoctorDE

api/lib/src/services/user.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:collection/collection.dart';
 import 'package:dart_mappable/dart_mappable.dart';
 import 'package:networker/networker.dart';
 import 'package:setonix_api/event.dart';
@@ -34,6 +35,10 @@ abstract class UserService {
   });
 }
 
+const kUserReferenceID = '#';
+const kUserReferenceName = '@';
+const kUserReferenceFingerprint = '*';
+
 final class UserManager {
   final Map<Channel, SetonixUser> _users = {};
   final String guestPrefix;
@@ -121,4 +126,40 @@ final class UserManager {
     _users[channel] = updatedUser;
     return true;
   }
+
+  Future<SetonixUser?> getUserByReference(String reference) async {
+    if (reference.isEmpty) return null;
+    switch (reference[0]) {
+      case kUserReferenceID:
+        final id = reference.substring(1);
+        if (id.isEmpty) return null;
+        final idInt = int.tryParse(id);
+        if (idInt == null) return null;
+        return getUser(idInt);
+      case kUserReferenceName:
+        final name = reference.substring(1);
+        return getUserByName(name);
+      case kUserReferenceFingerprint:
+        final fingerprint = reference.substring(1);
+        return service?.getUser(fingerprint);
+      default:
+        final id = int.tryParse(reference);
+        if (id != null) {
+          return getUser(id);
+        }
+        final user = getUserByName(reference);
+        if (user != null) {
+          return user;
+        }
+        return service?.getUserFromName(reference);
+    }
+  }
+
+  Future<Channel?> getUserIdByReference(String reference) async {
+    final user = await getUserByReference(reference);
+    if (user == null) return null;
+    return _users.entries.firstWhereOrNull((e) => e.value == user)?.key;
+  }
+
+  Iterable<MapEntry<Channel, SetonixUser>> getUsers() => _users.entries;
 }

metadata/en-US/changelogs/8.txt

@@ -1,4 +1,5 @@
 * Upgrade to agb 8.11
+* Allow referencing user with name and fingerprint
 * Fix serverlist route
 
 Read more here: https://linwood.dev/setonix/0.5.1

plugin/rust/Cargo.lock

@@ -11,14 +11,14 @@ class KickProgram extends ConsoleProgram {
   String getDescription() => "Kick a player";
 
   @override
-  String getUsage() => 'kick <ID> [<Reason>] [<Link>]';
+  String getUsage() => 'kick <User> [<Reason>] [<Link>]';
 
   @override
-  void run(String label, List<String> args) {
+  Future<void> run(String label, List<String> args) async {
     if (args.isEmpty || args.length > 3) {
       server.log("Wrong usage, use ${getUsage()}", level: LogLevel.error);
     }
-    final arg = int.tryParse(args[0]);
+    final arg = await server.userManager.getUserIdByReference(args[0]);
     if (arg == null) {
       server.log("ID should be a number", level: LogLevel.error);
       return;

server/lib/src/programs/kick.dart

@@ -12,10 +12,13 @@ class PlayersProgram extends ConsoleProgram {
   @override
   void run(String label, List<String> args) {
     print("-----");
-    final players = server.players;
+    final players = server.userManager.getUsers();
     print("${players.length} player(s) connected.");
-    for (final player in players.entries) {
-      print("${player.value.address} (${player.key})");
+    for (final player in players) {
+      final connectionInfo = server.players[player.key];
+      print(
+        "${connectionInfo?.address} | #${player.key}) | @${player.value.name} | *${player.value.fingerprint ?? 'No Fingerprint'}",
+      );
     }
     print("-----");
   }

server/lib/src/programs/players.dart

@@ -21,11 +21,23 @@ class WhitelistProgram extends ConsoleProgram {
       return;
     }
     final action = args[0].toLowerCase();
-    final user = args[1];
+    final user = await server.userManager.getUserByReference(args[1]);
+    if (user == null) {
+      server.log("User not found: ${args[1]}", level: LogLevel.error);
+      return;
+    }
+    final fingerprint = user.fingerprint;
+    if (fingerprint == null) {
+      server.log(
+        "User $user does not have a fingerprint. Cannot add to whitelist.",
+        level: LogLevel.error,
+      );
+      return;
+    }
 
     if (action == 'add') {
       final result = await server.userManager.service?.updateUser(
-        user,
+        fingerprint,
         onWhitelist: true,
       );
       if (result != true) {
@@ -38,7 +50,7 @@ class WhitelistProgram extends ConsoleProgram {
       server.log("User $user added to whitelist", level: LogLevel.info);
     } else if (action == 'remove') {
       final result = await server.userManager.service?.updateUser(
-        user,
+        fingerprint,
         onWhitelist: false,
       );
       if (result != true) {