Various fixes

SteamBot/Bot.cs

@@ -134,6 +134,10 @@ public Inventory MyInventory
         {
             get
             {
+                if (myInventoryTask == null)
+                {
+                    GetInventory();
+                }
                 myInventoryTask.Wait();
                 return myInventoryTask.Result;
             }
@@ -809,7 +813,7 @@ public void AcceptAllMobileTradeConfirmations()
                     {
                         if (SteamGuardAccount.AcceptConfirmation(confirmation))
                         {
-                            Log.Success("Confirmed {0}. (Confirmation ID #{1})", confirmation.Description, confirmation.ID);
+                            Log.Success("Confirmed {0}. (Confirmation ID #{1})", confirmation.Key, confirmation.ID);
                         }
                     }
                 }

SteamBot/ExampleBot.csproj

@@ -39,21 +39,18 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
-    <Reference Include="SteamAuth, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamAuth.2.0.0\lib\net45\SteamAuth.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SteamAuth, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SteamAuth.3.0.0\lib\net45\SteamAuth.dll</HintPath>
     </Reference>
-    <Reference Include="SteamKit2, Version=1.8.1.0, Culture=neutral, PublicKeyToken=ed3ce47ed5aad940, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamKit2.1.8.1\lib\net45\SteamKit2.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SteamKit2, Version=1.8.3.0, Culture=neutral, PublicKeyToken=ed3ce47ed5aad940, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SteamKit2.1.8.3\lib\net45\SteamKit2.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -107,4 +104,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-</Project>
+</Project>

SteamBot/Program.cs

@@ -74,7 +74,7 @@ private static void BotMode(int botIndex)
                 return;
             }
 
-            Bot b = new Bot(configObject.Bots[botIndex], configObject.ApiKey, BotManager.UserHandlerCreator, true, true);
+            Bot b = new Bot(configObject.Bots[botIndex], configObject.ApiKey, BotManager.UserHandlerCreator, true, true, true);
             Console.Title = "Bot Manager";
             b.StartBot();
 

SteamBot/app.config

@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

SteamBot/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net451" />
-  <package id="SteamAuth" version="2.0.0" targetFramework="net45" />
-  <package id="SteamKit2" version="1.8.1" targetFramework="net45" />
-</packages>
+  <package id="SteamAuth" version="3.0.0" targetFramework="net45" />
+  <package id="SteamKit2" version="1.8.3" targetFramework="net45" />
+</packages>

SteamTrade/GenericInventory.cs

@@ -26,9 +26,9 @@ public Dictionary<ulong, Item> items
         {
             get
             {
-                if (_loadTask == null)
+                if (LoadTask == null)
                     return null;
-                _loadTask.Wait();
+                LoadTask.Wait();
                 return _items;
             }
         }
@@ -37,9 +37,9 @@ public Dictionary<string, ItemDescription> descriptions
         {
             get
             {
-                if (_loadTask == null)
+                if (LoadTask == null)
                     return null;
-                _loadTask.Wait();
+                LoadTask.Wait();
                 return _descriptions;
             }
         }
@@ -48,16 +48,16 @@ public List<string> errors
         {
             get
             {
-                if (_loadTask == null)
+                if (LoadTask == null)
                     return null;
-                _loadTask.Wait();
+                LoadTask.Wait();
                 return _errors;
             }
         }
 
         public bool isLoaded = false;
 
-        private Task _loadTask;
+        public Task LoadTask { get; private set; }
         private Dictionary<string, ItemDescription> _descriptions = new Dictionary<string, ItemDescription>();
         private Dictionary<ulong, Item> _items = new Dictionary<ulong, Item>();
         private List<string> _errors = new List<string>();
