From f40e8b8631e75e492bb9225efe79267b3cac7caa Mon Sep 17 00:00:00 2001 From: 140bpmdubstep Date: Wed, 16 Oct 2024 21:32:55 +0300 Subject: [PATCH] Close #5 --- fs24bot3/Commands/GenericCommandsModule.cs | 6 +++--- fs24bot3/Models/MessageGeneric.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs24bot3/Commands/GenericCommandsModule.cs b/fs24bot3/Commands/GenericCommandsModule.cs index ca6d3de..70445d8 100644 --- a/fs24bot3/Commands/GenericCommandsModule.cs +++ b/fs24bot3/Commands/GenericCommandsModule.cs @@ -138,7 +138,7 @@ public async Task Remind(string time = "1m", [Remainder] string message = "") if (!timeSegments.Any()) { - Context.SendErrorMessage(Context.Channel, + await Context.SendErrorMessage(Context.Channel, $"Неверный формат времени или неверные единицы измерения времени"); return; } @@ -167,7 +167,7 @@ public async Task Remind(string time = "1m", [Remainder] string message = "") totalSecs += value; break; default: - Context.SendErrorMessage(Context.Channel, + await Context.SendErrorMessage(Context.Channel, $"Неизвестная единица измерения времени: {segment.Value[^1]}"); return; } @@ -681,4 +681,4 @@ public async Task ColorTransform(Color color, CommandToggles.ColorFormats output break; } } -} \ No newline at end of file +} diff --git a/fs24bot3/Models/MessageGeneric.cs b/fs24bot3/Models/MessageGeneric.cs index 517bfd8..aafa172 100644 --- a/fs24bot3/Models/MessageGeneric.cs +++ b/fs24bot3/Models/MessageGeneric.cs @@ -39,7 +39,7 @@ public MessageGeneric(in ParsedIRCMessage message, in SQLiteConnection connectio // trim bridged user nickname like // //bpm140//: @ms привет var msg = Body.Split(":"); - Body = msg.Last().TrimStart(' '); + Body = string.Join(":", msg.Skip(1)).TrimStart(); Sender = new Core.User("@[" + MessageHelper.StripIRC(msg.First()) + "]", connection); Kind = MessageKind.MessageFromBridge; Log.Verbose("Message from the bridge: {0} from {1}", Body, Sender); @@ -53,4 +53,4 @@ public MessageGeneric(string body, string target, Core.User sender, MessageKind Sender = sender; Kind = messageKind; } -} \ No newline at end of file +}