From 5d0cb1581d63623514d2e210ffe5b9542d896755 Mon Sep 17 00:00:00 2001
From: AlanMoonbase <alanmoonbase2004@gmail.com>
Date: Thu, 6 Mar 2025 17:48:08 -0800
Subject: [PATCH] further system message fixes

---
 src/Services/AchievementService.cs | 4 ----
 src/Services/MessagingService.cs   | 9 ++++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Services/AchievementService.cs b/src/Services/AchievementService.cs
index 771bc7e..7c392f8 100644
--- a/src/Services/AchievementService.cs
+++ b/src/Services/AchievementService.cs
@@ -139,10 +139,6 @@ namespace sodoff.Services {
                     grantedRewards.Add(
                         ApplyAchievementReward(viking, reward)
                     );
-
-                    // add message for earning xp (wojs)
-                    if (reward.PointTypeID == AchievementPointTypes.PlayerXP && viking.GameVersion <= ClientVersion.WoJS)
-                        messagingService.AddMessageToViking(null, viking, MessageType.Data, MessageTypeID.Jumpstar, MessageLevel.WhiteList, $"[[Line1]]=[[Congratulations, You've Earned {reward.Amount} JumpStars!]]", $"[[Line1]]=[[Congratulations, You've Earned {reward.Amount} JumpStars!]]", $"[[Line1]]=[[Congratulations, You've Earned {reward.Amount} JumpStars!]]");
                 }
             }
 
diff --git a/src/Services/MessagingService.cs b/src/Services/MessagingService.cs
index 958916f..17c1fb5 100644
--- a/src/Services/MessagingService.cs
+++ b/src/Services/MessagingService.cs
@@ -47,7 +47,7 @@ public class MessagingService
         if (viking == null)
         {
             message.Viking = null;
-            message.VikingId = -1; // -1 = System Message
+            message.VikingId = null;
         } else 
         {
             message.Viking = viking;
@@ -262,7 +262,8 @@ public class MessagingService
             if(message.IsDeleted && !showDeletedMessages) { ctx.Messages.Remove(message); continue; }
             if(DateTime.Compare(now, message.CreatedAt.AddMinutes(30)) > 0 && !showOldMessages)  { message.IsNew = false; continue; } // sometimes clients won't set IsNew flag when updating messages, so do not add messages more than 30 minutes old to response
             if(!message.IsNew && !showOldMessages) continue;
-            messageInfos.Add(new MessageInfo
+
+            MessageInfo messageInfo = new MessageInfo
             {
                 MessageID = message.Id,
                 UserMessageQueueID = message.QueueID,
@@ -271,7 +272,9 @@ public class MessagingService
                 Data = message.Data ?? "NoData",
                 MemberMessage = message.MemberMessage ?? "NoMessage",
                 NonMemberMessage = message.NonMemberMessage ?? "NoMessage"
-            });
+            };
+
+            messageInfos.Add(messageInfo);
         }
 
         // save any database changes