Browse Source

method accessor level change

Tigran 4 years ago
parent
commit
f18bdad9bf
26 changed files with 43 additions and 29 deletions
  1. 1 1
      MafiaTelegramBot.sln.DotSettings.user
  2. 1 1
      MafiaTelegramBot/Models/Commands/ConnectGameCommand.cs
  3. 2 1
      MafiaTelegramBot/Models/Commands/CreateGameCommand.cs
  4. 2 1
      MafiaTelegramBot/Models/Commands/CustomMessageHandlers/ChangeNicknameCommand.cs
  5. 2 1
      MafiaTelegramBot/Models/Commands/CustomMessageHandlers/CreateRoomCommand.cs
  6. 2 1
      MafiaTelegramBot/Models/Commands/CustomMessageHandlers/EnterPrivateRoomCommand.cs
  7. 1 1
      MafiaTelegramBot/Models/Commands/LeaveCommand.cs
  8. 2 2
      MafiaTelegramBot/Models/Commands/LookPlayersListCommand.cs
  9. 2 1
      MafiaTelegramBot/Models/Commands/RoomSettingsCommand.cs
  10. 1 1
      MafiaTelegramBot/Models/Commands/ShowProfileCommand.cs
  11. 1 1
      MafiaTelegramBot/Models/Commands/StartCommand.cs
  12. 1 1
      MafiaTelegramBot/Models/Inlines/ChangeNameQuery.cs
  13. 2 1
      MafiaTelegramBot/Models/Inlines/ConnectToPrivateRoomQuery.cs
  14. 2 1
      MafiaTelegramBot/Models/Inlines/ConnectToPublicRoomQuery.cs
  15. 2 1
      MafiaTelegramBot/Models/Inlines/ConnectToSelectedRoomQuery.cs
  16. 2 1
      MafiaTelegramBot/Models/Inlines/DecreaseRoomMaxCapacity.cs
  17. 1 1
      MafiaTelegramBot/Models/Inlines/IncreaseRoomMaxCapacityQuery.cs
  18. 2 1
      MafiaTelegramBot/Models/Inlines/MakeExtendedGameQuery.cs
  19. 2 1
      MafiaTelegramBot/Models/Inlines/MakePrivateRoomQuery.cs
  20. 2 1
      MafiaTelegramBot/Models/Inlines/MakePublicRoomQuery.cs
  21. 2 1
      MafiaTelegramBot/Models/Inlines/MakeStandartGameQuery.cs
  22. 1 1
      MafiaTelegramBot/Models/Inlines/MyRolesQuery.cs
  23. 1 1
      MafiaTelegramBot/Models/Inlines/SettingsQuery.cs
  24. 2 1
      MafiaTelegramBot/Models/Inlines/SettingsRoomQuery.cs
  25. 1 1
      MafiaTelegramBot/Models/Inlines/ShopQuery.cs
  26. 3 3
      MafiaTelegramBot/Models/UpdateModel.cs

+ 1 - 1
MafiaTelegramBot.sln.DotSettings.user

@@ -1,6 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002Fappsettings/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fcallback/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fcallback/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fkeyboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002FResources_002Fstrings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=MafiaTelegramBot_002Fstrings/@EntryIndexedValue">True</s:Boolean>

+ 1 - 1
MafiaTelegramBot/Models/Commands/ConnectGameCommand.cs

