Renaming and mini refactor

CardCollector/Commands/CallbackQuery/CallbackQuery.cs

@@ -66,7 +66,7 @@ namespace CardCollector.Commands.CallbackQuery
             /* Команда удаления из комбинации */
             new CombineStickers(),
             //команда подтверждения выставления на аукцион
-            new PutForAuctionPart2Query(),
+            new ConfirmationSellingQuery(),
             /* Отмена в момент выбора "значения фильтра", не в самом меню */
             new BackToFiltersMenu(),
             /* Очистка чата */

CardCollector/Commands/CallbackQuery/CancelCallback.cs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using CardCollector.Commands.Message.TextMessage;
 using CardCollector.DataBase.Entity;
 using CardCollector.Resources;
 using Telegram.Bot.Types;
@@ -12,6 +13,9 @@ namespace CardCollector.Commands.CallbackQuery
         {
             User.Session.State = UserState.Default;
             User.Session.SelectedSticker = null;
+            EnterEmojiMessage.RemoveFromQueue(User.Id);
+            EnterCoinsPriceMessage.RemoveFromQueue(User.Id);
+            EnterGemsPriceMessage.RemoveFromQueue(User.Id);
             await User.ClearChat();
         }
 

CardCollector/Commands/CallbackQuery/ConfirmationSellingQuery.cs

@@ -0,0 +1,28 @@
+using System.Threading.Tasks;
+using CardCollector.Commands.Message.TextMessage;
+using CardCollector.Controllers;
+using CardCollector.DataBase.Entity;
+using CardCollector.Resources;
+using Telegram.Bot.Types;
+
+namespace CardCollector.Commands.CallbackQuery
+{
+    public class ConfirmationSellingQuery : CallbackQuery
+    {
+        protected override string CommandText => Command.confirm_selling;
+        public override async Task Execute()
+        {
+            EnterCoinsPriceMessage.RemoveFromQueue(User.Id);
+            EnterGemsPriceMessage.RemoveFromQueue(User.Id);
+            await User.Session.PayOutOne(User.Session.SelectedSticker.Md5Hash);
+            await MessageController.AnswerCallbackQuery(User, CallbackQueryId, 
+                $"{Messages.you_collected} {User.Session.IncomeCoins}{Text.coin} / {User.Session.IncomeGems}{Text.gem}");
+            await AuctionController.SellCard(User, User.Session.CoinPrice, User.Session.GemPrice);
+            await MessageController.EditMessage(User, CallbackMessageId, Messages.successfully_selling);
+        }
+        public ConfirmationSellingQuery(){}
+        public ConfirmationSellingQuery(UserEntity user, Update update) : base(user, update){}
+    }
+    
+    
+}

CardCollector/Commands/CallbackQuery/PutForAuctionPart2Query.cs

@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using CardCollector.Controllers;
-using CardCollector.DataBase.Entity;
-using CardCollector.Resources;
-using Telegram.Bot.Types;
-
-namespace CardCollector.Commands.CallbackQuery
-{
-    public class PutForAuctionPart2Query:CallbackQuery
-    {
-        protected override string CommandText => Command.command_yes_on_auction;
-        public override async Task Execute()
-        {
-            await AuctionController.SellCard(User, User.Session.CoinPrice, User.Session.GemPrice);
-            await MessageController.EditMessage(User, CallbackMessageId, "Товар успешно попал на аукцион");
-
-        }
-        public PutForAuctionPart2Query(){}
-        public PutForAuctionPart2Query(UserEntity user, Update update) : base(user, update){}
-    }
-    
-    
-}

CardCollector/Commands/CallbackQuery/PutForAuctionQuery.cs

@@ -4,25 +4,26 @@ using CardCollector.Controllers;
 using CardCollector.DataBase.Entity;
 using CardCollector.Resources;
 using Telegram.Bot.Types;
