From eefee93267c2423ef4a0281f08aa0e21e593c357 Mon Sep 17 00:00:00 2001 From: Lacyway <20912169+Lacyway@users.noreply.github.com> Date: Tue, 8 Jul 2025 21:21:33 +0200 Subject: [PATCH] Update chatbots --- .../Helpers/Dialogue/AbstractDialogChatBot.cs | 15 ++++++------ .../Helpers/Dialogue/Commando/IChatCommand.cs | 7 +++--- .../Dialogue/Commando/SptCommandoCommands.cs | 23 ++++++++++++------- .../SptCommands/GiveCommand/GiveSptCommand.cs | 16 +++++++++---- .../Commando/SptCommands/ISptCommand.cs | 9 ++++---- .../ProfileCommand/ProfileSptCommand.cs | 16 +++++++++---- .../TraderCommand/TraderSptCommand.cs | 16 +++++++++---- .../Helpers/Dialogue/IDialogueChatBot.cs | 5 ++-- .../Commands/AreYouABotMessageHandler.cs | 3 ++- .../Commands/DisplayLocationsHandler.cs | 3 ++- .../Commands/DisplaySkillNamesHandler.cs | 3 ++- .../SPTFriend/Commands/FishMessageHandler.cs | 3 ++- .../Commands/ForceChristmasMessageHandler.cs | 3 ++- .../Commands/ForceHalloweenMessageHandler.cs | 3 ++- .../Commands/ForceSnowMessageHandler.cs | 3 ++- .../Commands/ForceSummerMessageHandler.cs | 3 ++- .../Commands/GarbageMessageHandler.cs | 3 ++- .../Commands/GiveMeSpaceMessageHandler.cs | 2 +- .../SPTFriend/Commands/HelloMessageHandler.cs | 5 ++-- .../SPTFriend/Commands/IChatMessageHandler.cs | 3 ++- .../Commands/LoveYouChatMessageHandler.cs | 3 ++- .../Commands/NikitaMessageHandler.cs | 3 ++- .../Commands/SendGiftMessageHandler.cs | 3 ++- .../SPTFriend/Commands/SptMessageHandler.cs | 3 ++- .../Helpers/Dialogue/SptDialogueChatBot.cs | 7 +++--- 25 files changed, 103 insertions(+), 60 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/AbstractDialogChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/AbstractDialogChatBot.cs index 462351a7..e8baddc4 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/AbstractDialogChatBot.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/AbstractDialogChatBot.cs @@ -1,4 +1,5 @@ using SPTarkov.Server.Core.Helpers.Dialog.Commando; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Utils; @@ -14,12 +15,12 @@ public abstract class AbstractDialogChatBot( ) : IDialogueChatBot { protected readonly IDictionary _chatCommands = chatCommands.ToDictionary( - command => command.GetCommandPrefix() + command => command.CommandPrefix ); public abstract UserDialogInfo GetChatBot(); - public async ValueTask HandleMessage(string sessionId, SendMessageRequest request) + public async ValueTask HandleMessage(MongoId sessionId, SendMessageRequest request) { if ((request.Text ?? "").Length == 0) { @@ -33,7 +34,7 @@ public abstract class AbstractDialogChatBot( if ( splitCommand.Length > 1 && _chatCommands.TryGetValue(splitCommand[0], out var commando) - && commando.GetCommands().Contains(splitCommand[1]) + && commando.Commands.Contains(splitCommand[1]) ) { return await commando.Handle(splitCommand[1], GetChatBot(), sessionId, request); @@ -58,7 +59,7 @@ public abstract class AbstractDialogChatBot( } protected async ValueTask SendPlayerHelpMessage( - string sessionId, + MongoId sessionId, SendMessageRequest request ) { @@ -77,14 +78,14 @@ public abstract class AbstractDialogChatBot( _mailSendService.SendUserMessageToPlayer( sessionId, GetChatBot(), - $"Commands available for \"{chatCommand.GetCommandPrefix()}\" prefix:", + $"Commands available for \"{chatCommand.CommandPrefix}\" prefix:", [], null ); await Task.Delay(TimeSpan.FromSeconds(1)); - foreach (var subCommand in chatCommand.GetCommands()) + foreach (var subCommand in chatCommand.Commands) { _mailSendService.SendUserMessageToPlayer( sessionId, @@ -103,7 +104,7 @@ public abstract class AbstractDialogChatBot( public void RegisterChatCommand(IChatCommand chatCommand) { - var prefix = chatCommand.GetCommandPrefix(); + var prefix = chatCommand.CommandPrefix; if (!_chatCommands.TryAdd(prefix, chatCommand)) { throw new Exception( diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/IChatCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/IChatCommand.cs index 9ae71c68..b8cbc238 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/IChatCommand.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/IChatCommand.cs @@ -1,3 +1,4 @@ +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; @@ -5,13 +6,13 @@ namespace SPTarkov.Server.Core.Helpers.Dialog.Commando; public interface IChatCommand { - public string GetCommandPrefix(); + public string CommandPrefix { get; } public string GetCommandHelp(string command); - public List GetCommands(); + public List Commands { get; } public ValueTask Handle( string command, UserDialogInfo commandHandler, - string sessionId, + MongoId sessionId, SendMessageRequest request ); } diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs index 07c63547..ebc148ee 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs @@ -1,5 +1,6 @@ using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Spt.Config; @@ -20,7 +21,7 @@ public class SptCommandoCommands : IChatCommand IEnumerable sptCommands ) { - _sptCommands = sptCommands.ToDictionary(command => command.GetCommand()); + _sptCommands = sptCommands.ToDictionary(command => command.Command); _serverLocalisationService = localisationService; var coreConfigs = configServer.GetConfig(); var commandoId = coreConfigs.Features?.ChatbotFeatures.Ids.GetValueOrDefault("commando"); @@ -35,25 +36,31 @@ public class SptCommandoCommands : IChatCommand } } - public string GetCommandPrefix() + public string CommandPrefix { - return "spt"; + get + { + return "spt"; + } } public string GetCommandHelp(string command) { - return _sptCommands.TryGetValue(command, out var value) ? value.GetCommandHelp() : ""; + return _sptCommands.TryGetValue(command, out var value) ? value.CommandHelp : ""; } - public List GetCommands() + public List Commands { - return _sptCommands.Keys.ToList(); + get + { + return _sptCommands.Keys.ToList(); + } } public async ValueTask Handle( string command, UserDialogInfo commandHandler, - string sessionId, + MongoId sessionId, SendMessageRequest request ) { @@ -62,7 +69,7 @@ public class SptCommandoCommands : IChatCommand public void RegisterSptCommandoCommand(ISptCommand command) { - var key = command.GetCommand(); + var key = command.Command; if (!_sptCommands.TryAdd(key, command)) { throw new Exception( diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs index a2c169e6..12cb7cd4 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs @@ -40,21 +40,27 @@ public class GiveSptCommand( protected readonly Dictionary _savedCommand = new(); - public string GetCommand() + public string Command { - return "give"; + get + { + return "give"; + } } - public string GetCommandHelp() + public string CommandHelp { - return "spt give\n========\nSends items to the player through the message system.\n\n\tspt give [template ID] [quantity]\n\t\tEx: " + get + { + return "spt give\n========\nSends items to the player through the message system.\n\n\tspt give [template ID] [quantity]\n\t\tEx: " + "spt give 544fb25a4bdc2dfb738b4567 2\n\n\tspt give [\"item name\"] [quantity]\n\t\tEx: spt give \"pack of sugar\" 10\n\n\tspt " + "give [locale] [\"item name\"] [quantity]\n\t\tEx: spt give fr \"figurine de chat\" 3"; + } } public ValueTask PerformAction( UserDialogInfo commandHandler, - string sessionId, + MongoId sessionId, SendMessageRequest request ) { diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs index a97fb9c8..b31d4fbd 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs @@ -1,15 +1,16 @@ -using SPTarkov.Server.Core.Models.Eft.Dialog; +using SPTarkov.Server.Core.Models.Common; +using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands; public interface ISptCommand { - public string GetCommand(); - public string GetCommandHelp(); + public string Command { get; } + public string CommandHelp { get; } public ValueTask PerformAction( UserDialogInfo commandHandler, - string sessionId, + MongoId sessionId, SendMessageRequest request ); } diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs index 3f8ff992..388a9bac 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs @@ -30,21 +30,27 @@ public class ProfileSptCommand( protected static readonly Regex _examineRegex = new(@"^spt profile (?examine)"); - public string GetCommand() + public string Command { - return "profile"; + get + { + return "profile"; + } } - public string GetCommandHelp() + public string CommandHelp { - return "spt profile\n========\nSets the profile level or skill to the desired level through the message system.\n\n\tspt " + get + { + return "spt profile\n========\nSets the profile level or skill to the desired level through the message system.\n\n\tspt " + "profile level [desired level]\n\t\tEx: spt profile level 20\n\n\tspt profile skill [skill name] [quantity]\n\t\tEx: " + "spt profile skill metabolism 51"; + } } public ValueTask PerformAction( UserDialogInfo commandHandler, - string sessionId, + MongoId sessionId, SendMessageRequest request ) { diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs index 77607304..e6ea2961 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs @@ -24,19 +24,25 @@ public class TraderSptCommand( @"^spt trader (?[\w]+) (?rep|spend) (?(?!0+)[0-9]+)$" ); - public string GetCommand() + public string Command { - return "trader"; + get + { + return "trader"; + } } - public string GetCommandHelp() + public string CommandHelp { - return "spt trader \n ======== \n Sets the reputation or money spent to the input quantity through the message system.\n\n\tspt trader [trader] rep [quantity]\n\t\tEx: spt trader prapor rep 2\n\n\tspt trader [trader] spend [quantity]\n\t\tEx: spt trader therapist spend 1000000"; + get + { + return "spt trader \n ======== \n Sets the reputation or money spent to the input quantity through the message system.\n\n\tspt trader [trader] rep [quantity]\n\t\tEx: spt trader prapor rep 2\n\n\tspt trader [trader] spend [quantity]\n\t\tEx: spt trader therapist spend 1000000"; + } } public ValueTask PerformAction( UserDialogInfo commandHandler, - string sessionId, + MongoId sessionId, SendMessageRequest request ) { diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/IDialogueChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/IDialogueChatBot.cs index d0c1a3f5..51fe4587 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/IDialogueChatBot.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/IDialogueChatBot.cs @@ -1,4 +1,5 @@ -using SPTarkov.Server.Core.Models.Eft.Dialog; +using SPTarkov.Server.Core.Models.Common; +using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Helpers.Dialogue; @@ -11,5 +12,5 @@ public interface IDialogueChatBot /// Handles messages for the chatbot. If a message can't be handled, should be used. /// /// The response of the bot, or if the request could not be handled. - public ValueTask HandleMessage(string sessionId, SendMessageRequest request); + public ValueTask HandleMessage(MongoId sessionId, SendMessageRequest request); } diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs index 85c5a46a..d9c12828 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; @@ -21,7 +22,7 @@ public class AreYouABotMessageHandler(MailSendService _mailSendService, RandomUt } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/DisplayLocationsHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/DisplayLocationsHandler.cs index 05809666..24883669 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/DisplayLocationsHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/DisplayLocationsHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; @@ -20,7 +21,7 @@ public class DisplayLocationsHandler(MailSendService _mailSendService) : IChatMe } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/DisplaySkillNamesHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/DisplaySkillNamesHandler.cs index 9275095a..787048b6 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/DisplaySkillNamesHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/DisplaySkillNamesHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; @@ -20,7 +21,7 @@ public class DisplaySkillNamesHandler(MailSendService _mailSendService) : IChatM } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs index bf370114..d0194744 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; @@ -19,7 +20,7 @@ public class FishMessageHandler(MailSendService _mailSendService) : IChatMessage } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs index 59ed3e52..06a95afe 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; @@ -26,7 +27,7 @@ public class ForceChristmasMessageHandler( } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs index afb466ac..0e95e6b6 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; @@ -26,7 +27,7 @@ public class ForceHalloweenMessageHandler( } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs index 3fb59105..1e0ac916 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; @@ -30,7 +31,7 @@ public class ForceSnowMessageHandler( } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs index 00db54f6..068814be 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; @@ -30,7 +31,7 @@ public class ForceSummerMessageHandler( } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs index 6d571a5d..40109808 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; @@ -21,7 +22,7 @@ public class GarbageMessageHandler(MailSendService _mailSendService, RandomUtil } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs index 01a8f678..604fad78 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs @@ -33,7 +33,7 @@ public class GiveMeSpaceMessageHandler( } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs index 8355638c..5c8f2441 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs @@ -1,5 +1,6 @@ using System.Collections.Frozen; using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; @@ -33,7 +34,7 @@ public class HelloMessageHandler(MailSendService _mailSendService, RandomUtil _r } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null @@ -79,7 +80,7 @@ public class HelloMessageHandler(MailSendService _mailSendService, RandomUtil _r public string PerformAction( UserDialogInfo commandHandler, - string sessionId, + MongoId sessionId, SendMessageRequest request ) { diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs index 3303cb21..f583be29 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs @@ -1,3 +1,4 @@ +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; @@ -10,7 +11,7 @@ public interface IChatMessageHandler public bool CanHandle(string? message); public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs index 790a2fe8..498ef0c4 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; @@ -21,7 +22,7 @@ public class LoveYouChatMessageHandler(MailSendService _mailSendService, RandomU } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs index 19c4e648..3570ecab 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; @@ -21,7 +22,7 @@ public class NikitaMessageHandler(MailSendService _mailSendService, RandomUtil _ } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs index eefa6281..d3eda002 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; @@ -31,7 +32,7 @@ public class SendGiftMessageHandler( } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs index 4d6021cb..0ce8ff94 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs @@ -1,4 +1,5 @@ using SPTarkov.DI.Annotations; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Services; @@ -21,7 +22,7 @@ public class SptMessageHandler(MailSendService _mailSendService, RandomUtil _ran } public void Process( - string sessionId, + MongoId sessionId, UserDialogInfo sptFriendUser, PmcData? sender, object? extraInfo = null diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs index 0ea2a46d..158713c8 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs @@ -1,11 +1,10 @@ using SPTarkov.DI.Annotations; -using SPTarkov.Server.Core.Helpers.Dialog.Commando; using SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Dialog; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Spt.Config; -using SPTarkov.Server.Core.Models.Utils; using SPTarkov.Server.Core.Servers; using SPTarkov.Server.Core.Services; @@ -40,7 +39,7 @@ public class SptDialogueChatBot( }; } - public ValueTask HandleMessage(string sessionId, SendMessageRequest request) + public ValueTask HandleMessage(MongoId sessionId, SendMessageRequest request) { var sender = _profileHelper.GetPmcProfile(sessionId); var sptFriendUser = GetChatBot(); @@ -84,7 +83,7 @@ public class SptDialogueChatBot( return "Unknown command."; } - protected ValueTask SendPlayerHelpMessage(string sessionId, SendMessageRequest request) + protected ValueTask SendPlayerHelpMessage(MongoId sessionId, SendMessageRequest request) { _mailSendService.SendUserMessageToPlayer( sessionId,