Tigran 3 years ago
parent
commit
aab5404b9f

+ 3 - 1
CardCollector/Commands/Message/Shop.cs

@@ -5,6 +5,7 @@ using CardCollector.DataBase.EntityDao;
 using CardCollector.Resources;
 using CardCollector.Session.Modules;
 using Telegram.Bot.Types;
+using Telegram.Bot.Types.Enums;
 
 namespace CardCollector.Commands.Message
 {
@@ -21,7 +22,8 @@ namespace CardCollector.Commands.Message
             User.Session.InitNewModule<ShopModule>();
             var haveSpecialOffers = await (await ShopDao.GetSpecialPositions())
                 .AnyAsync(async offer => offer.IsInfinite || !await SpecialOfferUsersDao.NowUsed(User.Id, offer.Id));
-            await MessageController.EditMessage(User, Messages.shop_message, Keyboard.ShopKeyboard(haveSpecialOffers));
+            await MessageController.EditMessage(User, Messages.shop_message, Keyboard.ShopKeyboard(haveSpecialOffers),
+                ParseMode.Html);
         }
         
         public Shop() { }

+ 1 - 1
CardCollector/Resources/Constants.cs

@@ -5,7 +5,7 @@ namespace CardCollector.Resources
     public static class Constants
     {
         /* Переключить данный флаг при сборке на сервер */
-        public const bool DEBUG = true;
+        public const bool DEBUG = false;
 
         /* Интервал сохранения изменений */
         public const double SAVING_CHANGES_INTERVAL = DEBUG ? 10 * 1000 : 5 * 60 * 1000;

+ 9 - 2
CardCollector/TimerTasks/PiggyBankAlert.cs

@@ -9,8 +9,15 @@ namespace CardCollector.TimerTasks
 {
     public class PiggyBankAlert : TimerTask
     {
-        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(10, 34, 0) : new TimeSpan((DateTime.Now.TimeOfDay.Hours % 4 + 1) * 4, 0, 0);
-
+        protected override TimeSpan RunAt => Get();
+        public TimeSpan Get()
+        {
+            Logs.LogOut("Get PiggyBankAlert RunAt");
+            return Constants.DEBUG 
+                ? new TimeSpan(10, 34, 0) 
+                : new TimeSpan((DateTime.Now.TimeOfDay.Hours % 4 + 1) * 4, 0, 0);
+        }
+        
         protected override async void TimerCallback(object o, ElapsedEventArgs e)
         {
             var users = await UserDao.GetAllWhere(user => !user.IsBlocked);