-using Telegram.Bot.Types.ReplyMarkups;
 
 namespace CardCollector.Commands.CallbackQuery
 {
-    public class PutForAuctionQuery:CallbackQuery
+    public class PutForAuctionQuery : CallbackQuery
     {
         protected override string CommandText => Command.sell_on_auction;
+
         public override async Task Execute()
         {
             await User.ClearChat();
-            var message = await MessageController.SendMessage(User, "Введите монеты", Keyboard.CancelKeyboard);
-            EnterPriceMessage.AddToQueue(User.Id, message.MessageId);
-            
-            
-
+            User.Session.CoinPrice = User.Session.SelectedSticker.PriceCoins;
+            User.Session.GemPrice = User.Session.SelectedSticker.PriceGems;
+            var message = await MessageController.SendMessage(User,
+                $"{Messages.current_price} {User.Session.CoinPrice}{Text.coin} / {User.Session.GemPrice}{Text.gem}" +
+                $"\n{Messages.enter_your_coins_price} {Text.coin}:", Keyboard.AuctionPutCancelKeyboard);
+            EnterCoinsPriceMessage.AddToQueue(User.Id, message.MessageId);
+            User.Session.Messages.Add(message.MessageId);
         }
-        
-        
-        public PutForAuctionQuery() {}
+
+        public PutForAuctionQuery() { }
         public PutForAuctionQuery(UserEntity user, Update update) : base(user, update) { }
     }
 }

CardCollector/Commands/Message/Message.cs

@@ -43,12 +43,12 @@ namespace CardCollector.Commands.Message
                 // Ожидание ввода эмоджи
                 new EnterEmojiMessage(),
                 //Очередь воода цены на аукцион
-                new EnterPriceMessage(),
+                new EnterCoinsPriceMessage(),
                 // Загрузка стикерпака
                 new DownloadStickerPackMessage(),
                 //команда ввода цены
-                new EnterPriceMessage(),
-                new EnterPricePart2Message(),
+                new EnterCoinsPriceMessage(),
+                new EnterGemsPriceMessage(),
                 // Команда "Показать пример"
                 new ShowSampleMessage(),
                 // Команда "Остановить"

CardCollector/Commands/Message/TextMessage/EnterPriceMessage.cs → CardCollector/Commands/Message/TextMessage/EnterCoinsPriceMessage.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using CardCollector.Controllers;
 using CardCollector.DataBase.Entity;
@@ -9,31 +7,28 @@ using Telegram.Bot.Types;
 
 namespace CardCollector.Commands.Message.TextMessage
 {
-    public class EnterPriceMessage : Message
+    public class EnterCoinsPriceMessage : Message
     {
         protected override string CommandText => "";
-        private const string pattern = @"^[0-9]+$";
 
         //Список пользователей, от которых ожидается ввод эмоджи ключ - id пользователя, значение - сообщение с меню #1#
         private static readonly Dictionary<long, int> Queue = new ();
 
         public override async Task Execute()
         {
-            
-            var input = "" + Update.Message!
-                .Text; // это чтоб варн не показывлся, тут никогда не null, так как в Factory все уже проверено
-            /* если пользователь ввел что-то кроме эмодзи */
-            if (!Regex.IsMatch(input, pattern))
-                await MessageController.EditMessage(User, Queue[User.Id], Messages.please_enter_price,
-                    Keyboard.CancelKeyboard);
+            if (!int.TryParse(Update.Message!.Text, out var price) || price < 0)
+                await MessageController.EditMessage(User, Queue[User.Id], 
+                    $"{Messages.current_price} {User.Session.CoinPrice}{Text.coin} / {User.Session.GemPrice}{Text.gem}" +
+                    $"\n{Messages.please_enter_price}", Keyboard.AuctionPutCancelKeyboard);
             else
             {
-                User.Session.CoinPrice = Convert.ToInt32(input);
+                User.Session.CoinPrice = price;
                 /* Редактируем сообщение */
-                await MessageController.EditMessage(User, Queue[User.Id], "Введите алмазы", Keyboard.CancelKeyboard);
-                EnterPricePart2Message.AddToQueue(User.Id,Queue[User.Id]);
+                await MessageController.EditMessage(User, Queue[User.Id], 
+                    $"{Messages.current_price} {User.Session.CoinPrice}{Text.coin} / {User.Session.GemPrice}{Text.gem}" +
+                    $"{Messages.enter_your_gems_price} {Text.gem}:", Keyboard.AuctionPutCancelKeyboard);
+                EnterGemsPriceMessage.AddToQueue(User.Id,Queue[User.Id]);
                 Queue.Remove(User.Id);
-                
             }
         }
 
@@ -55,7 +50,7 @@ namespace CardCollector.Commands.Message.TextMessage
             return User == null ? base.IsMatches(command) : Queue.ContainsKey(User.Id);
         }
 
-        public EnterPriceMessage() { }
-        public EnterPriceMessage(UserEntity user, Update update) : base(user, update) { }
-        }
+        public EnterCoinsPriceMessage() { }
+        public EnterCoinsPriceMessage(UserEntity user, Update update) : base(user, update) { }
+    }
 }

