Improve nickname pooping and fix metrics

Author: l7ssha

lib/src/modules/metrics.dart

@@ -65,7 +65,7 @@ class DynamicMetric extends Metric {
   final ContextValueCallback extractValue;
 
   DynamicMetric(super.objectId, super.name, this.extractValue, {super.unit, super.icon, super.isDiagnostic = false})
-    : super(stateClass: 'measurement', deviceClass: 'data_size');
+    : super(stateClass: 'measurement');
 }
 
 class DiagnosticMetric extends Metric {
@@ -86,7 +86,7 @@ class BotInfoMetric extends Metric {
   final ExtractValueCallback extractValue;
 
   BotInfoMetric(super.objectId, super.name, this.extractValue, {super.unit, super.icon, super.isDiagnostic = false})
-    : super(stateClass: 'measurement', deviceClass: 'data_size');
+    : super(stateClass: 'measurement');
 }
 
 final List<DiagnosticMetric> oneTimeMetrics = [
@@ -194,18 +194,18 @@ class MetricsModule implements RequiresInitialization {
       return;
     }
 
+    Injector.appInstance.get<NyxxGateway>().onMessageCreate.listen((e) => dynamicMetricContext.messages++);
+    Injector.appInstance.get<NyxxGateway>().onGuildMemberAdd.listen((e) => dynamicMetricContext.joins++);
+    Injector.appInstance.get<NyxxGateway>().onGuildMemberRemove.listen((e) => dynamicMetricContext.removals++);
+    Injector.appInstance.get<NyxxGateway>().onInteractionCreate.listen((e) => dynamicMetricContext.interactions++);
+    Injector.appInstance.get<NyxxGateway>().onEvent.listen((e) => dynamicMetricContext.events++);
+
     client = MqttServerClient(metricsMqttPath, deviceName, maxConnectionAttempts: 30);
     client.onConnected = _onConnected;
     client.onAutoReconnected = _onAutoReconnected;
     client.onDisconnected = _onDisconnected;
 
     _connect();
-
-    Injector.appInstance.get<NyxxGateway>().onMessageCreate.listen((e) => dynamicMetricContext.messages++);
-    Injector.appInstance.get<NyxxGateway>().onGuildMemberAdd.listen((e) => dynamicMetricContext.joins++);
-    Injector.appInstance.get<NyxxGateway>().onGuildMemberRemove.listen((e) => dynamicMetricContext.removals++);
-    Injector.appInstance.get<NyxxGateway>().onInteractionCreate.listen((e) => dynamicMetricContext.interactions++);
-    Injector.appInstance.get<NyxxGateway>().onEvent.listen((e) => dynamicMetricContext.events++);
   }
 
   Future<void> _connect() async {

lib/src/modules/poop_name.dart

@@ -7,19 +7,38 @@ import 'package:running_on_dart/src/init.dart';
 
 const poopEmoji = "💩";
 const poopCharacters = [
+  '(',
+  ')',
+  '-',
+  '+',
+  '=',
+  '_',
+  ']',
+  '[',
+  '\\',
+  '|',
+  ';',
+  "'",
+  ',',
+  '.',
+  '<',
+  '>',
+  '/',
+  '?',
   '!',
-  '#',
   '@',
-  '^',
+  '#',
+  r'$',
   '%',
+  '^',
   '&',
-  '-',
   '*',
-  '.'
-      '+',
-  "'",
 ];
-final poopRegexp = RegExp("[${poopCharacters.join()}]");
+
+final poopRegexp = RegExp("[${poopCharacters.map((c) => RegExp.escape(c)).join()}]");
+final weirdCharsRegexp = RegExp(
+  r'[\u200B\u200C\u200D\u2060\uFEFF\u180E\u202A-\u202E\u2066-\u2069\u00AD\u061C\uFFF9-\uFFFB\uFFFD]|[\x00-\x1F\x7F-\x9F]',
+);
 
 class PoopNameModule implements RequiresInitialization {
   final NyxxGateway _client = Injector.appInstance.get();
@@ -52,7 +71,7 @@ class PoopNameModule implements RequiresInitialization {
     return (true, memberName);
   }
 
-  bool _shouldPoopName(String name) => name.startsWith(poopRegexp);
+  bool _shouldPoopName(String name) => name.startsWith(poopRegexp) || weirdCharsRegexp.hasMatch(name);
 
   Future<void> _updateMemberWithPoopEmoji(Member member) =>
       member.update(MemberUpdateBuilder(nick: poopEmoji), auditLogReason: 'ROD PoopNameModule moderation');