Fixed commented out code that crashed on certain listings with ghost packages. Improved logging.

Author: TitleOS

StoreBot/Program.cs

@@ -29,7 +29,6 @@ static async Task Main(string[] args)
             Console.WriteLine($"Connected to Discord services");
             await Utilities.Log($"Logged into Discord at {System.DateTime.Now}");
             await client.SetGameAsync("DisplayCatalog", null, ActivityType.Watching);
-            dcat = new DisplayCatalogHandler(DCatEndpoint.Production, new Locale(Market.US, Lang.en, true));
             await Task.Delay(-1);
 
         }
@@ -39,6 +38,7 @@ static async Task MessageReceived(SocketMessage message)
         {
             if (message.Content.StartsWith("$"))
             {
+                dcat = DisplayCatalogHandler.ProductionConfig();
 #if DEBUG
                 await message.Channel.SendMessageAsync($"StoreBot is running in DEBUG mode. Output will be verbose.");
 #endif
@@ -60,6 +60,13 @@ static async Task MessageReceived(SocketMessage message)
                         dcat = new DisplayCatalogHandler(DCatEndpoint.Xbox, new Locale(Market.US, Lang.en, true));
                         await message.Channel.SendMessageAsync($"DCAT Endpoint was changed to {message.Content}");
                         break;
+#if DEBUG
+                    case "$STOP":
+                        await message.Channel.SendMessageAsync($"StoreBot is shutting down. Thanks for playing FE3.");
+                        await Utilities.Log(new LogMessage(LogSeverity.Info, message.Channel.Name, "StoreBot is shutting down. Thanks for playing FE3."));
+                        System.Environment.Exit(0);
+                        break;
+#endif
 
                 }
                 if (message.Content.Length != 13)
@@ -148,23 +155,25 @@ private static async Task BuildReply(DisplayCatalogModel displayCatalogModel, So
             await message.Channel.SendMessageAsync(MoreDetailsHelper.ToString());
             StringBuilder packages = new StringBuilder();
             List<string> packagelist = new List<string>(Regex.Split(packages.ToString(), @"(?<=\G.{1999})", RegexOptions.Singleline));
-            /*
+            
             if (displayCatalogModel.Product.DisplaySkuAvailabilities[0].Sku.Properties.Packages.Count > 0)
             {
                 Debug.WriteLine(displayCatalogModel.Product.DisplaySkuAvailabilities[0].Sku.Properties.Packages.Count);
-                try
+                if (displayCatalogModel.Product.DisplaySkuAvailabilities[0].Sku.Properties.Packages.Count != 0)
                 {
-                    foreach (var Package in displayCatalogModel.Product.DisplaySkuAvailabilities[0].Sku.Properties.Packages[0].PackageDownloadUris)
+                    //For some weird reason, some listings report having packages when really they don't have one hosted. This checks the child to see if the package is really null or not.
+                    if (!object.ReferenceEquals(displayCatalogModel.Product.DisplaySkuAvailabilities[0].Sku.Properties.Packages[0].PackageDownloadUris, null))
                     {
-                        packages.AppendLine($"Xbox Live Package: {Package.Uri}");
+                        foreach (var Package in displayCatalogModel.Product.DisplaySkuAvailabilities[0].Sku.Properties.Packages[0].PackageDownloadUris)
+                        {
+                            packages.AppendLine($"Xbox Live Package: {Package.Uri}");
+                        }
                     }
                 }
-                catch { }
+               
+                
             }
-            */
-            /*
 
-            */
             packages.AppendLine($"(2/3)");
             await message.Channel.SendMessageAsync(packages.ToString());
             foreach (PackageInstance package in packageInstances)

StoreBot/Utilities.cs

@@ -1,6 +1,7 @@
 using Discord;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,8 +12,33 @@ public static class Utilities
     {
         public static async Task Log(LogMessage message)
         {
-            Console.WriteLine($"Exception: {message.Message} at {message.Source}");
-            await File.AppendAllTextAsync("log.txt", $"Exception: {message.Message} at {message.Source}");
+            switch (message.Severity)
+            {
+                case LogSeverity.Error:
+                    Console.WriteLine($"Exception: {message.Message}:{message.Exception.StackTrace}. Caller: {message.Source}");
+                     await File.AppendAllTextAsync("log.txt", $"[{DateTime.Now.ToString()}]Exception: {message.Message}:{message.Exception.StackTrace}. Caller: {message.Source}");
+                    return;
+                case LogSeverity.Warning:
+                    Console.WriteLine($"Warning: {message.Message}. Caller: {message.Source}");
+                    await File.AppendAllTextAsync("log.txt", $"[{DateTime.Now.ToString()}]Warning: {message.Message}. Caller: {message.Source}");
+                    return;
+                case LogSeverity.Critical:
+                    Console.WriteLine($"CRITICAL FAILURE: {message.Message}:{message.Exception.StackTrace}. StoreBot will now exit.");
+                    await File.AppendAllTextAsync("log.txt", $"[{DateTime.Now.ToString()}]CRITICAL FAILURE: {message.Message}:{message.Exception.StackTrace}. StoreBot will now exit.");
+                    throw message.Exception;
+#if DEBUG
+                case LogSeverity.Verbose:
+                    Console.WriteLine($"Verbose Output: {message.Message}. Caller: {message.Source}");
+                    await File.AppendAllTextAsync("log.txt", $"Verbose Output: {message.Message}. Caller: {message.Source}");
+                    return;
+                case LogSeverity.Debug:
+                    Console.WriteLine($"Debug Output: {message.Message}. Caller: {message.Source}");
+                    await File.AppendAllTextAsync("log.txt", $"Debug Output: {message.Message}. Caller: {message.Source}");
+                    return;
+#endif
+                default:
+                    return;
+            }
         }
 
         public static async Task Log(string message)
@@ -37,7 +63,18 @@ public Settings()
             string[] NumberOfSearchResultsRaw = rawsettings[0].Split("=");
             string[] AuthTokenRaw = rawsettings[1].Split("=");
             this.NumberOfSearchResults = int.Parse(NumberOfSearchResultsRaw[1]);
-            this.AuthToken = AuthTokenRaw[1];
+            if(AuthTokenRaw[1] == "REPLACEME")
+            {
+                Debug.WriteLine("Using Environment Variable Token");
+                this.AuthToken = System.Environment.GetEnvironmentVariable("STOREBOTTOKEN", EnvironmentVariableTarget.User);
+                Debug.WriteLine($"Got Environment Variable Token: {this.AuthToken}");
+
+            }
+            else
+            {
+                this.AuthToken = AuthTokenRaw[1];
+
+            }
         }