Hopefully fixed the magic strings (#3)

PolterTzi · May 12, 2024 · 0a5f6cd · 0a5f6cd
1 parent 3898ac7
commit 0a5f6cd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/Content.Server/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs
@@ -72,7 +72,7 @@ private void OnUiMessage(EntityUid uid, MessagesCartridgeComponent component, Ca
             };
             var packet = new NetworkPayload()
             {
-                ["Message"] = messageData
+                [MessagesNetworkKeys.Message] = messageData
             };
             _singletonServerSystem.TryGetActiveServerAddress<MessagesServerComponent>(stationId.Value, out var address);
             _deviceNetworkSystem.QueuePacket(uid, address, packet);
@@ -121,7 +121,7 @@ private void OnPacketReceived(EntityUid uid, MessagesCartridgeComponent componen
         if (!TryComp(uid, out CartridgeComponent? cartComponent))
             return;
         component.LastServer = args.Sender;
-        if (args.Data.TryGetValue<MessagesMessageData>("Message", out var message) && cartComponent.LoaderUid != null)
+        if (args.Data.TryGetValue<MessagesMessageData>(MessagesNetworkKeys.Message, out var message) && cartComponent.LoaderUid != null)
         {
             if (message.ReceiverId == GetUserUid(cartComponent))
             {
@@ -150,8 +150,8 @@ private void SendName(EntityUid uid, MessagesCartridgeComponent component, Cartr
 
         var packet = new NetworkPayload()
         {
-            ["UserId"] = userUid,
-            ["NewName"] = name
+            [MessagesNetworkKeys.UserId] = userUid,
+            [MessagesNetworkKeys.NewName] = name
         };
         _deviceNetworkSystem.QueuePacket(uid, address, packet);
     }

diff --git a/Content.Server/Radio/EntitySystems/MessagesServerSystem.cs b/Content.Server/Radio/EntitySystems/MessagesServerSystem.cs
@@ -20,7 +20,6 @@ namespace Content.Server.Radio.EntitySystems;
 
 public sealed class MessagesServerSystem : EntitySystem
 {
-
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly MessagesCartridgeSystem _messagesCartridgeSystem = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
@@ -39,14 +38,14 @@ private void OnPacketReceived(EntityUid uid, MessagesServerComponent component,
     {
         if (!_singletonServerSystem.IsActiveServer(uid))
             return;
-        if (args.Data.TryGetValue<string>("NewName", out var name) && args.Data.TryGetValue<int>("UserId", out var userId))
+        if (args.Data.TryGetValue<string>(MessagesNetworkKeys.NewName, out var name) && args.Data.TryGetValue<int>(MessagesNetworkKeys.UserId, out var userId))
         {
             component.NameDict[userId] = name;
 
             var packet = new NetworkPayload();
             _deviceNetworkSystem.QueuePacket(uid, args.SenderAddress, packet);
         }
-        if (args.Data.TryGetValue<MessagesMessageData>("Message", out var message))
+        if (args.Data.TryGetValue<MessagesMessageData>(MessagesNetworkKeys.Message, out var message))
             SendMessage(uid, component, message);
     }
 
@@ -59,7 +58,7 @@ public void SendMessage(EntityUid uid, MessagesServerComponent component, Messag
 
         var packet = new NetworkPayload()
         {
-            ["Message"] = message
+            [MessagesNetworkKeys.Message] = message
         };
 
         _deviceNetworkSystem.QueuePacket(uid, null, packet);
@@ -105,3 +104,11 @@ public List<MessagesMessageData> GetMessages(EntityUid? uid, int id1, int id2)
     }
 
 }
+
+public  enum MessagesNetworkKeys : string
+{
+    NewName,
+    UserId,
+    Message
+};
+