From c22930eb7a26dd17474d229e4fa8105e9f2981eb Mon Sep 17 00:00:00 2001
From: Ryzhehvost <kotlyar.andrey@gmail.com>
Date: Sat, 13 Jul 2019 22:38:10 +0300
Subject: [PATCH] Remove time convertor, it's not needed anymore. Also improved
 logging/responses

---
 ArchiSteamFarm                       |  2 +-
 BoosterCreator.sln                   |  4 +--
 BoosterCreator/BoosterCreator.cs     |  4 +--
 BoosterCreator/BoosterCreator.csproj | 13 +++++----
 BoosterCreator/BoosterHandler.cs     | 43 ++++++++++++++++++----------
 BoosterCreator/ValveTimeZone.cs      | 26 -----------------
 build.bat                            |  4 +++
 7 files changed, 45 insertions(+), 51 deletions(-)
 delete mode 100644 BoosterCreator/ValveTimeZone.cs
 create mode 100644 build.bat

diff --git a/ArchiSteamFarm b/ArchiSteamFarm
index 5a2f4b8..a76fe94 160000
--- a/ArchiSteamFarm
+++ b/ArchiSteamFarm
@@ -1 +1 @@
-Subproject commit 5a2f4b89c708b7319784afbf136f2effa80db786
+Subproject commit a76fe94617632a2dcf03ea26278549b08f750e36
diff --git a/BoosterCreator.sln b/BoosterCreator.sln
index 1a9c2ca..72f9a8e 100644
--- a/BoosterCreator.sln
+++ b/BoosterCreator.sln
@@ -17,8 +17,8 @@ Global
 		{C485E0CB-4D22-4A09-8CBA-83D1300A83DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C485E0CB-4D22-4A09-8CBA-83D1300A83DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C485E0CB-4D22-4A09-8CBA-83D1300A83DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF84911C-2C4C-4195-8AF3-ABBB6D3DE9AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF84911C-2C4C-4195-8AF3-ABBB6D3DE9AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF84911C-2C4C-4195-8AF3-ABBB6D3DE9AA}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{CF84911C-2C4C-4195-8AF3-ABBB6D3DE9AA}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{CF84911C-2C4C-4195-8AF3-ABBB6D3DE9AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF84911C-2C4C-4195-8AF3-ABBB6D3DE9AA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/BoosterCreator/BoosterCreator.cs b/BoosterCreator/BoosterCreator.cs
index 3c398dd..5bd318a 100644
--- a/BoosterCreator/BoosterCreator.cs
+++ b/BoosterCreator/BoosterCreator.cs
@@ -13,7 +13,7 @@ public sealed class BoosterCreator : IBotModules, IBotCommand {
 		public string Name => nameof(BoosterCreator);
 		public Version Version => typeof(BoosterCreator).Assembly.GetName().Version;
 
-		public void OnLoaded() => ASF.ArchiLogger.LogGenericInfo("BoosterCreator ASF Plugin by Out | Support: https://steamcommunity.com/id/outzzz");
+		public void OnLoaded() => ASF.ArchiLogger.LogGenericInfo("BoosterCreator ASF Plugin by Out (https://steamcommunity.com/id/outzzz) | fork by Ryzhehvost");
 
 		public async Task<string> OnBotCommand(Bot bot, ulong steamID, string message, string[] args) => await Commands.Response(bot, steamID, message, args).ConfigureAwait(false);
 
@@ -30,7 +30,7 @@ public async void OnBotInitModules(Bot bot, IReadOnlyDictionary<string, JToken>
 							BoosterHandler.BoosterHandlers[bot.BotName] = null;
 						}
 
-						bot.ArchiLogger.LogGenericInfo("GamesToBooster:" + string.Join(",", configProperty.Value));
+						bot.ArchiLogger.LogGenericInfo("GamesToBooster : " + string.Join(",", configProperty.Value));
 						await Task.Run(() => BoosterHandler.BoosterHandlers[bot.BotName] = new BoosterHandler(bot, configProperty.Value.ToObject<HashSet<uint>>())).ConfigureAwait(false);
 						break;
 					}
diff --git a/BoosterCreator/BoosterCreator.csproj b/BoosterCreator/BoosterCreator.csproj
index bf02ce0..4633b02 100644
--- a/BoosterCreator/BoosterCreator.csproj
+++ b/BoosterCreator/BoosterCreator.csproj
@@ -7,17 +7,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Composition.AttributedModel" Version="1.3.0-preview.19073.11" />
+    <Compile Remove="ValveTimeZone.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ArchiSteamFarm\ArchiSteamFarm\ArchiSteamFarm.csproj" />
+    <PackageReference Include="System.Composition.AttributedModel" Version="1.3.0-preview5.19224.8" />
   </ItemGroup>
+
   <ItemGroup>
-    <Reference Include="SteamKit2">
-      <HintPath>..\ArchiSteamFarm\ArchiSteamFarm\lib\SteamKit2.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\ArchiSteamFarm\ArchiSteamFarm\ArchiSteamFarm.csproj" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="mkdir $(TargetDir)BoosterCreator&#xD;&#xA;copy $(TargetPath) $(TargetDir)BoosterCreator\&#xD;&#xA;7z a -tzip -mx7  BoosterCreator.zip $(TargetDir)BoosterCreator" />
+  </Target>
+
 
 </Project>
diff --git a/BoosterCreator/BoosterHandler.cs b/BoosterCreator/BoosterHandler.cs
index 92b1d33..92f114b 100644
--- a/BoosterCreator/BoosterHandler.cs
+++ b/BoosterCreator/BoosterHandler.cs
@@ -24,8 +24,9 @@ internal sealed class BoosterHandler : IDisposable {
 
 		internal BoosterHandler([NotNull] Bot bot, IReadOnlyCollection<uint> gameIDs) {
 			Bot = bot ?? throw new ArgumentNullException(nameof(bot));
-			foreach (var gameID in gameIDs) {
+			foreach (uint gameID in gameIDs) {
 				GameIDs.TryAdd(gameID, DateTime.Now.AddHours(1));
+				ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Auto-attepmt to make booster from " + gameID.ToString() + " is planned at " + GameIDs[gameID].Value.ToShortDateString() + " " + GameIDs[gameID].Value.ToShortTimeString()));
 			}
 
 			BoosterTimer = new Timer(
@@ -43,8 +44,9 @@ private async Task AutoBooster() {
 				return;
 			}
 
-			string response = await CreateBooster(Bot, GameIDs).ConfigureAwait(false);
-			ASF.ArchiLogger.LogGenericInfo(response);
+			//string response =
+			await CreateBooster(Bot, GameIDs).ConfigureAwait(false);
+			//ASF.ArchiLogger.LogGenericInfo(response);
 		}
 
 		internal static async Task<string> CreateBooster(Bot bot, ConcurrentDictionary<uint, DateTime?> gameIDs) {
@@ -59,14 +61,16 @@ internal static async Task<string> CreateBooster(Bot bot, ConcurrentDictionary<u
 			if (boosterPage == null) {
 				bot.ArchiLogger.LogNullError(nameof(boosterPage));
 
-				return Strings.WarningFailed;
+				return Commands.FormatBotResponse(bot, string.Format(Strings.ErrorFailingRequest, boosterPage)); ;
 			}
 
 			MatchCollection gooAmounts = Regex.Matches(boosterPage.Text, "(?<=parseFloat\\( \")[0-9]+");
 			Match info = Regex.Match(boosterPage.Text, "\\[\\{\"[\\s\\S]*\"}]");
 
 			if (!info.Success || (gooAmounts.Count != 3)) {
-				return Strings.WarningFailed;
+				bot.ArchiLogger.LogGenericError(string.Format(Strings.ErrorParsingObject, boosterPage));
+				return Commands.FormatBotResponse(bot, string.Format(Strings.ErrorParsingObject, boosterPage));
+				//return Strings.WarningFailed;
 			}
 
 			uint gooAmount = uint.Parse(gooAmounts[0].Value);
@@ -77,15 +81,17 @@ internal static async Task<string> CreateBooster(Bot bot, ConcurrentDictionary<u
 
 			StringBuilder response = new StringBuilder();
 
-			foreach (var gameID in gameIDs) {
+			foreach (KeyValuePair<uint, DateTime?> gameID in gameIDs) {
 				if (!gameID.Value.HasValue || DateTime.Compare(gameID.Value.Value, DateTime.Now) <= 0) {
 					await Task.Delay(500).ConfigureAwait(false);
 
 					if (!boosterInfos.ContainsKey(gameID.Key)) {
-						response.AppendLine(Commands.FormatBotResponse(bot, string.Format(Strings.BotAddLicense, gameID, "NotEligible")));
+						response.AppendLine(Commands.FormatBotResponse(bot, "Not eligible to create boosters from " + gameID.Key.ToString()));
+						ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Not eligible to create boosters from " + gameID.Key.ToString()));
 						//If we are not eligible - wait 8 hours, just in case game will be added to account later
 						if (gameID.Value.HasValue) { //if source is timer, not command
 							gameIDs[gameID.Key] = DateTime.Now.AddHours(8);
+							ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Next attepmt to make booster from " + gameID.Key.ToString() + " is planned at " + gameIDs[gameID.Key].Value.ToShortDateString() + " " + gameIDs[gameID.Key].Value.ToShortTimeString()));
 						}
 						continue;
 					}
@@ -93,23 +99,26 @@ internal static async Task<string> CreateBooster(Bot bot, ConcurrentDictionary<u
 					Steam.BoosterInfo bi = boosterInfos[gameID.Key];
 
 					if (gooAmount < bi.Price) {
-						response.AppendLine(Commands.FormatBotResponse(bot, string.Format(Strings.BotAddLicense, gameID, "NotEnoughGems")));
+						response.AppendLine(Commands.FormatBotResponse(bot, "Not enough gems to create booster from " + gameID.Key.ToString()));
 						//If we have not enough gems - wait 8 hours, just in case gems will be added to account later
+						ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Not enough gems to create booster from " + gameID.Key.ToString()));
 						if (gameID.Value.HasValue) { //if source is timer, not command
 							gameIDs[gameID.Key] = DateTime.Now.AddHours(8);
+							ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Next attepmt to make booster from " + gameID.Key.ToString() + " is planned at " + gameIDs[gameID.Key].Value.ToShortDateString() + " " + gameIDs[gameID.Key].Value.ToShortTimeString()));
 						}
 						continue;
 					}
 
 					if (bi.Unavailable) {
-						response.AppendLine(Commands.FormatBotResponse(bot, string.Format(Strings.BotAddLicense, gameID, $"Available at time: {bi.AvailableAtTime}")));
+						response.AppendLine(Commands.FormatBotResponse(bot, "Crafting booster from " + gameID.Key.ToString() + "will be available at time: " + bi.AvailableAtTime));
+						ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Crafting booster from " + gameID.Key.ToString() + " is not availiable now"));
 						//Wait until specified time
-						DateTime availableAtTime;
 
-						if (DateTime.TryParseExact(bi.AvailableAtTime, "d MMM @ h:mmtt", CultureInfo.CurrentCulture, DateTimeStyles.None, out availableAtTime)) {
-							DateTime convertedTime = TimeZoneInfo.ConvertTime(availableAtTime, ValveTimeZone.GetTimeZoneInfo(), TimeZoneInfo.Local);
+						if (DateTime.TryParseExact(bi.AvailableAtTime, "d MMM @ h:mmtt", CultureInfo.CurrentCulture, DateTimeStyles.None, out DateTime availableAtTime)) {
+							/*DateTime convertedTime = TimeZoneInfo.ConvertTime(availableAtTime, ValveTimeZone.GetTimeZoneInfo(), TimeZoneInfo.Local);*/
 							if (gameID.Value.HasValue) { //if source is timer, not command
-								gameIDs[gameID.Key] = convertedTime;
+								gameIDs[gameID.Key] = availableAtTime;//convertedTime;
+								ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Next attepmt to make booster from " + gameID.Key.ToString() + " is planned at " + gameIDs[gameID.Key].Value.ToShortDateString() + " " + gameIDs[gameID.Key].Value.ToShortTimeString()));
 							}
 						} else {
 							ASF.ArchiLogger.LogGenericInfo("Unable to parse time \"" + bi.AvailableAtTime + "\", please report this.");
@@ -128,10 +137,12 @@ internal static async Task<string> CreateBooster(Bot bot, ConcurrentDictionary<u
 					Steam.BoostersResponse result = await WebRequest.CreateBooster(bot, bi.AppID, bi.Series, nTp).ConfigureAwait(false);
 
 					if (result?.Result?.Result != EResult.OK) {
-						response.AppendLine(Commands.FormatBotResponse(bot, string.Format(Strings.BotAddLicense, bi.AppID, EResult.Fail)));
+						response.AppendLine(Commands.FormatBotResponse(bot, "Failed to create booster from " + gameID.Key.ToString()));
+						ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Failed to create booster from " + gameID.Key.ToString()));
 						//Some unhandled error - wait 8 hours before retry
 						if (gameID.Value.HasValue) { //if source is timer, not command
 							gameIDs[gameID.Key] = DateTime.Now.AddHours(8);
+							ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Next attepmt to make booster from " + gameID.Key.ToString() + " is planned at " + gameIDs[gameID.Key].Value.ToShortDateString() + " " + gameIDs[gameID.Key].Value.ToShortTimeString()));
 						}
 						continue;
 					}
@@ -139,10 +150,12 @@ internal static async Task<string> CreateBooster(Bot bot, ConcurrentDictionary<u
 					gooAmount = result.GooAmount;
 					tradableGooAmount = result.TradableGooAmount;
 					unTradableGooAmount = result.UntradableGooAmount;
-					response.AppendLine(Commands.FormatBotResponse(bot, string.Format(Strings.BotAddLicenseWithItems, bi.AppID, EResult.OK, bi.Name)));
+					response.AppendLine(Commands.FormatBotResponse(bot, "Successfuly created booster from " + gameID.Key.ToString()));
+					ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Successfuly created booster from " + gameID.Key.ToString()));
 					//Buster was made - next is only available in 24 hours
 					if (gameID.Value.HasValue) { //if source is timer, not command
 						gameIDs[gameID.Key] = DateTime.Now.AddHours(24);
+						ASF.ArchiLogger.LogGenericInfo(Commands.FormatBotResponse(bot, "Next attepmt to make booster from " + gameID.Key.ToString() + " is planned at " + gameIDs[gameID.Key].Value.ToShortDateString() + " " + gameIDs[gameID.Key].Value.ToShortTimeString()));
 					}
 				}
 
diff --git a/BoosterCreator/ValveTimeZone.cs b/BoosterCreator/ValveTimeZone.cs
deleted file mode 100644
index 7b00089..0000000
--- a/BoosterCreator/ValveTimeZone.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-
-namespace BoosterCreator {
-	static class ValveTimeZone {
-		static public TimeZoneInfo GetTimeZoneInfo() {
-			TimeZoneInfo.TransitionTime startTransition, endTransition;
-			startTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 2, 0, 0),
-																				  4, 1, DayOfWeek.Sunday);
-			endTransition = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, 2, 0, 0),
-																			10, 5, DayOfWeek.Sunday);
-			// Define adjustment rule
-			TimeSpan delta = new TimeSpan(1, 0, 0);
-			TimeZoneInfo.AdjustmentRule adjustment = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(new DateTime(1999, 10, 1), DateTime.MaxValue.Date, delta, startTransition, endTransition);
-			// Create array for adjustment rules
-			TimeZoneInfo.AdjustmentRule[] adjustments = { adjustment };
-			// Define other custom time zone arguments
-			string displayName = "(GMT-08:00) Valve Time";
-			string standardName = "Valve Standard Time";
-			string daylightName = "Valve Daylight Time";
-			TimeSpan offset = new TimeSpan(-8, 0, 0);
-			// Create custom time zone without copying DST information
-			TimeZoneInfo valveTime = TimeZoneInfo.CreateCustomTimeZone(standardName, offset, displayName, standardName, daylightName, adjustments, true);
-			return valveTime;
-		}
-	}
-}
diff --git a/build.bat b/build.bat
new file mode 100644
index 0000000..5b5260e
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,4 @@
+del .\BoosterCreator\*.zip
+dotnet publish -c "Release" -f "net472" -o "out/generic-netf"
+rename .\BoosterCreator\BoosterCreator.zip BoosterCreator-netf.zip 
+dotnet publish -c "Release" -f "netcoreapp2.2" -o "out/generic" "/p:LinkDuringPublish=false"
\ No newline at end of file