Remove unused directives/apply code styling

Author: Adam Warner (work)

Matterhook.NET/Config.cs

@@ -7,7 +7,6 @@ public class Config
         public DiscourseConfig DiscourseConfig { get; set; }
         public GithubConfig GithubConfig { get; set; }
         public DockerHubConfig DockerHubConfig { get; set; }
-        
     }
 
     public class DiscourseConfig
@@ -39,12 +38,11 @@ public class RepoConfig
     {
         public string RepoName { get; set; }
         public MattermostConfig MattermostConfig { get; set; }
-        
     }
 
     public class DockerHubConfig
     {
         public MattermostConfig DefaultMattermostConfig { get; set; }
         public List<RepoConfig> RepoList { get; set; }
     }
-}
+}

Matterhook.NET/Controllers/DiscourseHookController.cs

@@ -9,14 +9,12 @@
 using System.Text;
 using System.Threading.Tasks;
 using Matterhook.NET.Code;
+using Matterhook.NET.MatterhookClient;
 using Matterhook.NET.Webhooks.Discourse;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json.Linq;
 using ReverseMarkdown;
-using Matterhook.NET.MatterhookClient;
-
 
 namespace Matterhook.NET.Controllers
 {
@@ -49,11 +47,11 @@ public async Task<IActionResult> Receive()
                 //Generate DiscourseHook object for easier reading
                 stuffToLog.Add($"Discourse Hook received: {DateTime.Now}");
 
-                Request.Headers.TryGetValue("X-Discourse-Event-Id", out StringValues eventId);
-                Request.Headers.TryGetValue("X-Discourse-Event-Type", out StringValues eventType);
-                Request.Headers.TryGetValue("X-Discourse-Event", out StringValues eventName);
-                Request.Headers.TryGetValue("X-Discourse-Event-Signature", out StringValues signature);
-                Request.Headers.TryGetValue("X-Discourse-Instance", out StringValues discourseUrl);
+                Request.Headers.TryGetValue("X-Discourse-Event-Id", out var eventId);
+                Request.Headers.TryGetValue("X-Discourse-Event-Type", out var eventType);
+                Request.Headers.TryGetValue("X-Discourse-Event", out var eventName);
+                Request.Headers.TryGetValue("X-Discourse-Event-Signature", out var signature);
+                Request.Headers.TryGetValue("X-Discourse-Instance", out var discourseUrl);
                 _discourseUrl = discourseUrl;
 
                 stuffToLog.Add($"Hook Id: {eventId}");
@@ -68,7 +66,7 @@ public async Task<IActionResult> Receive()
 
                 if (signature == calcSig)
                 {
-                    var discourseHook = new DiscourseHook(eventId,eventType,eventName,signature,payloadText);
+                    var discourseHook = new DiscourseHook(eventId, eventType, eventName, signature, payloadText);
                     var matterHook = new MatterhookClient.MatterhookClient(_config.MattermostConfig.WebhookUrl);
                     HttpResponseMessage response = null;
                     MattermostMessage message = null;
@@ -84,30 +82,27 @@ public async Task<IActionResult> Receive()
                             ? $"Unable to post to Mattermost {response.StatusCode}"
                             : "Unable to post to Mattermost");
 
-                        return Content(response != null ? $"Problem posting to Mattermost: {response.StatusCode}" : "Problem Posting to Mattermost");
+                        return Content(response != null
+                            ? $"Problem posting to Mattermost: {response.StatusCode}"
+                            : "Problem Posting to Mattermost");
                     }
                     if (message != null) stuffToLog.Add(message.Text);
                     stuffToLog.Add("Succesfully posted to Mattermost");
                     Util.LogList(stuffToLog);
                     return Ok();
                 }
-                else
-                {
-                    stuffToLog.Add("Invalid Signature!");
-                    stuffToLog.Add($"Expected: {signature}");
-                    stuffToLog.Add($"Calculated: {calcSig}");
-                    Util.LogList(stuffToLog);
-                    return Unauthorized();
-                }
-        
+                stuffToLog.Add("Invalid Signature!");
+                stuffToLog.Add($"Expected: {signature}");
+                stuffToLog.Add($"Calculated: {calcSig}");
+                Util.LogList(stuffToLog);
+                return Unauthorized();
             }
             catch (Exception e)
             {
                 stuffToLog.Add(e.Message);
                 Util.LogList(stuffToLog);
                 return Content(e.Message);
             }
-           
         }
 
         private static string ExpandDiscourseUrls(string input, string discourseUrl)
@@ -122,14 +117,9 @@ private MattermostMessage PostCreated(PostPayload payload)
             var p = payload.post;
 
             if (_config.IgnoredTopicTitles.Contains(p.topic_title))
-            {
                 throw new Exception("Post title matches ignored titles");
-            }
 
             if (_config.IgnorePrivateMessages)
-            {
-                //We're not really doing anything here yet
-                //TODO: Revisit in the future
                 try
                 {
                     JObject.Parse(
@@ -139,9 +129,7 @@ private MattermostMessage PostCreated(PostPayload payload)
                 {
                     throw new Exception("Unable to retrieve topic, possibly a PM so we should ignore this.");
                 }
-            }
 
-           
 
             var retVal = new MattermostMessage
             {
@@ -157,25 +145,20 @@ private MattermostMessage PostCreated(PostPayload payload)
                         Fallback = "New Post in Discourse Topic",
                         Title = p.topic_title,
                         TitleLink = new Uri($"{_discourseUrl}/t/{p.topic_id}/{p.post_number}"),
-                        Text = new Converter().Convert(ExpandDiscourseUrls(p.cooked,_discourseUrl)),
+                        Text = new Converter().Convert(ExpandDiscourseUrls(p.cooked, _discourseUrl)),
                         AuthorName = p.username,
                         AuthorLink = new Uri($"{_discourseUrl}/u/{p.username}"),
-                        AuthorIcon = new Uri($"{_discourseUrl}{p.avatar_template.Replace("{size}","16")}")
+                        AuthorIcon = new Uri($"{_discourseUrl}{p.avatar_template.Replace("{size}", "16")}")
                     }
                 }
-
             };
 
             if (p.post_number.ToString() == "1")
-            {
                 retVal.Text = "#NewTopic\n";
-            }
 
             retVal.Text += $"#{p.topic_slug}";
 
             return retVal;
         }
-
-
     }
 }

Matterhook.NET/Controllers/DockerHubHookController.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;