@@ -9,7 +9,7 @@ namespace MafiaTelegramBot.Models.Commands
     {
         protected override string Name => keyboard.connect_game;
 
-        public override async Task<Message> Execute(Update update)
+        protected override async Task<Message> Execute(Update update)
         {
             var user = await UserDao.GetUserById(UserId);
             if (user.GetRoomKey() != "")

+ 2 - 1
MafiaTelegramBot/Models/Commands/CreateGameCommand.cs

@@ -8,7 +8,8 @@ namespace MafiaTelegramBot.Models.Commands
     public class CreateGameCommand : Command
     {
         protected override string Name => keyboard.create_game;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             var user = await UserDao.GetUserById(UserId);
             if (user.GetRoomKey() != "")

+ 2 - 1
MafiaTelegramBot/Models/Commands/CustomMessageHandlers/ChangeNicknameCommand.cs

@@ -7,7 +7,8 @@ namespace MafiaTelegramBot.Models.Commands.CustomMessageHandlers
     public class ChangeNicknameCommand : Command
     {
         protected override string Name => "ChangeNicknameCommand";
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             var newNickname = update.Message.Text;
             var user = await UserDao.GetUserById(UserId);

+ 2 - 1
MafiaTelegramBot/Models/Commands/CustomMessageHandlers/CreateRoomCommand.cs

@@ -10,7 +10,8 @@ namespace MafiaTelegramBot.Models.Commands.CustomMessageHandlers
     public class CreateRoomCommand : Command
     {
         protected override string Name => "CreateRoomCommand";
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             var param = Bot.UsersThatCreatesRoom[UserId];
             Bot.UsersThatCreatesRoom.Remove(UserId);

+ 2 - 1
MafiaTelegramBot/Models/Commands/CustomMessageHandlers/EnterPrivateRoomCommand.cs

@@ -9,7 +9,8 @@ namespace MafiaTelegramBot.Models.Commands.CustomMessageHandlers
     public class EnterPrivateRoomCommand : Command
     {
         protected override string Name => "EnterPrivateRoomCommand";
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             var user = await UserDao.GetUserById(UserId);
             var roomKey = update.Message.Text;

+ 1 - 1
MafiaTelegramBot/Models/Commands/LeaveCommand.cs

@@ -10,7 +10,7 @@ namespace MafiaTelegramBot.Models.Commands
     {
         protected override string Name => keyboard.leave;
 
-        public override async Task<Message> Execute(Update update)
+        protected override async Task<Message> Execute(Update update)
         {
             var user = await UserDao.GetUserById(UserId);
             var roomName = await user.GetRoomName();

+ 2 - 2
MafiaTelegramBot/Models/Commands/LookPlayersListCommand.cs

@@ -10,8 +10,8 @@ namespace MafiaTelegramBot.Models.Commands
     public class LookPlayersListCommand : Command
     {
         protected override string Name => keyboard.look_players_list;
-        
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             var user = await UserDao.GetUserById(UserId);
             var roomKey = user.GetRoomKey();

+ 2 - 1
MafiaTelegramBot/Models/Commands/RoomSettingsCommand.cs

@@ -9,7 +9,8 @@ namespace MafiaTelegramBot.Models.Commands
     public class RoomSettingsCommand : Command
     {
         protected override string Name => keyboard.room_settings;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             var user = await UserDao.GetUserById(UserId);
             var roomKey = user.GetRoomKey();

+ 1 - 1
MafiaTelegramBot/Models/Commands/ShowProfileCommand.cs

@@ -10,7 +10,7 @@ namespace MafiaTelegramBot.Models.Commands
     {
         protected override string Name => keyboard.show_profile;
 
-        public override async Task<Message> Execute(Update update)
+        protected override async Task<Message> Execute(Update update)
         {
             var user = await UserDao.GetUserById(UserId);
             var winRate = user.Games < 1 ? 0.0 : Convert.ToDouble(user.Wins) / Convert.ToDouble(user.Games);

+ 1 - 1
MafiaTelegramBot/Models/Commands/StartCommand.cs

@@ -9,7 +9,7 @@ namespace MafiaTelegramBot.Models.Commands
     {
         protected override string Name => "/start";
 
-        public override async Task<Message> Execute(Update update)
+        protected override async Task<Message> Execute(Update update)
         {
             if (await UserDao.UserExists(UserId))
             {

+ 1 - 1
MafiaTelegramBot/Models/Inlines/ChangeNameQuery.cs

@@ -8,7 +8,7 @@ namespace MafiaTelegramBot.Models.Inlines
     {
         protected override string Name => callback.change_name;
 
-        public override async Task<Message> Execute(Update update)
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             Bot.UsersThatChangesNickname.Add(UserId);

+ 2 - 1
MafiaTelegramBot/Models/Inlines/ConnectToPrivateRoomQuery.cs

@@ -7,7 +7,8 @@ namespace MafiaTelegramBot.Models.Inlines
     public class ConnectToPrivateRoomQuery : Query
     {
         protected override string Name => callback.connect_to_private_room;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             Bot.UserThatEntersPrivateCode.Add(UserId);

+ 2 - 1
MafiaTelegramBot/Models/Inlines/ConnectToPublicRoomQuery.cs

@@ -8,7 +8,8 @@ namespace MafiaTelegramBot.Models.Inlines
     public class ConnectToPublicRoomQuery : Query
     {
         protected override string Name => callback.connect_to_public_room;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             var rooms = await RoomController.GetPublicRooms();

+ 2 - 1
MafiaTelegramBot/Models/Inlines/ConnectToSelectedRoomQuery.cs

@@ -10,7 +10,8 @@ namespace MafiaTelegramBot.Models.Inlines
     public class ConnectToSelectedRoomQuery : Query
     {
         protected override string Name => callback.connect_to_selected_room;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             var data = update.CallbackQuery.Data;

+ 2 - 1
MafiaTelegramBot/Models/Inlines/DecreaseRoomMaxCapacity.cs

@@ -9,7 +9,8 @@ namespace MafiaTelegramBot.Models.Inlines
     public class DecreaseRoomMaxCapacity:Query
     {
         protected override string Name => callback.decrease_number_of_players;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             var messageId = update.CallbackQuery.Message.MessageId;
             var user = await UserDao.GetUserById(UserId);

+ 1 - 1
MafiaTelegramBot/Models/Inlines/IncreaseRoomMaxCapacityQuery.cs

@@ -10,7 +10,7 @@ namespace MafiaTelegramBot.Models.Inlines
     {
         protected override string Name => callback.increase_number_of_players;
 
-        public override async Task<Message> Execute(Update update)
+        protected override async Task<Message> Execute(Update update)
         {
             var messageId = update.CallbackQuery.Message.MessageId;
             var user = await UserDao.GetUserById(UserId);

+ 2 - 1
MafiaTelegramBot/Models/Inlines/MakeExtendedGameQuery.cs

@@ -8,7 +8,8 @@ namespace MafiaTelegramBot.Models.Inlines
     public class MakeExtendedGameQuery : Query
     {
         protected override string Name => callback.extended;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             var data = update.CallbackQuery.Data;

+ 2 - 1
MafiaTelegramBot/Models/Inlines/MakePrivateRoomQuery.cs

@@ -8,7 +8,8 @@ namespace MafiaTelegramBot.Models.Inlines
     public class MakePrivateRoomQuery : Query
     {
         protected override string Name => callback.make_private_room;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             var user = await UserDao.GetUserById(UserId);

+ 2 - 1
MafiaTelegramBot/Models/Inlines/MakePublicRoomQuery.cs

@@ -8,7 +8,8 @@ namespace MafiaTelegramBot.Models.Inlines
     public class MakePublicRoomQuery : Query
     {
         protected override string Name => callback.make_public_room;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         { 
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             var user = await UserDao.GetUserById(UserId);

+ 2 - 1
MafiaTelegramBot/Models/Inlines/MakeStandartGameQuery.cs

@@ -8,7 +8,8 @@ namespace MafiaTelegramBot.Models.Inlines
     public class MakeStandartGameQuery : Query
     {
         protected override string Name => callback.standart;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             var data = update.CallbackQuery.Data;

+ 1 - 1
MafiaTelegramBot/Models/Inlines/MyRolesQuery.cs

@@ -8,7 +8,7 @@ namespace MafiaTelegramBot.Models.Inlines
     {
         protected override string Name => callback.my_roles;
 
-        public override async Task<Message> Execute(Update update)
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             return await Bot.SendWithMarkdown2(ChatId, strings.my_roles);

+ 1 - 1
MafiaTelegramBot/Models/Inlines/SettingsQuery.cs

@@ -9,7 +9,7 @@ namespace MafiaTelegramBot.Models.Inlines
     {
         protected override string Name => callback.settings_profile;
 
-        public override async Task<Message> Execute(Update update)
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             var user = await UserDao.GetUserById(UserId);

+ 2 - 1
MafiaTelegramBot/Models/Inlines/SettingsRoomQuery.cs

@@ -7,7 +7,8 @@ namespace MafiaTelegramBot.Models.Inlines
     public class SettingsRoomQuery : Query
     {
         protected override string Name => callback.settings_room;
-        public override async Task<Message> Execute(Update update)
+
+        protected override async Task<Message> Execute(Update update)
         {
             return await Bot.SendWithMarkdown2(ChatId, strings.settings_room);
         }

+ 1 - 1
MafiaTelegramBot/Models/Inlines/ShopQuery.cs

@@ -8,7 +8,7 @@ namespace MafiaTelegramBot.Models.Inlines
     {
         protected override string Name => callback.shop;
 
-        public override async Task<Message> Execute(Update update)
+        protected override async Task<Message> Execute(Update update)
         {
             await DeletePreviousMessage(ChatId, update.CallbackQuery.Message.MessageId);
             return await Bot.SendWithMarkdown2(ChatId, strings.shop);

+ 3 - 3
MafiaTelegramBot/Models/UpdateModel.cs

@@ -10,10 +10,10 @@ namespace MafiaTelegramBot.Models
     public abstract class UpdateModel : ICloneable
     {
         protected abstract string Name { get; }
-        protected long ChatId { get; set; }
-        protected long UserId { get; set; }
+        protected long ChatId { get; private set; }
+        protected long UserId { get; private set; }
 
-        public abstract Task<Message> Execute(Update update);
+        protected abstract Task<Message> Execute(Update update);
 
         protected virtual bool Contains(string command)
         {