CardCollector/Commands/Message/TextMessage/EnterPricePart2Message.cs → CardCollector/Commands/Message/TextMessage/EnterGemsPriceMessage.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using CardCollector.Controllers;
 using CardCollector.DataBase.Entity;
@@ -10,25 +7,24 @@ using Telegram.Bot.Types;
 
 namespace CardCollector.Commands.Message.TextMessage
 {
-    public class EnterPricePart2Message : Message
+    public class EnterGemsPriceMessage : Message
     {
-        private const string pattern = @"^[0-9]+$";
         protected override string CommandText => "";
         
         private static readonly Dictionary<long, int> Queue = new ();
         public override async Task Execute()
         {
-            var input = "" + Update.Message!.Text;
             /* если пользователь ввел что-то кроме эмодзи */
-            if (!Regex.IsMatch(input, pattern))
-                await MessageController.EditMessage(User, Queue[User.Id], Messages.please_enter_price,
-                    Keyboard.CancelKeyboard);
+            if (!int.TryParse(Update.Message!.Text, out var price) || price < 0)
+                await MessageController.EditMessage(User, Queue[User.Id], 
+                    $"{Messages.current_price} {User.Session.CoinPrice}{Text.coin} / {User.Session.GemPrice}{Text.gem}" +
+                    $"\n{Messages.please_enter_price}", Keyboard.AuctionPutCancelKeyboard);
             else
             {
-                User.Session.GemPrice = Convert.ToInt32(input);
+                User.Session.GemPrice = price;
                 await MessageController.EditMessage(User, Queue[User.Id],
-                    "Подтвердите сумму" + $"{User.Session.CoinPrice}" +
-                    " Монет и" + $"{User.Session.GemPrice}" + "Алмазов",Keyboard.GetConfirmationKeyboard(Command.command_yes_on_auction));
+                    $"{Messages.confirm_selling} {User.Session.CoinPrice}{Text.coin} / {User.Session.GemPrice}{Text.gem}:", 
+                    Keyboard.AuctionPutCancelKeyboard);
                 Queue.Remove(User.Id);
             }
         }
@@ -51,11 +47,11 @@ namespace CardCollector.Commands.Message.TextMessage
             return User == null ? base.IsMatches(command) : Queue.ContainsKey(User.Id);
         }
 
-        public EnterPricePart2Message()
+        public EnterGemsPriceMessage()
         {
         }
 
-        public EnterPricePart2Message(UserEntity user, Update update) : base(user, update)
+        public EnterGemsPriceMessage(UserEntity user, Update update) : base(user, update)
         {
         }
     }

CardCollector/Controllers/AuctionController.cs

@@ -20,16 +20,10 @@ namespace CardCollector.Controllers
         count - количество продаваемых стикеров*/
         public static async Task SellCard(UserEntity user, int priceCoins, int priceGems)
         {
-            /* Учитывая, что мы будем управлять кнопками + и -, то сюда никогда не поступят ложные данные
-             решил метод упростить и задачу проверки переложил на взаимодействие с ботом 
-             Пускай сам аукцион делает только то - что должен, проверки в сделку не входили
-             Также в сессии пользователя теперь есть данные о выбранном текущем стикере, 
-             так что можно не передавать хеш код  и количество */
             //подтверждаем действие
             var hash = user.Session.SelectedSticker.Md5Hash;
             user.Stickers[hash].Count -= user.Session.SelectedSticker.Count;
-            /* Пока не думаю, что стоит сразу начислять сумму, пускай останется на будущее
-            user.Cash.Coins += price * count;*/
+            /* user.Cash.Coins += price * count; */
             var product = new AuctionEntity
             {
                 PriceCoins = priceCoins,
@@ -38,7 +32,6 @@ namespace CardCollector.Controllers
                 StickerId = user.Session.SelectedSticker.Id,
                 Trader = user.Id
             };
-            // TODO реализовать добавление позиции на аукцион
             AuctionDao.AddNew(product);
         }
         

