Merge pull request #5 from friism/clean-code

Clean code, thanks @friism
paulduran · Mar 16, 2013 · 5f05436 · 5f05436
2 parents e90e034 + c667edd
commit 5f05436
Show file tree

Hide file tree

Showing 38 changed files with 69 additions and 109 deletions.
diff --git a/Blaze/Blaze.csproj b/Blaze/Blaze.csproj
@@ -183,7 +183,6 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
-    <Compile Include="Models\HomeModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Util\RegexExtensions.cs" />
   </ItemGroup>
@@ -297,6 +296,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Models\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />

diff --git a/Blaze/ContentProviders/AudioContentProvider.cs b/Blaze/ContentProviders/AudioContentProvider.cs
@@ -1,7 +1,6 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Collections.Generic;
-using System.Net;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/BBCNewsContentProvider.cs b/Blaze/ContentProviders/BBCNewsContentProvider.cs
@@ -1,10 +1,10 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Web;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/BashQDBContentProvider.cs b/Blaze/ContentProviders/BashQDBContentProvider.cs
@@ -1,8 +1,8 @@
-using System;
+using HtmlAgilityPack;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Linq;
 using System.Net;
-using HtmlAgilityPack;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/CollegeHumorContentProvider.cs b/Blaze/ContentProviders/CollegeHumorContentProvider.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using JabbR.ContentProviders.Core;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/Core/EmbedContentProvider.cs b/Blaze/ContentProviders/Core/EmbedContentProvider.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 
 namespace JabbR.ContentProviders.Core
 {

diff --git a/Blaze/ContentProviders/Core/IContentProvider.cs b/Blaze/ContentProviders/Core/IContentProvider.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel.Composition;
-using System.Net;
 
 namespace JabbR.ContentProviders.Core
 {

diff --git a/Blaze/ContentProviders/Core/ResourceProcessor.cs b/Blaze/ContentProviders/Core/ResourceProcessor.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition.Hosting;
 using System.Linq;
-using System.Net;
 using System.Threading.Tasks;
 
 namespace JabbR.ContentProviders.Core

diff --git a/Blaze/ContentProviders/DictionaryContentProvider.cs b/Blaze/ContentProviders/DictionaryContentProvider.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Net;
-using HtmlAgilityPack;
+using HtmlAgilityPack;
 using JabbR.ContentProviders.Core;
+using System;
+using System.Net;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/GistContentProvider.cs b/Blaze/ContentProviders/GistContentProvider.cs
@@ -1,7 +1,7 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/GitHubIssuesContentProvider.cs b/Blaze/ContentProviders/GitHubIssuesContentProvider.cs
@@ -1,10 +1,6 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
-using Newtonsoft.Json;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/GoogleDocsFormProvider.cs b/Blaze/ContentProviders/GoogleDocsFormProvider.cs
@@ -1,7 +1,7 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Collections.Generic;
 using System.Web;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/GoogleDocsPresentationsContentProvider.cs b/Blaze/ContentProviders/GoogleDocsPresentationsContentProvider.cs
@@ -1,10 +1,9 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Text.RegularExpressions;
 using System.Web;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/GoogleMapsContentProvider.cs b/Blaze/ContentProviders/GoogleMapsContentProvider.cs
@@ -1,8 +1,7 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Web;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/ImageContentProvider.cs b/Blaze/ContentProviders/ImageContentProvider.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using JabbR.ContentProviders.Core;
+using JabbR.ContentProviders.Core;
+using System;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/ImgurContentProvider.cs b/Blaze/ContentProviders/ImgurContentProvider.cs
@@ -1,7 +1,6 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Linq;
-using System.Net;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/JiraIssuesContentProvider.cs b/Blaze/ContentProviders/JiraIssuesContentProvider.cs
@@ -1,6 +1,6 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/JoinMeContentProvider.cs b/Blaze/ContentProviders/JoinMeContentProvider.cs
@@ -1,6 +1,5 @@
-using System;
-using System.Net;
-using JabbR.ContentProviders.Core;
+using JabbR.ContentProviders.Core;
+using System;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/MixcloudContentProvider.cs b/Blaze/ContentProviders/MixcloudContentProvider.cs
@@ -1,6 +1,6 @@
+using JabbR.ContentProviders.Core;
 using System;
 using System.Collections.Generic;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders {
     public class MixcloudContentProvider : EmbedContentProvider

diff --git a/Blaze/ContentProviders/NerdDinnerContentProvider.cs b/Blaze/ContentProviders/NerdDinnerContentProvider.cs
@@ -1,10 +1,10 @@
-using System;
+using JabbR.ContentProviders.Core;
+using Newtonsoft.Json;
+using System;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
-using Newtonsoft.Json;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/NugetNuggetContentProvider.cs b/Blaze/ContentProviders/NugetNuggetContentProvider.cs
@@ -1,12 +1,12 @@
+using JabbR.ContentProviders.Core;
+using JabbR.Infrastructure;
+using Newtonsoft.Json;
 using System;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
-using JabbR.Infrastructure;
-using Newtonsoft.Json;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/PastieContentProvider.cs b/Blaze/ContentProviders/PastieContentProvider.cs
@@ -1,7 +1,7 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/SlideshareContentProvider.cs b/Blaze/ContentProviders/SlideshareContentProvider.cs
@@ -1,8 +1,8 @@
-using System;
+using JabbR.ContentProviders.Core;
+using Newtonsoft.Json;
+using System;
 using System.IO;
 using System.Net;
-using JabbR.ContentProviders.Core;
-using Newtonsoft.Json;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/SoundCloudContentProvider.cs b/Blaze/ContentProviders/SoundCloudContentProvider.cs
@@ -1,10 +1,9 @@
-using System;
+using JabbR.ContentProviders.Core;
+using JabbR.Infrastructure;
+using System;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
-using JabbR.Infrastructure;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/TweetContentProvider.cs b/Blaze/ContentProviders/TweetContentProvider.cs
@@ -1,9 +1,8 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/TwitPicContentProvider.cs b/Blaze/ContentProviders/TwitPicContentProvider.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Net;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/UStreamContentProvider.cs b/Blaze/ContentProviders/UStreamContentProvider.cs
@@ -1,10 +1,10 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Web;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/UserVoiceContentProvider.cs b/Blaze/ContentProviders/UserVoiceContentProvider.cs
@@ -1,8 +1,8 @@
-using System;
+using JabbR.ContentProviders.Core;
+using Newtonsoft.Json;
+using System;
 using System.IO;
 using System.Net;
-using JabbR.ContentProviders.Core;
-using Newtonsoft.Json;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/VimeoContentProvider.cs b/Blaze/ContentProviders/VimeoContentProvider.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using JabbR.ContentProviders.Core;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/ContentProviders/YoutubeContentProvider.cs b/Blaze/ContentProviders/YoutubeContentProvider.cs
@@ -1,7 +1,7 @@
-using System;
+using JabbR.ContentProviders.Core;
+using System;
 using System.Collections.Generic;
 using System.Web;
-using JabbR.ContentProviders.Core;
 
 namespace JabbR.ContentProviders
 {

diff --git a/Blaze/Controllers/AuthActionFilter.cs b/Blaze/Controllers/AuthActionFilter.cs
@@ -1,6 +1,6 @@
+using NLog;
 using System;
 using System.Web.Mvc;
-using NLog;
 
 namespace Blaze.Controllers
 {

diff --git a/Blaze/Controllers/HomeController.cs b/Blaze/Controllers/HomeController.cs
@@ -1,4 +1,6 @@
-using System;
+using Newtonsoft.Json;
+using NLog;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
@@ -7,9 +9,6 @@
 using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Mvc;
-using Blaze.Models;
-using NLog;
-using Newtonsoft.Json;
 
 namespace Blaze.Controllers
 {
@@ -22,7 +21,7 @@ public interface ICommandWrapper
     public class LoginLoggingCommandWrapper : ICommandWrapper
     {
         private static readonly Logger Log = LogManager.GetLogger("Blaze.Login");
- 
+
         public bool Match(string url)
         {
             return url == "users/me.json";
@@ -85,8 +84,7 @@ public ActionResult Chat(string accountName, string code, string auth)
             ViewBag.Stealth = Convert.ToBoolean(ConfigurationManager.AppSettings["Stealth"] ?? "true")
                                   ? "true"
                                   : "false";
-            var model = new HomeModel();
-            return View("Chat",model);
+            return View("Chat");
         }
 
         private static string GetAccountName(Account account)
@@ -218,8 +216,6 @@ public ActionResult GetFile(string account, string auth, string url)
                 return HandleWebException(fullUrl, ex);
             }
         }
-
-
     }
 
     public class LaunchpadTokens

diff --git a/Blaze/Controllers/MessageProcessor.cs b/Blaze/Controllers/MessageProcessor.cs
@@ -1,3 +1,4 @@
+using JabbR.ContentProviders.Core;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -6,7 +7,6 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web;
-using JabbR.ContentProviders.Core;
 
 namespace Blaze.Controllers
 {