Petr Fedkin Fixes

CardCollector.sln.DotSettings.user

@@ -10,7 +10,7 @@
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FDailyTasks_002FDescriptions/@EntryIndexedValue">False</s:Boolean>
 	
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FDailyTasks_002FTitles/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FDailyTasks_002FTitles/@EntryIndexedValue">True</s:Boolean>
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FCommand/@EntryIndexedValue">False</s:Boolean>
 	
@@ -19,7 +19,7 @@
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FMessages/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FSortingTypes/@EntryIndexedValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FText/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FText/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FStickerEffects_002FEffectTranslations/@EntryIndexedValue">False</s:Boolean>
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>

CardCollector/Commands/CallbackQuery/CollectIncome.cs

@@ -14,11 +14,8 @@ namespace CardCollector.Commands.CallbackQuery
         {
             var result = await User.Cash.Payout(User.Stickers);
             await MessageController.AnswerCallbackQuery(User, CallbackQueryId, 
-                $"{Messages.you_collected} " +
-                $"{result}{Text.coin} " +
-                $"\n\n{Messages.your_cash}: " +
-                $"{User.Cash.Coins}{Text.coin} " +
-                $"{User.Cash.Gems}{Text.gem}", true);
+                $"{Messages.you_collected} {result}{Text.coin} " +
+                $"\n\n{Messages.your_cash}: {User.Cash.Coins}{Text.coin} {User.Cash.Gems}{Text.gem}", true);
             await MessageController.DeleteMessage(User, Update.CallbackQuery!.Message!.MessageId);
         }
 

CardCollector/Commands/PreCheckoutQuery/BuyGems.cs

@@ -17,8 +17,9 @@ namespace CardCollector.Commands.PreCheckoutQuery
             var gemsCount = 50 * Amount / 100;
             User.Cash.Gems += gemsCount;
             await MessageController.EditMessage(User, Messages.thanks_for_buying_gems);
-            await MessageController.SendMessage(User, 
-                $"{Messages.you_gained} {gemsCount * 2} {Text.exp} {Messages.buy_gems}");
+            if (User.Settings[UserSettingsEnum.ExpGain])
+                await MessageController.SendMessage(User, 
+                    $"{Messages.you_gained} {gemsCount * 2} {Text.exp} {Messages.buy_gems}");
             await User.GiveExp(gemsCount * 2);
         }
 

CardCollector/DailyTasks/Titles.Designer.cs

@@ -61,7 +61,7 @@ namespace CardCollector.DailyTasks {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Отправка стикеров 10-и пользователям.
+        ///   Looks up a localized string similar to Отправка стикеров 5-и пользователям.
         /// </summary>
         internal static string send_stickers {
             get {

CardCollector/DailyTasks/Titles.resx

@@ -19,6 +19,6 @@
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
     <data name="send_stickers" xml:space="preserve">
-        <value>Отправка стикеров 10-и пользователям</value>
+        <value>Отправка стикеров 5-и пользователям</value>
     </data>
 </root>

CardCollector/DataBase/EntityDao/StickerDao.cs

@@ -94,11 +94,11 @@ namespace CardCollector.DataBase.EntityDao
             }
         }
 
-        public static async Task<List<StickerEntity>> GetListWhere(Expression<Func<StickerEntity, bool>> func)
+        public static async Task<List<StickerEntity>> GetListWhere(Func<StickerEntity, bool> func)
         {
             try
             {
-                return await Table.Where(func).ToListAsync();
+                return (await Table.ToListAsync()).Where(func).ToList();
             }
             catch (InvalidOperationException)
             {

CardCollector/Resources/Messages.Designer.cs

@@ -475,7 +475,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Вы платите алмазов:.
+        ///   Looks up a localized string similar to Вы заплатите алмазов:.
         /// </summary>
         internal static string gems_exchange_count {
             get {

CardCollector/Resources/Messages.resx

@@ -240,7 +240,7 @@
         <value>Введите количество алмазов для обмена:</value>
     </data>
     <data name="gems_exchange_count" xml:space="preserve">
-        <value>Вы платите алмазов:</value>
+        <value>Вы заплатите алмазов:</value>
     </data>
     <data name="coins_exchange_count" xml:space="preserve">
         <value>Вы получите монет:</value>

CardCollector/TimerTasks/PiggyBankAlert.cs

@@ -9,8 +9,8 @@ namespace CardCollector.TimerTasks
 {
     public class PiggyBankAlert : TimerTask
     {
-        protected override TimeSpan RunAt => Constants.DEBUG 
-                ? new TimeSpan(DateTime.Now.TimeOfDay.Hours, DateTime.Now.TimeOfDay.Minutes + 1, 0)
+        protected override TimeSpan RunAt => Constants.DEBUG
+                ? new TimeSpan(DateTime.Now.TimeOfDay.Hours, DateTime.Now.TimeOfDay.Minutes, DateTime.Now.TimeOfDay.Seconds + 1000)
                 : new TimeSpan((DateTime.Now.TimeOfDay.Hours / 4 + 1) * 4, 0, 0);
         
         protected override async void TimerCallback(object o, ElapsedEventArgs e)

CardCollector/TimerTasks/TopExpUsersAlert.cs

@@ -10,7 +10,7 @@ namespace CardCollector.TimerTasks
 {
     public class TopExpUsersAlert : TimerTask
     {
-        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 24, 0) : new TimeSpan(24, 0, 0);
+        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(13, 41, 20) : new TimeSpan(24, 0, 0);
         
         protected override async void TimerCallback(object o, ElapsedEventArgs e)
         {