CardCollector/Resources/Command.Designer.cs

@@ -61,7 +61,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to author.
+        ///   Looks up a localized string similar to AAA.
         /// </summary>
         internal static string author {
             get {
@@ -70,7 +70,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to back.
+        ///   Looks up a localized string similar to AAB.
         /// </summary>
         internal static string back {
             get {
@@ -79,7 +79,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to back_to_combine.
+        ///   Looks up a localized string similar to AAC.
         /// </summary>
         internal static string back_to_combine {
             get {
@@ -88,7 +88,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to back_to_sticker.
+        ///   Looks up a localized string similar to AAD.
         /// </summary>
         internal static string back_to_sticker {
             get {
@@ -97,7 +97,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to buy.
+        ///   Looks up a localized string similar to AAE.
         /// </summary>
         internal static string buy_sticker {
             get {
@@ -106,7 +106,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to cancel.
+        ///   Looks up a localized string similar to AAF.
         /// </summary>
         internal static string cancel {
             get {
@@ -115,7 +115,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to clear.
+        ///   Looks up a localized string similar to AAG.
         /// </summary>
         internal static string clear_chat {
             get {
@@ -124,7 +124,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to collect_income.
+        ///   Looks up a localized string similar to AAH.
         /// </summary>
         internal static string collect_income {
             get {
@@ -133,7 +133,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to combine.
+        ///   Looks up a localized string similar to AAI.
         /// </summary>
         internal static string combine {
             get {
@@ -142,7 +142,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to comb_stickers.
+        ///   Looks up a localized string similar to AAJ.
         /// </summary>
         internal static string combine_stickers {
             get {
@@ -151,16 +151,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to sell_product.
-        /// </summary>
-        internal static string command_yes_on_auction {
-            get {
-                return ResourceManager.GetString("command_yes_on_auction", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to confirm_buying.
+        ///   Looks up a localized string similar to AAL.
         /// </summary>
         internal static string confirm_buying {
             get {
@@ -169,7 +160,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to confirm_selling.
+        ///   Looks up a localized string similar to AAM.
         /// </summary>
         internal static string confirm_selling {
             get {
@@ -178,7 +169,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to count.
+        ///   Looks up a localized string similar to AAN.
         /// </summary>
         internal static string count {
             get {
@@ -187,7 +178,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to delete.
+        ///   Looks up a localized string similar to AAO.
         /// </summary>
         internal static string delete_combine {
             get {
@@ -196,7 +187,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to emoji.
+        ///   Looks up a localized string similar to AAP.
         /// </summary>
         internal static string emoji {
             get {
@@ -205,7 +196,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to price.
+        ///   Looks up a localized string similar to AAQ.
         /// </summary>
         internal static string price {
             get {
@@ -214,7 +205,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to price_coins_from.
+        ///   Looks up a localized string similar to AAR.
         /// </summary>
         internal static string price_coins_from {
             get {
@@ -223,7 +214,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to price_coins_to.
+        ///   Looks up a localized string similar to AAS.
         /// </summary>
         internal static string price_coins_to {
             get {
@@ -232,7 +223,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to price_gems_from.
+        ///   Looks up a localized string similar to AAT.
         /// </summary>
         internal static string price_gems_from {
             get {
@@ -241,7 +232,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to price_gems_to.
+        ///   Looks up a localized string similar to AAU.
         /// </summary>
         internal static string price_gems_to {
             get {
@@ -250,7 +241,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to select.
+        ///   Looks up a localized string similar to AAV.
         /// </summary>
         internal static string select_sticker {
             get {
@@ -259,7 +250,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to sell.
+        ///   Looks up a localized string similar to AAW.
         /// </summary>
         internal static string sell_on_auction {
             get {
@@ -268,7 +259,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to send.
+        ///   Looks up a localized string similar to AAX.
         /// </summary>
         internal static string send_sticker {
             get {
@@ -277,7 +268,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to set.
+        ///   Looks up a localized string similar to AAY.
         /// </summary>
         internal static string set {
             get {
@@ -286,16 +277,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to show_traders.
-        /// </summary>
-        internal static string show_traders {
-            get {
-                return ResourceManager.GetString("show_traders", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to sort.
+        ///   Looks up a localized string similar to ABA.
         /// </summary>
         internal static string sort {
             get {
@@ -313,7 +295,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to tier.
+        ///   Looks up a localized string similar to ABB.
         /// </summary>
         internal static string tier {
             get {
@@ -322,7 +304,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to unlim.
+        ///   Looks up a localized string similar to ABC.
         /// </summary>
         internal static string unlimited_stickers {
             get {

CardCollector/Resources/Command.resx

@@ -19,93 +19,87 @@
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
     <data name="collect_income" xml:space="preserve">
-        <value>collect_income</value>
+        <value>AAH</value>
     </data>
     <data name="author" xml:space="preserve">
-        <value>author</value>
+        <value>AAA</value>
     </data>
     <data name="tier" xml:space="preserve">
-        <value>tier</value>
+        <value>ABB</value>
     </data>
     <data name="emoji" xml:space="preserve">
-        <value>emoji</value>
+        <value>AAP</value>
     </data>
     <data name="sort" xml:space="preserve">
-        <value>sort</value>
+        <value>ABA</value>
     </data>
     <data name="cancel" xml:space="preserve">
-        <value>cancel</value>
+        <value>AAF</value>
     </data>
     <data name="set" xml:space="preserve">
-        <value>set</value>
+        <value>AAY</value>
     </data>
     <data name="back" xml:space="preserve">
-        <value>back</value>
+        <value>AAB</value>
     </data>
     <data name="unlimited_stickers" xml:space="preserve">
-        <value>unlim</value>
+        <value>ABC</value>
     </data>
     <data name="send_sticker" xml:space="preserve">
-        <value>send</value>
+        <value>AAX</value>
     </data>
     <data name="select_sticker" xml:space="preserve">
-        <value>select</value>
+        <value>AAV</value>
     </data>
     <data name="price_coins_from" xml:space="preserve">
-        <value>price_coins_from</value>
+        <value>AAR</value>
     </data>
     <data name="price_coins_to" xml:space="preserve">
-        <value>price_coins_to</value>
+        <value>AAS</value>
     </data>
     <data name="price_gems_from" xml:space="preserve">
-        <value>price_gems_from</value>
+        <value>AAT</value>
     </data>
     <data name="price_gems_to" xml:space="preserve">
-        <value>price_gems_to</value>
+        <value>AAU</value>
     </data>
     <data name="price" xml:space="preserve">
-        <value>price</value>
+        <value>AAQ</value>
     </data>
     <data name="buy_sticker" xml:space="preserve">
-        <value>buy</value>
+        <value>AAE</value>
     </data>
     <data name="clear_chat" xml:space="preserve">
-        <value>clear</value>
+        <value>AAG</value>
     </data>
     <data name="combine" xml:space="preserve">
-        <value>combine</value>
+        <value>AAI</value>
     </data>
     <data name="sell_on_auction" xml:space="preserve">
-        <value>sell</value>
+        <value>AAW</value>
     </data>
     <data name="count" xml:space="preserve">
-        <value>count</value>
+        <value>AAN</value>
     </data>
     <data name="confirm_buying" xml:space="preserve">
-        <value>confirm_buying</value>
+        <value>AAL</value>
     </data>
     <data name="confirm_selling" xml:space="preserve">
-        <value>confirm_selling</value>
-    </data>
-    <data name="show_traders" xml:space="preserve">
-        <value>show_traders</value>
+        <value>AAM</value>
     </data>
     <data name="back_to_sticker" xml:space="preserve">
-        <value>back_to_sticker</value>
+        <value>AAD</value>
     </data>
     <data name="back_to_combine" xml:space="preserve">
-        <value>back_to_combine</value>
+        <value>AAC</value>
     </data>
     <data name="delete_combine" xml:space="preserve">
-        <value>delete</value>
+        <value>AAO</value>
     </data>
     <data name="combine_stickers" xml:space="preserve">
-        <value>comb_stickers</value>
+        <value>AAJ</value>
     </data>
     <data name="stop_bot" xml:space="preserve">
         <value>Остановить</value>
     </data>
-    <data name="command_yes_on_auction" xml:space="preserve">
-        <value>sell_product</value>
-    </data>
 </root>

CardCollector/Resources/Constants.cs

@@ -10,7 +10,7 @@ namespace CardCollector.Resources
         /* Время кэширования результатов @имя_бота команд */
         public const int INLINE_RESULTS_CACHE_TIME = 1;
         /* Включает бесконечные стикеры без наличия их в коллекции */
-        public static readonly bool UNLIMITED_ALL_STICKERS = DEBUG;
+        public static readonly bool UNLIMITED_ALL_STICKERS = !DEBUG;
 
 
         /* Уровни привилегий пользователей системы */

CardCollector/Resources/Keyboard.cs

@@ -76,6 +76,13 @@ namespace CardCollector.Resources
             new[] {InlineKeyboardButton.WithCallbackData(Text.cancel, Command.cancel)},
         });
 
+        /* Клавиатура с отменой и выставлением */
+        public static readonly InlineKeyboardMarkup AuctionPutCancelKeyboard = new (new[]
+        {
+            new[] {InlineKeyboardButton.WithCallbackData(Text.sell_on_auction, Command.confirm_selling)},
+            new[] {InlineKeyboardButton.WithCallbackData(Text.cancel, Command.cancel)},
+        });
+
         /* Клавиатура меню выбора цен */
         public static readonly InlineKeyboardMarkup PriceOptions = new (new[]
         {
@@ -207,7 +214,7 @@ namespace CardCollector.Resources
             var keyboard = new List<InlineKeyboardButton[]>
             {
                 new[] {InlineKeyboardButton.WithSwitchInlineQuery(Text.send_sticker, stickerInfo.Title)},
-                new[] {InlineKeyboardButton.WithCallbackData($"{Text.sell_on_auction} ({stickerInfo.Count})", Command.confirm_selling)},
+                new[] {InlineKeyboardButton.WithCallbackData($"{Text.sell_on_auction} ({stickerInfo.Count})", Command.sell_on_auction)},
                 new[]
                 {
                     InlineKeyboardButton.WithCallbackData(Text.minus, $"{Command.count}-"),

CardCollector/Resources/Messages.Designer.cs

@@ -186,6 +186,15 @@ namespace CardCollector.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Подтвердите выставление.
+        /// </summary>
+        internal static string confirm_selling {
+            get {
+                return ResourceManager.GetString("confirm_selling", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Текущие примененные фильтры:.
         /// </summary>
@@ -195,6 +204,15 @@ namespace CardCollector.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Текущая стоимость.
+        /// </summary>
+        internal static string current_price {
+            get {
+                return ResourceManager.GetString("current_price", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Удаляю файлы....
         /// </summary>
@@ -240,6 +258,24 @@ namespace CardCollector.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Введите вашу стоимость в монетах.
+        /// </summary>
+        internal static string enter_your_coins_price {
+            get {
+                return ResourceManager.GetString("enter_your_coins_price", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Введите вашу стоимость в алмазах.
+        /// </summary>
+        internal static string enter_your_gems_price {
+            get {
+                return ResourceManager.GetString("enter_your_gems_price", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Алмазы.
         /// </summary>
@@ -357,6 +393,15 @@ namespace CardCollector.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Товар успешно попал на аукцион.
+        /// </summary>
+        internal static string successfully_selling {
+            get {
+                return ResourceManager.GetString("successfully_selling", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Тир:.
         /// </summary>

CardCollector/Resources/Messages.resx

@@ -141,4 +141,19 @@
     <data name="please_enter_price" xml:space="preserve">
         <value>Пожалуйста, введите положительное целое число</value>
     </data>
+    <data name="current_price" xml:space="preserve">
+        <value>Текущая стоимость</value>
+    </data>
+    <data name="enter_your_coins_price" xml:space="preserve">
+        <value>Введите вашу стоимость в монетах</value>
+    </data>
+    <data name="enter_your_gems_price" xml:space="preserve">
+        <value>Введите вашу стоимость в алмазах</value>
+    </data>
+    <data name="confirm_selling" xml:space="preserve">
+        <value>Подтвердите выставление</value>
+    </data>
+    <data name="successfully_selling" xml:space="preserve">
+        <value>Товар успешно попал на аукцион</value>
+    </data>
 </root>