Update to .NET 5. Update packages. Remove APIs / scrapes that no longer work.

Author: ScottRFrost

DiscordProtocol.cs

@@ -33,11 +33,11 @@ public override async Task<bool> Start()
             bot.MessageReceived += MessageReceived;
 
             // Log in and start bot
-            await bot.LoginAsync(TokenType.Bot, config.Keys.DiscordToken);
-            await bot.StartAsync();
+            await bot.LoginAsync(TokenType.Bot, config.Keys.DiscordToken).ConfigureAwait(false);
+            await bot.StartAsync().ConfigureAwait(false);
 
             // Wait forever
-            await Task.Delay(-1); 
+            await Task.Delay(-1).ConfigureAwait(false);
             return true;
         }
 
@@ -52,11 +52,11 @@ public async void OnTimerTick(object configObject)
             var writeConfig = false;
             for (var thisRss = 0; thisRss < config.Rss.Length; thisRss++)
             {
-                if (config.Rss[thisRss].Protocol.ToUpperInvariant() == "DISCORD")
+                if (string.Equals(config.Rss[thisRss].Protocol, "DISCORD", StringComparison.InvariantCultureIgnoreCase))
                 {
                     var newMostRecent = config.Rss[thisRss].MostRecent;
                     var numFound = 0;
-                    if (config.Rss[thisRss].Format.ToUpperInvariant() == "RSS")
+                    if (string.Equals(config.Rss[thisRss].Format, "RSS", StringComparison.InvariantCultureIgnoreCase))
                     {
                         // Parse RSS Format
                         try
@@ -90,13 +90,13 @@ public async void OnTimerTick(object configObject)
                                     }
                                     catch
                                     {
-                                        try 
+                                        try
                                         {
                                             // Try RFC822 with 2 and 4 digit year
                                             var formats = new string[] {"ddd, dd MMM yyyy HH:mm:ss zzzzz", "ddd, dd MMM yy HH:mm:ss zzzzz", "ddd, dd MMM yyyy HH:mm:ss zzzz", "ddd, dd MMM yy HH:mm:ss zzzz"};
                                             rssItem.PubDate = DateTime.ParseExact(dateString, formats, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal);
                                         }
-                                        catch 
+                                        catch
                                         {
                                             // Everything failed.  Give up.
                                             rssItem.PubDate = config.Rss[thisRss].MostRecent;
@@ -170,7 +170,7 @@ public async void OnTimerTick(object configObject)
             // Save Config
             if (writeConfig)
             {
-                await System.IO.File.WriteAllTextAsync("config.json", JsonConvert.SerializeObject(config, Formatting.Indented));
+                await System.IO.File.WriteAllTextAsync("config.json", JsonConvert.SerializeObject(config, Formatting.Indented)).ConfigureAwait(false);
             }
         }
 

ProHttpClient.cs

@@ -26,7 +26,7 @@ public ProHttpClient()
         public string BingHeader { get; set; }
 
         public string ReferrerUri { get; set; }
-        
+
         public Dictionary<string,string> CustomHeaders {get; set;}
 
         public void AddHeader (string name, string value) {
@@ -38,7 +38,7 @@ public async Task<string> DownloadString(string uri)
         {
             BuildHeaders();
             try{
-                var response = await GetStringAsync(uri);
+                var response = await GetStringAsync(uri).ConfigureAwait(false);
                 return response;
             }
             catch (System.Net.Http.HttpRequestException ex){
@@ -54,7 +54,7 @@ public async Task<Stream> DownloadData(string uri)
         {
             BuildHeaders();
             try{
-                var response = await GetStreamAsync(uri);
+                var response = await GetStreamAsync(uri).ConfigureAwait(false);
                 return response;
             }
             catch (System.Net.Http.HttpRequestException ex){
@@ -66,9 +66,9 @@ public async Task<Stream> DownloadData(string uri)
             }
         }
 
-        void BuildHeaders()
+        private void BuildHeaders()
         {
-            if(ReferrerUri != string.Empty) 
+            if(ReferrerUri != string.Empty)
             {
                 DefaultRequestHeaders.Referrer = new Uri(ReferrerUri);
             }
@@ -86,7 +86,7 @@ void BuildHeaders()
             }
         }
 
-        void CleanHeaders()
+        private void CleanHeaders()
         {
             ReferrerUri = "https://duckduckgo.com";
             AuthorizationHeader = string.Empty;