Tigran 4 лет назад
Родитель
Сommit
49b06a90c7

+ 2 - 2
MafiaTelegramBot/Game/GameRooms/GameRoom.MessageHandler.cs

@@ -35,7 +35,7 @@ namespace MafiaTelegramBot.Game.GameRooms
                         if (_room.IsDay)
                         {
                             if (player.IsSpeaker)
-                                await _room.PlayersCh.SendExcept(userId, $"\\({player.TurnOrder}\\){player.NickName}: {update.Message.Text}");
+                                await _room.PlayersCh.SendExcept(userId, $"\\({player.TurnOrder}\\) {player.NickName}: {update.Message.Text}");
                             else
                                 await Bot.SendWithMarkdown2(chatId, strings.now_is_not_your_turn);
                         }
@@ -60,7 +60,7 @@ namespace MafiaTelegramBot.Game.GameRooms
                 var players = _room.Players.Values.ToList();
                 players.Sort((x, y) => x.TurnOrder - y.TurnOrder);
                 var message = players.Aggregate(strings.players_list,
-                    (current, player) => current + $"\n\\({player.TurnOrder}\\) {player.NickName} {(player.IsAlive ? strings.alive : strings.died)}");
+                    (current, player) => current + $"\n\\({player.TurnOrder}\\) {player.NickName} \\({(player.IsAlive ? strings.alive : strings.died)}\\)");
                 await Bot.SendWithMarkdown2(chatId, message);
             }
 

+ 6 - 3
MafiaTelegramBot/Models/Commands/Command.cs

@@ -27,8 +27,13 @@ namespace MafiaTelegramBot.Models.Commands
         public static async Task<Message> Update(Update update)
         {
             var chatId = update.Message.Chat.Id;
-            var userId = update.Message.From.Id;
             await Bot.Get().SendChatActionAsync(chatId, ChatAction.Typing);
+            var userId = update.Message.From.Id;
+            var commands = Bot.Commands;
+            var message = update.Message.Text;
+            var startCommand = new StartCommand();
+            //TODO refactor later
+            if (message.Contains(startCommand.Name)) return await ((Command?) startCommand.Clone(chatId, userId))!.Execute(update);
             var user = await UserDao.GetPlayerById(userId);
             if (user.IsPlaying)
             {
@@ -36,8 +41,6 @@ namespace MafiaTelegramBot.Models.Commands
                 var room = RoomController.GetRoom(roomKey);
                 return await room.Handler.Handle(update);
             }
-            var commands = Bot.Commands;
-            var message = update.Message.Text;
             var command = FirstOrDefault(commands, message);
             if(command != null) return await ((Command?) command.Clone(chatId, userId))!.Execute(update);
             if (Bot.UsersThatChangesNickname.Remove(userId))