@@ -113,9 +113,9 @@ public void debug_app_data()
         /// </summary>
         public ItemDescription getDescription(ulong id)
         {
-            if (_loadTask == null)
+            if (LoadTask == null)
                 return null;
-            _loadTask.Wait();
+            LoadTask.Wait();
 
             try
             {
@@ -130,7 +130,7 @@ public ItemDescription getDescription(ulong id)
         public void load(int appid, IEnumerable<long> contextIds, SteamID steamid)
         {
             List<long> contextIdsCopy = contextIds.ToList();
-            _loadTask = Task.Factory.StartNew(() => loadImplementation(appid, contextIdsCopy, steamid));
+            LoadTask = Task.Factory.StartNew(() => loadImplementation(appid, contextIdsCopy, steamid));
         }
 
         public void loadImplementation(int appid, IEnumerable<long> contextIds, SteamID steamid)
@@ -171,7 +171,7 @@ public void loadImplementation(int appid, IEnumerable<long> contextIds, SteamID
                                 if (!_items.ContainsKey(id))
                                 {
                                     string descriptionid = itemId.classid + "_" + itemId.instanceid;
-                                    _items.Add((ulong)itemId.id, new Item(appid, contextId, (ulong)itemId.id, descriptionid));
+                                    _items.Add((ulong) itemId.id, new Item(appid, contextId, (ulong) itemId.id, descriptionid));
                                     break;
                                 }
                             }
@@ -185,10 +185,10 @@ public void loadImplementation(int appid, IEnumerable<long> contextIds, SteamID
                                 string key = "" + (class_instance.classid ?? '0') + "_" + (class_instance.instanceid ?? '0');
                                 if (!_descriptions.ContainsKey(key))
                                 {
-                                    if(class_instance.app_data != null)
+                                    if (class_instance.app_data != null)
                                     {
                                         tmpAppData = new Dictionary<string, string>();
-                                        foreach(var value in class_instance.app_data)
+                                        foreach (var value in class_instance.app_data)
                                         {
                                             tmpAppData.Add("" + value.Name, "" + value.Value);
                                         }
@@ -203,10 +203,12 @@ public void loadImplementation(int appid, IEnumerable<long> contextIds, SteamID
                                         {
                                             name = class_instance.name,
                                             type = class_instance.type,
-                                            marketable = (bool)class_instance.marketable,
-                                            tradable = (bool)class_instance.tradable,
-                                            classid = long.Parse((string)class_instance.classid),
-                                            url = (class_instance.actions != null && class_instance.actions.First["link"] != null ? class_instance.actions.First["link"] : ""),
+                                            marketable = (bool) class_instance.marketable,
+                                            tradable = (bool) class_instance.tradable,
+                                            classid = String.IsNullOrEmpty((string)class_instance.classid) ? -1 : long.Parse((string) class_instance.classid),
+                                            url = (class_instance.actions != null && class_instance.actions.First["link"] != null
+                                                ? class_instance.actions.First["link"]
+                                                : ""),
                                             app_data = tmpAppData,
                                             market_fee_app_id = (class_instance.market_fee_app != null ? class_instance.market_fee_app : 0),
                                         }
@@ -221,11 +223,11 @@ public void loadImplementation(int appid, IEnumerable<long> contextIds, SteamID
                         {
                             moreStart = invResponse.more_start;
                         }
-                        catch (Exception e)
+                        catch (Exception)
                         {
                             moreStart = null;
                         }
-                    } while (!String.IsNullOrEmpty(moreStart) && moreStart.ToLower() != "false");
+                    } while (!String.IsNullOrEmpty(moreStart) && moreStart.ToLower() != "false" && moreStart != "0");
                 }//end for (contextId)
             }//end try
             catch (Exception e)

SteamTrade/SteamTrade.csproj

@@ -37,20 +37,17 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net">
       <HintPath>..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
-    <Reference Include="SteamAuth, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamAuth.2.0.0\lib\net45\SteamAuth.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SteamAuth, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SteamAuth.3.0.0\lib\net45\SteamAuth.dll</HintPath>
     </Reference>
-    <Reference Include="SteamKit2, Version=1.8.1.0, Culture=neutral, PublicKeyToken=ed3ce47ed5aad940, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamKit2.1.8.1\lib\net45\SteamKit2.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SteamKit2, Version=1.8.3.0, Culture=neutral, PublicKeyToken=ed3ce47ed5aad940, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SteamKit2.1.8.3\lib\net45\SteamKit2.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -82,4 +79,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-</Project>
+</Project>

SteamTrade/SteamWeb.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Collections.Specialized;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Net;
 using System.Net.Cache;
 using System.Text;
@@ -464,26 +465,9 @@ private byte[] HexToByte(string hex)
                 throw new Exception("The binary key cannot have an odd number of digits");
             }
 
-            byte[] arr = new byte[hex.Length >> 1];
-            int l = hex.Length;
-
-            for (int i = 0; i < (l >> 1); ++i)
-            {
-                arr[i] = (byte)((GetHexVal(hex[i << 1]) << 4) + (GetHexVal(hex[(i << 1) + 1])));
-            }
-
-            return arr;
-        }
-
-        /// <summary>
-        /// Get the Hex value as int out of an char.
-        /// </summary>
-        /// <param name="hex">Input parameter.</param>
-        /// <returns>A Hex Value as int.</returns>
-        private int GetHexVal(char hex)
-        {
-            int val = hex;
-            return val - (val < 58 ? 48 : 55);
+            return Enumerable.Range(0, hex.Length / 2)
+                .Select(x => Convert.ToByte(hex.Substring(x*2, 2), 16))
+                .ToArray();
         }
 
         /// <summary>

SteamTrade/TradeWebAPI/TradeSession.cs

@@ -12,7 +12,7 @@ namespace SteamTrade.TradeWebAPI
     /// </summary>
     public class TradeSession
     {
-        private const string SteamTradeUrl = "http://steamcommunity.com/trade/{0}/";
+        private const string SteamTradeUrl = "https://steamcommunity.com/trade/{0}/";
 
         private string sessionIdEsc;
         private string baseTradeURL;

SteamTrade/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

SteamTrade/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net451" />
-  <package id="SteamAuth" version="2.0.0" targetFramework="net45" />
-  <package id="SteamKit2" version="1.8.1" targetFramework="net45" />
-</packages>
+  <package id="SteamAuth" version="3.0.0" targetFramework="net45" />
+  <package id="SteamKit2" version="1.8.3" targetFramework="net45" />
+</packages>