Add space, fix string, add info about owner leave from room

MafiaTelegramBot/Controllers/RoomController.cs

@@ -61,7 +61,10 @@ namespace MafiaTelegramBot.Controllers
                 player.CurrentRole = new NoneRole();
                 player.TurnOrder = -1;
                 OpenedGames[roomKey].Players.Remove(player.Id);
-                await OpenedGames[roomKey].PlayersCh.SendExcept(player.Id, $"{player.NickName} {strings.leave_from_game}");
+                var message = OpenedGames[roomKey].Owner.Id == player.Id
+                    ? $"{player.NickName} \\({strings.room_owner}\\) {strings.leave_from_game}"
+                    : $"{player.NickName} {strings.leave_from_game}";
+                await OpenedGames[roomKey].PlayersCh.SendExcept(player.Id, message);
                 if (OpenedGames[roomKey].Players.Count >= 0) return ResultCode.CodeOk;
                 RoomEncrypter.RemoveCode(roomName);
                 OpenedGames.Remove(roomKey);
@@ -75,11 +78,8 @@ namespace MafiaTelegramBot.Controllers
             {
                 if (OpenedGames.ContainsKey(roomKey))
                 {
-                    foreach (var player in OpenedGames[roomKey].Players.Values)
-                    {
-                        await player.RemoveGame();
-                        await Bot.SendWithMarkdown2(player.ChatId, strings.room_dissolved, Keyboards.MainMenu);
-                    }
+                    await OpenedGames[roomKey].PlayersCh.Send(strings.room_dissolved, Keyboards.MainMenu);
+                    foreach (var player in OpenedGames[roomKey].Players.Values) await player.RemoveGame();
                     RoomEncrypter.RemoveCode(OpenedGames[roomKey].RoomName);
                     OpenedGames.Remove(roomKey);
                 }

MafiaTelegramBot/Game/GameRooms/GameRoom.MessageHandler.cs

@@ -12,7 +12,7 @@ namespace MafiaTelegramBot.Game.GameRooms
     {
         public class MessageHandler
         {
-            private GameRoom _room;
+            private readonly GameRoom _room;
 
             public MessageHandler(GameRoom room)
             {
@@ -42,7 +42,7 @@ namespace MafiaTelegramBot.Game.GameRooms
                         else
                         {
                             if (player.IsSpeaker)
-                                await _room.MafiaCh.SendExcept(userId, $"\\({player.TurnOrder}\\){player.NickName}: {update.Message.Text}");
+                                await _room.MafiaCh.SendExcept(userId, $"\\({player.TurnOrder}\\) {player.NickName}: {update.Message.Text}");
                             else
                             {
                                 if(_room.IsFirstNight && player.CurrentRole.RoleKey is Roles.Mafia or Roles.Don)

MafiaTelegramBot/Models/Commands/DissolveRoomCommand.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using MafiaTelegramBot.Controllers;
-using MafiaTelegramBot.DataBase;
 using MafiaTelegramBot.DataBase.EntityDao;
 using MafiaTelegramBot.Game;
 using MafiaTelegramBot.Resources;

MafiaTelegramBot/Resources/strings.Designer.cs

@@ -500,5 +500,11 @@ namespace MafiaTelegramBot {
                 return ResourceManager.GetString("died", resourceCulture);
             }
         }
+        
+        internal static string room_owner {
+            get {
+                return ResourceManager.GetString("room_owner", resourceCulture);
+            }
+        }
     }
 }

MafiaTelegramBot/Resources/strings.resx

@@ -235,7 +235,7 @@
         <value>Вы мертвы и не можете говорить!</value>
     </data>
     <data name="villagers_are_sleep" xml:space="preserve">
-        <value>Жители ночью говорят, а не болтают!</value>
+        <value>Жители ночью спят, а не разговаривают!</value>
     </data>
     <data name="mafia_get_mail" xml:space="preserve">
         <value>В первую ночь мафия получает список соучастников.</value>
@@ -246,4 +246,7 @@
     <data name="died" xml:space="preserve">
         <value>мертвый</value>
     </data>
+    <data name="room_owner" xml:space="preserve">
+        <value>владелец комнаты</value>
+    </data>
 </root>