Fix creating room bug

MafiaTelegramBot/Models/Bot.cs

@@ -27,7 +27,7 @@ namespace MafiaTelegramBot.Models
         public static IReadOnlyList<Payment> Payments => _paymentsList.AsReadOnly();
 
         public static readonly List<long> UsersThatChangesNickname = new();
-        public static readonly Dictionary<long, string[]> UsersThatCreatesRoom = new();
+        public static readonly Dictionary<long, string> UsersThatCreatesRoom = new();
         public static readonly List<long> UserThatEntersPrivateCode = new();
 
         public static TelegramBotClient Get()
@@ -65,11 +65,6 @@ namespace MafiaTelegramBot.Models
             {
                 new ShowMyRolesQuery(),
                 new ShopMenuQuery(),
-                new MakePrivateRoomQuery(),
-                new MakePublicRoomQuery(),
-                new ChooseGameTypeQuery(),
-                new ChooseGameModeQuery(),
-                new MakePublicRoomQuery(),
                 new SettingsProfileQuery(),
                 new ChangeNickNameQuery(),
                 new SettingsRoomQuery(),
@@ -83,7 +78,10 @@ namespace MafiaTelegramBot.Models
                 new PlayersCountSettingsQuery(),
                 new ApplyRolesChangeQuery(),
                 new StartGameQuery(),
-                new ShowMyExtendedStatsQuery()
+                new ShowMyExtendedStatsQuery(),
+                new ChooseRoomViewQuery(),
+                new ChooseGameTypeQuery(),
+                new ChooseGameModeQuery(),
             };
         }
         

MafiaTelegramBot/Models/Commands/CustomMessageHandlers/CreateRoomHandler.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 using MafiaTelegramBot.Controllers;
 using MafiaTelegramBot.DataBase.EntityDao;
@@ -15,9 +16,9 @@ namespace MafiaTelegramBot.Models.Commands.CustomMessageHandlers
         {
             var param = Bot.UsersThatCreatesRoom[UserId];
             Bot.UsersThatCreatesRoom.Remove(UserId);
-            var isPrivate = param[1][0] == Constants.PRIVATE;
-            var isExtended = param[1][1] == Constants.EXTENDED;
-            var isRanking = param[1][2] == Constants.RANKING;
+            var isPrivate = param[0] == Constants.PRIVATE + '0';
+            var isExtended = param[1] == Constants.EXTENDED + '0';
+            var isRanking = param[2] == Constants.RANKING + '0';
             var user = await UserDao.GetPlayerById(UserId);
             var roomName = update.Message.Text;
             var resultCode = await RoomController.CreateNewGame(user, roomName, isExtended, isPrivate, isRanking);

MafiaTelegramBot/Models/Inlines/ChooseGameTypeQuery.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 using MafiaTelegramBot.DataBase.EntityDao;
 using MafiaTelegramBot.Resources;
@@ -17,8 +18,8 @@ namespace MafiaTelegramBot.Models.Inlines
                 return await Bot.SendWithMarkdown2(ChatId, strings.user_already_in_game);
             var data = update.CallbackQuery.Data;
             var param = data.Split('|');
-            if (Bot.UsersThatCreatesRoom.TryAdd(UserId, new[] {param[2], Name.ToString()}))
-                Bot.UsersThatCreatesRoom[UserId] = new[] {param[2], Name.ToString()};
+            if (!Bot.UsersThatCreatesRoom.TryAdd(UserId, param[2]))
+                Bot.UsersThatCreatesRoom[UserId] = param[2];
             return await Bot.SendWithMarkdown2(ChatId, strings.enter_room_name);
         }
     }

MafiaTelegramBot/Models/Inlines/MakePrivateRoomQuery.cs

@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-using MafiaTelegramBot.DataBase.EntityDao;
-using MafiaTelegramBot.Resources;
-using Telegram.Bot.Types;
-
-namespace MafiaTelegramBot.Models.Inlines
-{
-    public class MakePrivateRoomQuery : Query
-    {
-        protected override Callback Name => Callback.MakePrivateRoom;
-
-        protected override async Task<Message> Execute(Update update)
-        {
-            await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
-            var user = await UserDao.GetPlayerById(UserId);
-            if (user.GetRoomName() != "")
-                return await Bot.SendWithMarkdown2(ChatId, strings.user_already_in_game);
-            return await Bot.SendWithMarkdown2(ChatId, strings.choose_game_type, Keyboard.NormalExtendedKeyboard(UserId, "private"));
-        }
-    }
-}

MafiaTelegramBot/Models/Inlines/MakePublicRoomQuery.cs

@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-using MafiaTelegramBot.DataBase.EntityDao;
-using MafiaTelegramBot.Resources;
-using Telegram.Bot.Types;
-
-namespace MafiaTelegramBot.Models.Inlines
-{
-    public class MakePublicRoomQuery : Query
-    {
-        protected override Callback Name => Callback.MakePublicRoom;
-
-        protected override async Task<Message> Execute(Update update)
-        { 
-            await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
-            var user = await UserDao.GetPlayerById(UserId);
-            if (user.GetRoomName() != "")
-                return await Bot.SendWithMarkdown2(ChatId, strings.user_already_in_game);
-            return await Bot.SendWithMarkdown2(ChatId, strings.choose_game_type, Keyboard.NormalExtendedKeyboard(UserId, "public"));
-        }
-    }
-}

MafiaTelegramBot/Resources/Callback.cs

@@ -5,10 +5,6 @@ namespace MafiaTelegramBot.Resources
         ChangeNickName,
         ConnectToPrivateRoom,
         ConnectToPublicRoom,
-        MakePublicRoom,
-        MakePrivateRoom,
-        MakeExtendedGame,
-        MakeNormalGame,
         ShopMenu,
         ShowMyRoles,
         SettingsProfile,

MafiaTelegramBot/Resources/Keyboard.cs

@@ -121,17 +121,6 @@ namespace MafiaTelegramBot.Resources
             });
         }
 
-        public static InlineKeyboardMarkup NormalExtendedKeyboard(long userId, string type)
-        {
-            return new (new[]
-            {
-                new[] {
-                    InlineKeyboardButton.WithCallbackData(strings.standard, $"{Callback.MakeNormalGame}|{userId}|{type}"),
-                    InlineKeyboardButton.WithCallbackData(strings.extended, $"{Callback.MakeExtendedGame}|{userId}|{type}")
-                }
-            });
-        }
-
         public static InlineKeyboardMarkup ChangeNameKeyboard(long userId)
         {
             return new(InlineKeyboardButton.WithCallbackData(strings.change_name, $"{Callback.ChangeNickName}|{userId}"));