Tigran il y a 3 ans
Parent
commit
8e0163061e

+ 1 - 1
CardCollector/Commands/CallbackQuery/BuyCoins.cs

@@ -20,7 +20,7 @@ namespace CardCollector.Commands.CallbackQuery
                 $"{Messages.exchange_mesage}" +
                 $"\n{Messages.gems_exchange_count} {module.EnteredExchangeSum}{Text.gem}" +
                 $"\n{Messages.coins_exchange_count} {module.EnteredExchangeSum * 150}{Text.coin}" +
-                $"\n{Messages.enter_exchange_sum}",
+                $"\n\n{Messages.enter_exchange_sum}",
                 Keyboard.BuyCoinsKeyboard);
         }
 

+ 4 - 2
CardCollector/Commands/Message/TextMessage/EnterEmoji.cs

@@ -26,10 +26,12 @@ namespace CardCollector.Commands.Message.TextMessage
             var input = Update.Message!.Text;
             /* если пользователь ввел что-то кроме эмодзи */
             if (!Regex.IsMatch(input!, onlyEmojiPattern))
-                await MessageController.EditMessage(User, Queue[User.Id], Messages.please_enter_emoji, Keyboard.EmojiOptions);
+                await MessageController.EditMessage(User, Queue[User.Id], Messages.please_enter_emoji,
+                    Keyboard.EmojiOptions);
             /* если пользователь ввел несколько эмодзи или эмодзи и текст */
             else if (!Regex.IsMatch(input, oneEmojiPattern))
-                await MessageController.EditMessage(User, Queue[User.Id], Messages.enter_only_one_emoji, Keyboard.EmojiOptions);
+                await MessageController.EditMessage(User, Queue[User.Id], Messages.enter_only_one_emoji,
+                    Keyboard.EmojiOptions);
             else
             {
                 var filtersModule = User.Session.GetModule<FiltersModule>();

+ 4 - 4
CardCollector/Commands/Message/TextMessage/EnterGemsExchange.cs

@@ -18,20 +18,20 @@ namespace CardCollector.Commands.Message.TextMessage
         {
             var module = User.Session.GetModule<ShopModule>();
             if (!int.TryParse(Update.Message!.Text, out var sum) || sum < 0)
-                await MessageController.EditMessage(User, Queue[User.Id], 
+                await MessageController.EditMessage(User, Queue[User.Id],
                     $"{Messages.exchange_mesage}" +
                     $"\n{Messages.gems_exchange_count} {module.EnteredExchangeSum}{Text.gem}" +
                     $"\n{Messages.coins_exchange_count} {module.EnteredExchangeSum * 150}{Text.coin}" +
-                    $"\n{Messages.please_enter_integer}",
+                    $"\n\n{Messages.please_enter_integer}",
                     Keyboard.BuyCoinsKeyboard);
             else
             {
-                module.EnteredExchangeSum = sum;
+                module.EnteredExchangeSum = sum; 
                 await MessageController.EditMessage(User, Queue[User.Id], 
                     $"{Messages.exchange_mesage}" +
                     $"\n{Messages.gems_exchange_count} {module.EnteredExchangeSum}{Text.gem}" +
                     $"\n{Messages.coins_exchange_count} {module.EnteredExchangeSum * 150}{Text.coin}" +
-                    $"\n{Messages.confirm_exchange}",
+                    $"\n\n{Messages.confirm_exchange}",
                     Keyboard.BuyCoinsKeyboard);
                 Queue.Remove(User.Id);
             }

+ 3 - 1
CardCollector/Commands/Message/TextMessage/EnterGemsPrice.cs

@@ -19,9 +19,11 @@ namespace CardCollector.Commands.Message.TextMessage
             /* если пользователь ввел что-то кроме эмодзи */
             var module = User.Session.GetModule<CollectionModule>();
             if (!int.TryParse(Update.Message!.Text, out var price) || price < 0)
-                await MessageController.EditMessage(User, Queue[User.Id], 
+            {
+                await MessageController.EditMessage(User, Queue[User.Id],
                     $"{Messages.current_price} {module.SellPrice}{Text.gem}\n{Messages.please_enter_integer}",
                     Keyboard.AuctionPutCancelKeyboard);
+            }
             else
             {
                 module.SellPrice = price;

+ 2 - 2
CardCollector/Controllers/MessageController.cs

@@ -145,9 +145,9 @@ namespace CardCollector.Controllers
                 if (!user.IsBlocked)
                     return await Bot.Client.EditMessageTextAsync(user.ChatId, messageId, message, replyMarkup: keyboard);
             }
-            catch (Exception)
+            catch (ApiRequestException e)
             {
-                return await SendMessage(user, message, keyboard);
+                if (e.ErrorCode != 400) return await SendMessage(user, message, keyboard);
             }
             return new Message();
         }