further system message fixes

This commit is contained in:
Alan Moon 2025-03-06 17:48:08 -08:00
parent 20452e2058
commit 5d0cb1581d
2 changed files with 6 additions and 7 deletions

View File

@ -139,10 +139,6 @@ namespace sodoff.Services {
grantedRewards.Add( grantedRewards.Add(
ApplyAchievementReward(viking, reward) 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!]]");
} }
} }

View File

@ -47,7 +47,7 @@ public class MessagingService
if (viking == null) if (viking == null)
{ {
message.Viking = null; message.Viking = null;
message.VikingId = -1; // -1 = System Message message.VikingId = null;
} else } else
{ {
message.Viking = viking; message.Viking = viking;
@ -262,7 +262,8 @@ public class MessagingService
if(message.IsDeleted && !showDeletedMessages) { ctx.Messages.Remove(message); continue; } 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(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; if(!message.IsNew && !showOldMessages) continue;
messageInfos.Add(new MessageInfo
MessageInfo messageInfo = new MessageInfo
{ {
MessageID = message.Id, MessageID = message.Id,
UserMessageQueueID = message.QueueID, UserMessageQueueID = message.QueueID,
@ -271,7 +272,9 @@ public class MessagingService
Data = message.Data ?? "NoData", Data = message.Data ?? "NoData",
MemberMessage = message.MemberMessage ?? "NoMessage", MemberMessage = message.MemberMessage ?? "NoMessage",
NonMemberMessage = message.NonMemberMessage ?? "NoMessage" NonMemberMessage = message.NonMemberMessage ?? "NoMessage"
}); };
messageInfos.Add(messageInfo);
} }
// save any database changes // save any database changes