From 3d944b32a8fb6e6bad4c3688586007dd80b17a32 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 16:54:54 -0500
Subject: [PATCH 01/23] fix up sorting on the request page

---
 PlexRequests.UI/Content/requests.js         | 79 +++++++++++----------
 PlexRequests.UI/Models/RequestViewModel.cs  |  2 +
 PlexRequests.UI/Modules/RequestsModule.cs   |  4 ++
 PlexRequests.UI/Views/Requests/Index.cshtml |  7 +-
 4 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 3872da2c2..bbca674af 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -9,6 +9,16 @@ var searchSource = $("#search-template").html();
 var searchTemplate = Handlebars.compile(searchSource);
 var movieTimer = 0;
 var tvimer = 0;
+var mixItUpDefault = {
+    animation: { enable: true },
+    load: {
+        filter: 'all',
+        sort: 'default:asc'
+    },
+    layout: {
+        display: 'block'
+    }
+};
 
 movieLoad();
 tvLoad();
@@ -17,40 +27,26 @@ tvLoad();
 $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
     var target = $(e.target).attr('href');
     var activeState = "";
-    if (target === "#TvShowTab") {
-        if ($('#movieList').mixItUp('isLoaded')) {
-            activeState = $('#movieList').mixItUp('getState');
-            $('#movieList').mixItUp('destroy');
-        }
-        if (!$('#tvList').mixItUp('isLoaded')) {
-            $('#tvList').mixItUp({
-                load: {
-                    filter: activeState.activeFilter || 'all',
-                    sort: activeState.activeSort || 'default:asc'
-                },
-                layout: {
-                display: 'block'
-            }
 
-            });
+    var $ml = $('#movieList');
+    var $tvl = $('#tvList');
+
+    if (target === "#TvShowTab") {
+        
+        if ($ml.mixItUp('isLoaded')) {
+            activeState = $ml.mixItUp('getState');
+            $ml.mixItUp('destroy');
         }
+        if ($tvl.mixItUp('isLoaded')) $tvl.mixItUp('destroy');
+        $tvl.mixItUp(mixItUpConfig(activeState)); // init or reinit
     }
     if (target === "#MoviesTab") {
-        if ($('#tvList').mixItUp('isLoaded')) {
-            activeState = $('#tvList').mixItUp('getState');
-            $('#tvList').mixItUp('destroy');
-        }
-        if (!$('#movieList').mixItUp('isLoaded')) {
-            $('#movieList').mixItUp({
-                load: {
-                    filter: activeState.activeFilter || 'all',
-                    sort: activeState.activeSort || 'default:asc'
-                },
-                layout: {
-                    display: 'block'
-                }
-            });
+        if ($tvl.mixItUp('isLoaded')) {
+            activeState = $tvl.mixItUp('getState');
+            $tvl.mixItUp('destroy');
         }
+        if ($ml.mixItUp('isLoaded')) $ml.mixItUp('destroy');
+        $ml.mixItUp(mixItUpConfig(activeState)); // init or reinit
     }
 });
 
@@ -315,24 +311,26 @@ $(document).on("click", ".change", function (e) {
 
 });
 
+function mixItUpConfig(activeState) {
+    var conf = mixItUpDefault;
+
+    if (activeState) {
+        if (activeState.activeFilter) conf['load']['filter'] = activeState.activeFilter;
+        if (activeState.activeSort) conf['load']['sort'] = activeState.activeSort;
+    }
+    return conf;
+};
+
 function movieLoad() {
     $("#movieList").html("");
 
     $.ajax("/requests/movies/").success(function (results) {
         results.forEach(function (result) {
             var context = buildRequestContext(result, "movie");
-
             var html = searchTemplate(context);
             $("#movieList").append(html);
         });
-        $('#movieList').mixItUp({
-            layout: {
-                display: 'block'
-            },
-            load: {
-                filter: 'all'
-            }
-        });
+        $('#movieList').mixItUp(mixItUpConfig());
     });
 };
 
@@ -345,6 +343,7 @@ function tvLoad() {
             var html = searchTemplate(context);
             $("#tvList").append(html);
         });
+        $('#tvList').mixItUp(mixItUpConfig());
     });
 };
 
@@ -359,9 +358,11 @@ function buildRequestContext(result, type) {
         type: type,
         status: result.status,
         releaseDate: result.releaseDate,
+        releaseDateTicks: result.releaseDateTicks,
         approved: result.approved,
         requestedBy: result.requestedBy,
         requestedDate: result.requestedDate,
+        requestedDateTicks: result.requestedDateTicks,
         available: result.available,
         admin: result.admin,
         issues: result.issues,
@@ -376,7 +377,7 @@ function buildRequestContext(result, type) {
 }
 
 function startFilter(elementId) {
-    $('#'+element).mixItUp({
+    $('#' + element).mixItUp({
         load: {
             filter: activeState.activeFilter || 'all',
             sort: activeState.activeSort || 'default:asc'
diff --git a/PlexRequests.UI/Models/RequestViewModel.cs b/PlexRequests.UI/Models/RequestViewModel.cs
index 011b9977d..5ee389be9 100644
--- a/PlexRequests.UI/Models/RequestViewModel.cs
+++ b/PlexRequests.UI/Models/RequestViewModel.cs
@@ -37,11 +37,13 @@ namespace PlexRequests.UI.Models
         public string Title { get; set; }
         public string PosterPath { get; set; }
         public string ReleaseDate { get; set; }
+        public long ReleaseDateTicks { get; set; }
         public RequestType Type { get; set; }
         public string Status { get; set; }
         public bool Approved { get; set; }
         public string RequestedBy { get; set; }
         public string RequestedDate { get; set; }
+        public long RequestedDateTicks { get; set; }
         public string ReleaseYear { get; set; }
         public bool Available { get; set; }
         public bool Admin { get; set; }
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index a951e0db8..47dcf3369 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -90,7 +90,9 @@ namespace PlexRequests.UI.Modules
                 Id = movie.Id,
                 PosterPath = movie.PosterPath,
                 ReleaseDate = movie.ReleaseDate.Humanize(),
+                ReleaseDateTicks = movie.ReleaseDate.Ticks,
                 RequestedDate = movie.RequestedDate.Humanize(),
+                RequestedDateTicks = movie.RequestedDate.Ticks,
                 Approved = movie.Approved,
                 Title = movie.Title,
                 Overview = movie.Overview,
@@ -119,7 +121,9 @@ namespace PlexRequests.UI.Modules
                 Id = tv.Id,
                 PosterPath = tv.PosterPath,
                 ReleaseDate = tv.ReleaseDate.Humanize(),
+                ReleaseDateTicks = tv.ReleaseDate.Ticks,
                 RequestedDate = tv.RequestedDate.Humanize(),
+                RequestedDateTicks = tv.RequestedDate.Ticks,
                 Approved = tv.Approved,
                 Title = tv.Title,
                 Overview = tv.Overview,
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index cd73d64d9..bf79ac7dd 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -43,7 +43,10 @@
             </a>
             <ul class="dropdown-menu">
                 <li><a href="#" class="sort" data-sort="default">Default</a></li>
-                <li><a href="#" class="sort" data-sort="requestorder:asc">Requested Date</a></li>
+                <li><a href="#" class="sort" data-sort="requestorder:asc">Requested Date (asc)</a></li>
+                <li><a href="#" class="sort" data-sort="requestorder:desc">Requested Date (desc)</a></li>
+                <li><a href="#" class="sort" data-sort="releaseorder:asc">Release Date (asc)</a></li>
+                <li><a href="#" class="sort" data-sort="releaseorder:desc">Release Date (desc)</a></li>
             </ul>
         </div>
         @if (Model.SearchForMovies)
@@ -78,7 +81,7 @@
 
 
 <script id="search-template" type="text/x-handlebars-template">
-    <div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}}">
+    <div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}}" data-requestorder="{{requestedDateTicks}}" data-releaseorder="{{releaseDateTicks}}">
         <div class="row">
             <div class="col-sm-2">
                 {{#if_eq type "movie"}}

From e1b8293fdd70167cedc351abf6b22253c1547051 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 18:10:20 -0500
Subject: [PATCH 02/23] allow approving all requests by category

---
 PlexRequests.UI/Content/requests.js         | 118 ++++++++++++++++----
 PlexRequests.UI/Modules/ApprovalModule.cs   |  94 ++++++++++++----
 PlexRequests.UI/Views/Requests/Index.cshtml |   2 +
 3 files changed, 173 insertions(+), 41 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index bbca674af..46154ac6e 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -20,8 +20,7 @@ var mixItUpDefault = {
     }
 };
 
-movieLoad();
-tvLoad();
+initLoad();
 
 
 $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
@@ -51,7 +50,17 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
 });
 
 // Approve all
-$('#approveAll').click(function () {
+$('#approveAll').click(function (e) {
+    e.preventDefault();
+    var buttonId = e.target.id;
+    var origHtml = $(this).html();
+
+    if ($('#' + buttonId).text() === " Loading...") {
+        return;
+    }
+
+    loadingButton(buttonId, "success");
+
     $.ajax({
         type: 'post',
         url: '/approval/approveall',
@@ -59,11 +68,75 @@ $('#approveAll').click(function () {
         success: function (response) {
             if (checkJsonResponse(response)) {
                 generateNotify("Success! All requests approved!", "success");
+                initLoad();
             }
         },
         error: function (e) {
             console.log(e);
             generateNotify("Something went wrong!", "danger");
+        },
+        complete: function (e) {
+            finishLoading(buttonId, "success", origHtml)
+        }
+    });
+});
+$('#approveMovies').click(function (e) {
+    e.preventDefault();
+    var buttonId = e.target.id;
+    var origHtml = $(this).html();
+
+    if ($('#' + buttonId).text() === " Loading...") {
+        return;
+    }
+
+    loadingButton(buttonId, "success");
+
+    $.ajax({
+        type: 'post',
+        url: '/approval/approveallmovies',
+        dataType: "json",
+        success: function (response) {
+            if (checkJsonResponse(response)) {
+                generateNotify("Success! All Movie requests approved!", "success");
+                movieLoad();
+            }
+        },
+        error: function (e) {
+            console.log(e);
+            generateNotify("Something went wrong!", "danger");
+        },
+        complete: function (e) {
+            finishLoading(buttonId, "success", origHtml)
+        }
+    });
+});
+$('#approveTVShows').click(function (e) {
+    e.preventDefault();
+    var buttonId = e.target.id;
+    var origHtml = $(this).html();
+
+    if ($('#' + buttonId).text() === " Loading...") {
+        return;
+    }
+
+    loadingButton(buttonId, "success");
+
+    $.ajax({
+        type: 'post',
+        url: '/approval/approvealltvshows',
+        dataType: "json",
+        success: function (response) {
+            if (checkJsonResponse(response)) {
+                generateNotify("Success! All TV Show requests approved!", "success");
+                tvLoad();
+            }
+        },
+        error: function (e) {
+            console.log(e);
+            generateNotify("Something went wrong!", "danger");
+        },
+        complete: function (e) {
+            finishLoading(buttonId, "success", origHtml)
         }
     });
 });
@@ -321,29 +394,44 @@ function mixItUpConfig(activeState) {
     return conf;
 };
 
+function initLoad() {
+    movieLoad();
+    tvLoad();
+}
+
 function movieLoad() {
-    $("#movieList").html("");
+    var $ml = $('#movieList');
+    if ($ml.mixItUp('isLoaded')) {
+        activeState = $ml.mixItUp('getState');
+        $ml.mixItUp('destroy');
+    }
+    $ml.html("");
 
     $.ajax("/requests/movies/").success(function (results) {
         results.forEach(function (result) {
             var context = buildRequestContext(result, "movie");
             var html = searchTemplate(context);
-            $("#movieList").append(html);
+            $ml.append(html);
         });
-        $('#movieList').mixItUp(mixItUpConfig());
+        $ml.mixItUp(mixItUpConfig());
     });
 };
 
 function tvLoad() {
-    $("#tvList").html("");
+    var $tvl = $('#tvList');
+    if ($tvl.mixItUp('isLoaded')) {
+        activeState = $tvl.mixItUp('getState');
+        $tvl.mixItUp('destroy');
+    }
+    $tvl.html("");
 
     $.ajax("/requests/tvshows/").success(function (results) {
         results.forEach(function (result) {
             var context = buildRequestContext(result, "tv");
             var html = searchTemplate(context);
-            $("#tvList").append(html);
+            $tvl.append(html);
         });
-        $('#tvList').mixItUp(mixItUpConfig());
+        $tvl.mixItUp(mixItUpConfig());
     });
 };
 
@@ -374,16 +462,4 @@ function buildRequestContext(result, type) {
     };
 
     return context;
-}
-
-function startFilter(elementId) {
-    $('#' + element).mixItUp({
-        load: {
-            filter: activeState.activeFilter || 'all',
-            sort: activeState.activeSort || 'default:asc'
-        },
-        layout: {
-            display: 'block'
-        }
-    });
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs
index b2c6217bb..dd036965e 100644
--- a/PlexRequests.UI/Modules/ApprovalModule.cs
+++ b/PlexRequests.UI/Modules/ApprovalModule.cs
@@ -61,6 +61,8 @@ namespace PlexRequests.UI.Modules
 
             Post["/approve"] = parameters => Approve((int)Request.Form.requestid);
             Post["/approveall"] = x => ApproveAll();
+            Post["/approveallmovies"] = x => ApproveAllMovies();
+            Post["/approvealltvshows"] = x => ApproveAllTVShows();
         }
 
         private IRequestService Service { get; }
@@ -216,6 +218,56 @@ namespace PlexRequests.UI.Modules
                     });
         }
 
+        private Response ApproveAllMovies()
+        {
+            if (!Context.CurrentUser.IsAuthenticated())
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
+            }
+
+            var requests = Service.GetAll().Where(x => x.Approved == false && x.Type == RequestType.Movie);
+            var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
+            if (!requestedModels.Any())
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "There are no movie requests to approve. Please refresh." });
+            }
+
+            try
+            {
+                return UpdateRequests(requestedModels);
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e);
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something bad happened, please check the logs!" });
+            }
+        }
+
+        private Response ApproveAllTVShows()
+        {
+            if (!Context.CurrentUser.IsAuthenticated())
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
+            }
+
+            var requests = Service.GetAll().Where(x => x.Approved == false && x.Type == RequestType.TvShow);
+            var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
+            if (!requestedModels.Any())
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "There are no tv show requests to approve. Please refresh." });
+            }
+
+            try
+            {
+                return UpdateRequests(requestedModels);
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e);
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something bad happened, please check the logs!" });
+            }
+        }
+
         /// <summary>
         /// Approves all.
         /// </summary>
@@ -234,16 +286,28 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "There are no requests to approve. Please refresh." });
             }
 
-            var cpSettings = CpService.GetSettings();
+            try
+            {
+                return UpdateRequests(requestedModels);
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e);
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something bad happened, please check the logs!" });
+            }
 
+        }
 
+        private Response UpdateRequests(RequestedModel[] requestedModels)
+        {
+            var cpSettings = CpService.GetSettings();
             var updatedRequests = new List<RequestedModel>();
             foreach (var r in requestedModels)
             {
                 if (r.Type == RequestType.Movie)
                 {
-                    var result = SendMovie(cpSettings, r, CpApi);
-                    if (result)
+                    var res = SendMovie(cpSettings, r, CpApi);
+                    if (res)
                     {
                         r.Approved = true;
                         updatedRequests.Add(r);
@@ -260,8 +324,8 @@ namespace PlexRequests.UI.Modules
                     var sonarr = SonarrSettings.GetSettings();
                     if (sr.Enabled)
                     {
-                        var result = sender.SendToSickRage(sr, r);
-                        if (result?.result == "success")
+                        var res = sender.SendToSickRage(sr, r);
+                        if (res?.result == "success")
                         {
                             r.Approved = true;
                             updatedRequests.Add(r);
@@ -269,14 +333,14 @@ namespace PlexRequests.UI.Modules
                         else
                         {
                             Log.Error("Could not approve and send the TV {0} to SickRage!", r.Title);
-                            Log.Error("SickRage Message: {0}", result?.message);
+                            Log.Error("SickRage Message: {0}", res?.message);
                         }
                     }
 
                     if (sonarr.Enabled)
                     {
-                        var result = sender.SendToSonarr(sonarr, r);
-                        if (result != null)
+                        var res = sender.SendToSonarr(sonarr, r);
+                        if (res != null)
                         {
                             r.Approved = true;
                             updatedRequests.Add(r);
@@ -288,20 +352,10 @@ namespace PlexRequests.UI.Modules
                     }
                 }
             }
-            try
-            {
-
-                var result = Service.BatchUpdate(updatedRequests); return Response.AsJson(result
+             var result = Service.BatchUpdate(updatedRequests);
+             return Response.AsJson(result
                  ? new JsonResponseModel { Result = true }
                  : new JsonResponseModel { Result = false, Message = "We could not approve all of the requests. Please try again or check the logs." });
-
-            }
-            catch (Exception e)
-            {
-                Log.Fatal(e);
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something bad happened, please check the logs!" });
-            }
-
         }
 
         private bool SendMovie(CouchPotatoSettings settings, RequestedModel r, ICouchPotatoApi cp)
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index bf79ac7dd..67ed20378 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -5,6 +5,8 @@
     @if (Context.CurrentUser.IsAuthenticated())
     {
         <button id="approveAll" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve All</button>
+        <button id="approveMovies" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
+        <button id="approveTVShows" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve TV Shows</button>
         <br />
         <br />
     }

From 07b02d90e68b34f770db45289d8bbeea8cd58c6c Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 18:46:35 -0500
Subject: [PATCH 03/23] move approve buttons to the tab content

---
 PlexRequests.UI/Content/requests.js         |  6 ++--
 PlexRequests.UI/Views/Requests/Index.cshtml | 36 ++++++++++++++-------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 46154ac6e..f035b5e05 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -29,9 +29,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
 
     var $ml = $('#movieList');
     var $tvl = $('#tvList');
-
-    if (target === "#TvShowTab") {
         
+    $('.approve-category').hide();
+    if (target === "#TvShowTab") {
+        $('#approveTVShows').show();
         if ($ml.mixItUp('isLoaded')) {
             activeState = $ml.mixItUp('getState');
             $ml.mixItUp('destroy');
@@ -40,6 +41,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
         $tvl.mixItUp(mixItUpConfig(activeState)); // init or reinit
     }
     if (target === "#MoviesTab") {
+        $('#approveMovies').show();
         if ($tvl.mixItUp('isLoaded')) {
             activeState = $tvl.mixItUp('getState');
             $tvl.mixItUp('destroy');
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 67ed20378..fcc14d237 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -5,8 +5,7 @@
     @if (Context.CurrentUser.IsAuthenticated())
     {
         <button id="approveAll" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve All</button>
-        <button id="approveMovies" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
-        <button id="approveTVShows" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve TV Shows</button>
+
         <br />
         <br />
     }
@@ -22,10 +21,25 @@
         }
 
     </ul>
+    <br />
+
 
     <!-- Tab panes -->
     <div class="tab-content contentList">
-        <div class="btn-group col-sm-push-10">
+        <div class="btn-group col-sm-2">
+            @if (Context.CurrentUser.IsAuthenticated())
+            {
+                @if (Model.SearchForMovies)
+                {
+                    <button id="approveMovies" class="btn btn-success-outline approve-category" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
+                }
+                @if (Model.SearchForTvShows)
+                {
+                    <button id="approveTVShows" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve TV Shows</button>
+                }
+            }
+        </div>
+        <div class="btn-group col-sm-push-8">
             <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                 Filter
                 <i class="fa fa-filter"></i>
@@ -38,7 +52,7 @@
                 <li><a href="#" class="filter" data-filter=".available-false">Not Available</a></li>
             </ul>
         </div>
-        <div class="btn-group col-sm-push-10">
+        <div class="btn-group col-sm-push-8">
             <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                 Order
                 <i class="fa fa-sort"></i>
@@ -52,13 +66,13 @@
             </ul>
         </div>
         @if (Model.SearchForMovies)
-        {
+            {
 
             <!-- Movie tab -->
             <div role="tabpanel" class="tab-pane active" id="MoviesTab">
 
-                <br/>
-                <br/>
+                <br />
+                <br />
                 <!-- Movie content -->
                 <div id="movieList">
                 </div>
@@ -66,12 +80,12 @@
         }
 
         @if (Model.SearchForTvShows)
-        {
+            {
             <!-- TV tab -->
             <div role="tabpanel" class="tab-pane" id="TvShowTab">
 
-                <br/>
-                <br/>
+                <br />
+                <br />
                 <!-- TV content -->
                 <div id="tvList">
                 </div>
@@ -186,7 +200,7 @@
                             <li><a id="{{requestId}}" issue-select="4" class="dropdownIssue" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#myModal">Other</a></li>
 
                             {{#if_eq admin true}}
-                                <li><a id="{{requestId}}" issue-select="4" class="note" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#noteModal">Add Note</a></li>
+                            <li><a id="{{requestId}}" issue-select="4" class="note" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#noteModal">Add Note</a></li>
                             {{/if_eq}}
                         </ul>
                     </div>

From bee4d2dc4c7eef69d5539f13c9e78c64e81ff6e0 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 19:33:22 -0500
Subject: [PATCH 04/23] fix up the animations. seems to be related to the
 data-bound attribute causing the animtions not to fire on each .mix object.

---
 PlexRequests.UI/Content/requests.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index f035b5e05..4af792e87 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -17,6 +17,11 @@ var mixItUpDefault = {
     },
     layout: {
         display: 'block'
+    },
+    callbacks: {
+        onMixStart: function (state, futureState) {
+            $('.mix', this).removeAttr('data-bound').removeData('bound'); // fix for animation issues in other tabs
+        }
     }
 };
 
@@ -29,7 +34,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
 
     var $ml = $('#movieList');
     var $tvl = $('#tvList');
-        
+
     $('.approve-category').hide();
     if (target === "#TvShowTab") {
         $('#approveTVShows').show();
@@ -49,6 +54,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
         if ($ml.mixItUp('isLoaded')) $ml.mixItUp('destroy');
         $ml.mixItUp(mixItUpConfig(activeState)); // init or reinit
     }
+    //$('.mix[data-bound]').removeAttr('data-bound');
 });
 
 // Approve all

From 63e4e29051735cc1ae9d2dfb1b3d57b164d3b07f Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 21:41:26 -0500
Subject: [PATCH 05/23] clean up the sorting option names. add a way to see
 which filter/sort is currently applied.

---
 PlexRequests.UI/Content/requests.js         |  9 ++++++++-
 PlexRequests.UI/Views/Requests/Index.cshtml | 19 +++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 4af792e87..9c448a9de 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -13,7 +13,7 @@ var mixItUpDefault = {
     animation: { enable: true },
     load: {
         filter: 'all',
-        sort: 'default:asc'
+        sort: 'requestorder:desc'
     },
     layout: {
         display: 'block'
@@ -149,6 +149,13 @@ $('#approveTVShows').click(function (e) {
     });
 });
 
+// filtering/sorting
+$('.filter,.sort', '.dropdown-menu').click(function (e) {
+    var $this = $(this);
+    $('.fa-square', $this.parents('.dropdown-menu:first')).removeClass('fa-square').addClass('fa-square-o');
+    $this.children('.fa').first().removeClass('fa-square-o').addClass('fa-square');
+});
+
 
 // Report Issue
 $(document).on("click", ".dropdownIssue", function (e) {
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index fcc14d237..705aa4c79 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -45,11 +45,11 @@
                 <i class="fa fa-filter"></i>
             </a>
             <ul class="dropdown-menu">
-                <li><a href="#" class="filter" data-filter="all">All</a></li>
-                <li><a href="#" class="filter" data-filter=".approved-true">Approved</a></li>
-                <li><a href="#" class="filter" data-filter=".approved-false">Not Approved</a></li>
-                <li><a href="#" class="filter" data-filter=".available-true">Available</a></li>
-                <li><a href="#" class="filter" data-filter=".available-false">Not Available</a></li>
+                <li><a href="#" class="filter" data-filter="all"><i class="fa fa-square"></i>  All</a></li>
+                <li><a href="#" class="filter" data-filter=".approved-true"><i class="fa fa-square-o"></i>  Approved</a></li>
+                <li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i>  Not Approved</a></li>
+                <li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i>  Available</a></li>
+                <li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i>  Not Available</a></li>
             </ul>
         </div>
         <div class="btn-group col-sm-push-8">
@@ -58,11 +58,10 @@
                 <i class="fa fa-sort"></i>
             </a>
             <ul class="dropdown-menu">
-                <li><a href="#" class="sort" data-sort="default">Default</a></li>
-                <li><a href="#" class="sort" data-sort="requestorder:asc">Requested Date (asc)</a></li>
-                <li><a href="#" class="sort" data-sort="requestorder:desc">Requested Date (desc)</a></li>
-                <li><a href="#" class="sort" data-sort="releaseorder:asc">Release Date (asc)</a></li>
-                <li><a href="#" class="sort" data-sort="releaseorder:desc">Release Date (desc)</a></li>
+                <li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-square"></i>  Recent Requests</a></li>
+                <li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i>  Older Requests</a></li>
+                <li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i>  Recent Releases</a></li>
+                <li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i>  Older Releases</a></li>
             </ul>
         </div>
         @if (Model.SearchForMovies)

From fff267db3779e344454b45e242e53903cda6db08 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 22:19:02 -0500
Subject: [PATCH 06/23] #54 comma separated list of users who don't require
 approval + fix a couple request messages (include show title)

---
 .../SettingModels/PlexRequestSettings.cs      | 26 +++++++++++++++++++
 PlexRequests.UI/Modules/SearchModule.cs       |  8 +++---
 PlexRequests.UI/Views/Admin/Settings.cshtml   |  9 +++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
index 51a6413fd..5dfe7cf76 100644
--- a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
+++ b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
@@ -24,6 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
 namespace PlexRequests.Core.SettingModels
 {
     public class PlexRequestSettings : Settings
@@ -35,5 +39,27 @@ namespace PlexRequests.Core.SettingModels
         public bool RequireMovieApproval { get; set; }
         public bool RequireTvShowApproval { get; set; }
         public int WeeklyRequestLimit { get; set; }
+        public string NoApprovalUsers { get; set; }
+
+        [JsonIgnore]
+        public List<string> NoApprovalUserList
+        {
+            get
+            {
+                var users = new List<string>();
+                if (string.IsNullOrEmpty(NoApprovalUsers))
+                {
+                    return users;
+                }
+
+                var splitUsers = NoApprovalUsers.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var user in splitUsers)
+                {
+                    if (!string.IsNullOrWhiteSpace(user))
+                        users.Add(user.Trim());
+                }
+                return users;
+            }
+        }
     }
 }
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 2a98e8933..49f2d6446 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -220,7 +220,7 @@ namespace PlexRequests.UI.Modules
 
             var settings = PrService.GetSettings();
             Log.Trace(settings.DumpJson());
-            if (!settings.RequireMovieApproval)
+            if (!settings.RequireMovieApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
             {
                 var cpSettings = CpService.GetSettings();
 
@@ -247,7 +247,7 @@ namespace PlexRequests.UI.Modules
                         };
                         NotificationService.Publish(notificationModel);
 
-                        return Response.AsJson(new JsonResponseModel {Result = true});
+                        return Response.AsJson(new JsonResponseModel {Result = true, Message = $"{fullMovieName} was successfully added!" });
                     }
                     return
                         Response.AsJson(new JsonResponseModel
@@ -272,7 +272,7 @@ namespace PlexRequests.UI.Modules
                     };
                     NotificationService.Publish(notificationModel);
 
-                    return Response.AsJson(new JsonResponseModel { Result = true });
+                    return Response.AsJson(new JsonResponseModel { Result = true, Message = $"{fullMovieName} was successfully added!" });
                 }
             }
 
@@ -364,7 +364,7 @@ namespace PlexRequests.UI.Modules
             model.SeasonList = seasonsList.ToArray();
 
             var settings = PrService.GetSettings();
-            if (!settings.RequireTvShowApproval)
+            if (!settings.RequireTvShowApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
             {
                 var sonarrSettings = SonarrService.GetSettings();
                 var sender = new TvSender(SonarrApi, SickrageApi);
diff --git a/PlexRequests.UI/Views/Admin/Settings.cshtml b/PlexRequests.UI/Views/Admin/Settings.cshtml
index edbe6009c..078171cda 100644
--- a/PlexRequests.UI/Views/Admin/Settings.cshtml
+++ b/PlexRequests.UI/Views/Admin/Settings.cshtml
@@ -83,6 +83,15 @@
                 </div>
             </div>
 
+            <p class="form-group">A comma separated list of users whose requests do not require approval.</p>
+            <div class="form-group">
+                <label for="noApprovalUsers" class="control-label">Users</label>
+                <div>
+                    <input type="text" class="form-control-custom form-control " id="NoApprovalUsers" name="NoApprovalUsers" placeholder="e.g. John, Bobby" value="@Model.NoApprovalUsers">
+                </div>
+            </div>
+            <br />
+
             @*<div class="form-group">
                 <label for="WeeklyRequestLimit" class="control-label">Weekly Request Limit</label>
                 <div>

From f5ecb630718981e3955c0db3202aa9a5a9d6faa7 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 22:39:59 -0500
Subject: [PATCH 07/23] #84 provide an option in settings to resttrict users
 from viewing requests other than their own.

---
 .../SettingModels/PlexRequestSettings.cs      |  1 +
 PlexRequests.UI/Modules/RequestsModule.cs     | 12 ++++++++
 PlexRequests.UI/Views/Admin/Settings.cshtml   | 28 ++++++++++++++-----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
index 5dfe7cf76..aebb720af 100644
--- a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
+++ b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
@@ -38,6 +38,7 @@ namespace PlexRequests.Core.SettingModels
         public bool SearchForTvShows { get; set; }
         public bool RequireMovieApproval { get; set; }
         public bool RequireTvShowApproval { get; set; }
+        public bool UsersCanViewOnlyOwnRequests { get; set; }
         public int WeeklyRequestLimit { get; set; }
         public string NoApprovalUsers { get; set; }
 
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 47dcf3369..b49acd013 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -79,8 +79,14 @@ namespace PlexRequests.UI.Modules
 
         private Response GetMovies()
         {
+            var settings = PrSettings.GetSettings();
             var isAdmin = Context.CurrentUser.IsAuthenticated();
             var dbMovies = Service.GetAll().Where(x => x.Type == RequestType.Movie);
+            if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
+            {
+                dbMovies = dbMovies.Where(x => x.RequestedBy.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase));
+            }
+
             var viewModel = dbMovies.Select(movie => new RequestViewModel
             {
                 ProviderId = movie.ProviderId,
@@ -110,8 +116,14 @@ namespace PlexRequests.UI.Modules
 
         private Response GetTvShows()
         {
+            var settings = PrSettings.GetSettings();
             var isAdmin = Context.CurrentUser.IsAuthenticated();
             var dbTv = Service.GetAll().Where(x => x.Type == RequestType.TvShow);
+            if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
+            {
+                dbTv = dbTv.Where(x => x.RequestedBy.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase));
+            }
+
             var viewModel = dbTv.Select(tv => new RequestViewModel
             {
                 ProviderId = tv.ProviderId,
diff --git a/PlexRequests.UI/Views/Admin/Settings.cshtml b/PlexRequests.UI/Views/Admin/Settings.cshtml
index 078171cda..1f3257c49 100644
--- a/PlexRequests.UI/Views/Admin/Settings.cshtml
+++ b/PlexRequests.UI/Views/Admin/Settings.cshtml
@@ -90,16 +90,31 @@
                     <input type="text" class="form-control-custom form-control " id="NoApprovalUsers" name="NoApprovalUsers" placeholder="e.g. John, Bobby" value="@Model.NoApprovalUsers">
                 </div>
             </div>
-            <br />
 
-            @*<div class="form-group">
-                <label for="WeeklyRequestLimit" class="control-label">Weekly Request Limit</label>
-                <div>
+            <div class="form-group">
+                <div class="checkbox">
                     <label>
-                        <input type="number" id="WeeklyRequestLimit" name="WeeklyRequestLimit" class="form-control form-control-custom " value="@Model.WeeklyRequestLimit">
+                        @if (Model.UsersCanViewOnlyOwnRequests)
+                        {
+                            <input type="checkbox" id="UsersCanViewOnlyOwnRequests" name="UsersCanViewOnlyOwnRequests" checked="checked"><text>Users can view their own requests only</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="UsersCanViewOnlyOwnRequests" name="UsersCanViewOnlyOwnRequests"><text>Users can view their own requests only</text>
+                        }
                     </label>
+
                 </div>
-            </div> //TODO: Need to implement this*@
+            </div>
+
+            @*<div class="form-group">
+                    <label for="WeeklyRequestLimit" class="control-label">Weekly Request Limit</label>
+                    <div>
+                        <label>
+                            <input type="number" id="WeeklyRequestLimit" name="WeeklyRequestLimit" class="form-control form-control-custom " value="@Model.WeeklyRequestLimit">
+                        </label>
+                    </div>
+                </div> //TODO: Need to implement this*@
 
             <div>
             </div>
@@ -111,4 +126,3 @@
         </fieldset>
     </form>
 </div>
-

From 085c46ce43b9fb6af03b8a41dfc86ebf03a600f1 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 23:00:26 -0500
Subject: [PATCH 08/23] minor UI adjustments

---
 PlexRequests.UI/Content/custom.css          | 5 +++++
 PlexRequests.UI/Content/custom.min.css      | 2 +-
 PlexRequests.UI/Content/custom.scss         | 6 ++++++
 PlexRequests.UI/Views/Login/Index.cshtml    | 2 +-
 PlexRequests.UI/Views/Shared/_Layout.cshtml | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index a517cc508..7ff72e7f4 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -40,6 +40,11 @@ label {
   margin-bottom: 0.5rem !important;
   font-size: 16px !important; }
 
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus {
+  background: #4e5d6c; }
+
 .btn-danger-outline {
   color: #d9534f !important;
   background-color: transparent;
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 45dc19440..2a046eb7d 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index df29fcfc8..029748ecd 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -65,6 +65,12 @@ label {
     font-size: 16px $i;
 }
 
+.nav-tabs > li.active > a, 
+.nav-tabs > li.active > a:hover, 
+.nav-tabs > li.active > a:focus {
+    background: #4e5d6c;
+}
+
 .btn-danger-outline {
     color: $danger-colour $i;
     background-color: transparent;
diff --git a/PlexRequests.UI/Views/Login/Index.cshtml b/PlexRequests.UI/Views/Login/Index.cshtml
index 6ca2e444c..85597f544 100644
--- a/PlexRequests.UI/Views/Login/Index.cshtml
+++ b/PlexRequests.UI/Views/Login/Index.cshtml
@@ -4,7 +4,7 @@
     Password <input class="form-control form-control-custom" name="Password" type="password"/>
     <br/>
     Remember Me <input name="RememberMe" type="checkbox" value="True"/>
-    <br/>
+    <br/><br/>
     <input class="btn btn-success-outline" type="submit" value="Login"/>
 </form>
 @if (!Model.AdminExists)
diff --git a/PlexRequests.UI/Views/Shared/_Layout.cshtml b/PlexRequests.UI/Views/Shared/_Layout.cshtml
index 5245bdbdd..154477934 100644
--- a/PlexRequests.UI/Views/Shared/_Layout.cshtml
+++ b/PlexRequests.UI/Views/Shared/_Layout.cshtml
@@ -7,8 +7,8 @@
     <title>Plex Requests</title>
     <!-- Styles -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="~/Content/custom.min.css" type="text/css"/>
     <link rel="stylesheet" href="~/Content/bootstrap.css" type="text/css"/>
+    <link rel="stylesheet" href="~/Content/custom.min.css" type="text/css" />
     <link rel="stylesheet" href="~/Content/font-awesome.css" type="text/css"/>
     <link rel="stylesheet" href="~/Content/pace.min.css" type="text/css"/>
 

From 4b3f79b4a8c8a642a5f363d1a227d2bc14021383 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 23:45:52 -0500
Subject: [PATCH 09/23] #96 Email notification test button (others to come)

---
 .../Interfaces/INotification.cs               |  3 +
 .../Interfaces/INotificationService.cs        |  2 +
 .../Notification/EmailMessageNotification.cs  | 72 ++++++++++++++-----
 .../Notification/NotificationService.cs       | 17 ++++-
 .../Notification/NotificationType.cs          |  1 +
 .../Notification/PushbulletNotification.cs    |  5 ++
 .../Notification/PushoverNotification.cs      |  5 ++
 PlexRequests.UI/Modules/AdminModule.cs        | 15 ++++
 .../Views/Admin/EmailNotifications.cshtml     | 32 ++++++++-
 9 files changed, 134 insertions(+), 18 deletions(-)

diff --git a/PlexRequests.Services/Interfaces/INotification.cs b/PlexRequests.Services/Interfaces/INotification.cs
index 14b09f0e9..2ee0b4f35 100644
--- a/PlexRequests.Services/Interfaces/INotification.cs
+++ b/PlexRequests.Services/Interfaces/INotification.cs
@@ -27,6 +27,7 @@
 using System.Threading.Tasks;
 
 using PlexRequests.Services.Notification;
+using PlexRequests.Core.SettingModels;
 
 namespace PlexRequests.Services.Interfaces
 {
@@ -35,5 +36,7 @@ namespace PlexRequests.Services.Interfaces
         string NotificationName { get; }
 
         Task NotifyAsync(NotificationModel model);
+
+        Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings);
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/Interfaces/INotificationService.cs b/PlexRequests.Services/Interfaces/INotificationService.cs
index 59db3b509..14408b031 100644
--- a/PlexRequests.Services/Interfaces/INotificationService.cs
+++ b/PlexRequests.Services/Interfaces/INotificationService.cs
@@ -27,12 +27,14 @@
 using System.Threading.Tasks;
 
 using PlexRequests.Services.Notification;
+using PlexRequests.Core.SettingModels;
 
 namespace PlexRequests.Services.Interfaces
 {
     public interface INotificationService
     {
         Task Publish(NotificationModel model);
+        Task Publish(NotificationModel model, EmailNotificationSettings settings);
         void Subscribe(INotification notification);
         void UnSubscribe(INotification notification);
 
diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
index 472b6a069..c247eed0a 100644
--- a/PlexRequests.Services/Notification/EmailMessageNotification.cs
+++ b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -46,13 +46,19 @@ namespace PlexRequests.Services.Notification
 
         private static readonly Logger Log = LogManager.GetCurrentClassLogger();
         private ISettingsService<EmailNotificationSettings> EmailNotificationSettings { get; }
-        private EmailNotificationSettings Settings => GetConfiguration();
         public string NotificationName => "EmailMessageNotification";
 
         public async Task NotifyAsync(NotificationModel model)
         {
             var configuration = GetConfiguration();
-            if (!ValidateConfiguration(configuration))
+            await NotifyAsync(model, configuration);
+        }
+
+        public async Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        {
+            if (settings == null) await NotifyAsync(model);
+
+            if (!ValidateConfiguration(settings))
             {
                 return;
             }
@@ -60,10 +66,10 @@ namespace PlexRequests.Services.Notification
             switch (model.NotificationType)
             {
                 case NotificationType.NewRequest:
-                    await EmailNewRequest(model);
+                    await EmailNewRequest(model, settings);
                     break;
                 case NotificationType.Issue:
-                    await EmailIssue(model);
+                    await EmailIssue(model, settings);
                     break;
                 case NotificationType.RequestAvailable:
                     throw new NotImplementedException();
@@ -74,6 +80,10 @@ namespace PlexRequests.Services.Notification
                 case NotificationType.AdminNote:
                     throw new NotImplementedException();
 
+                case NotificationType.Test:
+                    await EmailTest(model, settings);
+                    break;
+
                 default:
                     throw new ArgumentOutOfRangeException();
             }
@@ -100,23 +110,23 @@ namespace PlexRequests.Services.Notification
             return true;
         }
 
-        private async Task EmailNewRequest(NotificationModel model)
+        private async Task EmailNewRequest(NotificationModel model, EmailNotificationSettings settings)
         {
             var message = new MailMessage
             {
                 IsBodyHtml = true,
-                To = { new MailAddress(Settings.RecipientEmail) },
+                To = { new MailAddress(settings.RecipientEmail) },
                 Body = $"Hello! The user '{model.User}' has requested {model.Title}! Please log in to approve this request. Request Date: {model.DateTime.ToString("f")}",
-                From = new MailAddress(Settings.EmailSender),
+                From = new MailAddress(settings.EmailSender),
                 Subject = $"Plex Requests: New request for {model.Title}!"
             };
 
             try
             {
-                using (var smtp = new SmtpClient(Settings.EmailHost, Settings.EmailPort))
+                using (var smtp = new SmtpClient(settings.EmailHost, settings.EmailPort))
                 {
-                    smtp.Credentials = new NetworkCredential(Settings.EmailUsername, Settings.EmailPassword);
-                    smtp.EnableSsl = Settings.Ssl;
+                    smtp.Credentials = new NetworkCredential(settings.EmailUsername, settings.EmailPassword);
+                    smtp.EnableSsl = settings.Ssl;
                     await smtp.SendMailAsync(message).ConfigureAwait(false);
                 }
             }
@@ -130,23 +140,53 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        private async Task EmailIssue(NotificationModel model)
+        private async Task EmailIssue(NotificationModel model, EmailNotificationSettings settings)
         {
             var message = new MailMessage
             {
                 IsBodyHtml = true,
-                To = { new MailAddress(Settings.RecipientEmail) },
+                To = { new MailAddress(settings.RecipientEmail) },
                 Body = $"Hello! The user '{model.User}' has reported a new issue {model.Body} for the title {model.Title}!",
-                From = new MailAddress(Settings.RecipientEmail),
+                From = new MailAddress(settings.RecipientEmail),
                 Subject = $"Plex Requests: New issue for {model.Title}!"
             };
 
             try
             {
-                using (var smtp = new SmtpClient(Settings.EmailHost, Settings.EmailPort))
+                using (var smtp = new SmtpClient(settings.EmailHost, settings.EmailPort))
+                {
+                    smtp.Credentials = new NetworkCredential(settings.EmailUsername, settings.EmailPassword);
+                    smtp.EnableSsl = settings.Ssl;
+                    await smtp.SendMailAsync(message).ConfigureAwait(false);
+                }
+            }
+            catch (SmtpException smtp)
+            {
+                Log.Error(smtp);
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
+        }
+
+        private async Task EmailTest(NotificationModel model, EmailNotificationSettings settings)
+        {
+            var message = new MailMessage
+            {
+                IsBodyHtml = true,
+                To = { new MailAddress(settings.RecipientEmail) },
+                Body = "This is just a test! Success!",
+                From = new MailAddress(settings.RecipientEmail),
+                Subject = "Plex Requests: Test Message!"
+            };
+
+            try
+            {
+                using (var smtp = new SmtpClient(settings.EmailHost, settings.EmailPort))
                 {
-                    smtp.Credentials = new NetworkCredential(Settings.EmailUsername, Settings.EmailPassword);
-                    smtp.EnableSsl = Settings.Ssl;
+                    smtp.Credentials = new NetworkCredential(settings.EmailUsername, settings.EmailPassword);
+                    smtp.EnableSsl = settings.Ssl;
                     await smtp.SendMailAsync(message).ConfigureAwait(false);
                 }
             }
diff --git a/PlexRequests.Services/Notification/NotificationService.cs b/PlexRequests.Services/Notification/NotificationService.cs
index 116f5aef9..c65ad8a1d 100644
--- a/PlexRequests.Services/Notification/NotificationService.cs
+++ b/PlexRequests.Services/Notification/NotificationService.cs
@@ -32,6 +32,7 @@ using System.Threading.Tasks;
 using NLog;
 
 using PlexRequests.Services.Interfaces;
+using PlexRequests.Core.SettingModels;
 
 namespace PlexRequests.Services.Notification
 {
@@ -47,6 +48,13 @@ namespace PlexRequests.Services.Notification
             await Task.WhenAll(notificationTasks).ConfigureAwait(false);
         }
 
+        public async Task Publish(NotificationModel model, EmailNotificationSettings settings)
+        {
+            var notificationTasks = Observers.Values.Select(notification => NotifyAsync(notification, model, settings));
+
+            await Task.WhenAll(notificationTasks).ConfigureAwait(false);
+        }
+
         public void Subscribe(INotification notification)
         {
             Observers.TryAdd(notification.NotificationName, notification);
@@ -58,10 +66,17 @@ namespace PlexRequests.Services.Notification
         }
 
         private static async Task NotifyAsync(INotification notification, NotificationModel model)
+        {
+
+            await NotifyAsync(notification, model, null);
+
+        }
+
+        private static async Task NotifyAsync(INotification notification, NotificationModel model, EmailNotificationSettings settings)
         {
             try
             {
-                await notification.NotifyAsync(model).ConfigureAwait(false);
+                await notification.NotifyAsync(model, settings).ConfigureAwait(false);
             }
             catch (Exception ex)
             {
diff --git a/PlexRequests.Services/Notification/NotificationType.cs b/PlexRequests.Services/Notification/NotificationType.cs
index bf919fe39..22d0d29b1 100644
--- a/PlexRequests.Services/Notification/NotificationType.cs
+++ b/PlexRequests.Services/Notification/NotificationType.cs
@@ -33,5 +33,6 @@ namespace PlexRequests.Services.Notification
         RequestAvailable,
         RequestApproved,
         AdminNote,
+        Test
     }
 }
diff --git a/PlexRequests.Services/Notification/PushbulletNotification.cs b/PlexRequests.Services/Notification/PushbulletNotification.cs
index 4e2f02144..f71d6d5e0 100644
--- a/PlexRequests.Services/Notification/PushbulletNotification.cs
+++ b/PlexRequests.Services/Notification/PushbulletNotification.cs
@@ -128,5 +128,10 @@ namespace PlexRequests.Services.Notification
                 Log.Error(e);
             }
         }
+
+        public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/Notification/PushoverNotification.cs b/PlexRequests.Services/Notification/PushoverNotification.cs
index bca0b2c90..5e3cc3944 100644
--- a/PlexRequests.Services/Notification/PushoverNotification.cs
+++ b/PlexRequests.Services/Notification/PushoverNotification.cs
@@ -126,5 +126,10 @@ namespace PlexRequests.Services.Notification
                 Log.Error(e);
             }
         }
+
+        public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index e8cd8961f..084e6fdc4 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -51,6 +51,7 @@ using PlexRequests.Store.Models;
 using PlexRequests.Store.Repository;
 using PlexRequests.UI.Helpers;
 using PlexRequests.UI.Models;
+using System;
 
 namespace PlexRequests.UI.Modules
 {
@@ -139,6 +140,7 @@ namespace PlexRequests.UI.Modules
 
             Get["/emailnotification"] = _ => EmailNotifications();
             Post["/emailnotification"] = _ => SaveEmailNotifications();
+            Post["/testemailnotification"] = _ => TestEmailNotifications();
             Get["/status"] = _ => Status();
 
             Get["/pushbulletnotification"] = _ => PushbulletNotifications();
@@ -372,6 +374,19 @@ namespace PlexRequests.UI.Modules
             return View["EmailNotifications", settings];
         }
 
+        private Response TestEmailNotifications()
+        {
+            var settings = this.Bind<EmailNotificationSettings>();
+            var notificationModel = new NotificationModel
+            {
+                NotificationType = NotificationType.Test,
+                DateTime = DateTime.Now
+            };
+            NotificationService.Publish(notificationModel, settings);
+            Log.Info("Sent email notification test");
+            return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Email Notification!" });
+        }
+
         private Response SaveEmailNotifications()
         {
             var settings = this.Bind<EmailNotificationSettings>();
diff --git a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
index 41a667e51..86f5e2322 100644
--- a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
@@ -88,6 +88,11 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <div>
+                    <button id="testEmail" type="submit" class="btn btn-primary-outline">Test</button>
+                </div>
+            </div>
 
             <div class="form-group">
                 <div>
@@ -128,7 +133,32 @@
             });
         });
 
-
+        $('#testEmail').click(function (e) {
+            e.preventDefault();
+            var port = $('#EmailPort').val();
+            if (isNaN(port)) {
+                generateNotify("You must specify a valid Port.", "warning");
+                return;
+            }
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: '/admin/testemailnotification',
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
 
 
     });

From 45208e528f19887c8fc85401bdba59685b4f722b Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 13:27:10 -0500
Subject: [PATCH 10/23] #96 modify notifications interface/service to accept a
 non-type specific settings object.

---
 PlexRequests.Services/Interfaces/INotification.cs    |  2 +-
 .../Interfaces/INotificationService.cs               |  2 +-
 .../Notification/EmailMessageNotification.cs         | 12 +++++++-----
 .../Notification/NotificationService.cs              |  4 ++--
 .../Notification/PushbulletNotification.cs           |  2 +-
 .../Notification/PushoverNotification.cs             |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/PlexRequests.Services/Interfaces/INotification.cs b/PlexRequests.Services/Interfaces/INotification.cs
index 2ee0b4f35..2e4e55ea4 100644
--- a/PlexRequests.Services/Interfaces/INotification.cs
+++ b/PlexRequests.Services/Interfaces/INotification.cs
@@ -37,6 +37,6 @@ namespace PlexRequests.Services.Interfaces
 
         Task NotifyAsync(NotificationModel model);
 
-        Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings);
+        Task NotifyAsync(NotificationModel model, Settings settings);
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/Interfaces/INotificationService.cs b/PlexRequests.Services/Interfaces/INotificationService.cs
index 14408b031..91563c6de 100644
--- a/PlexRequests.Services/Interfaces/INotificationService.cs
+++ b/PlexRequests.Services/Interfaces/INotificationService.cs
@@ -34,7 +34,7 @@ namespace PlexRequests.Services.Interfaces
     public interface INotificationService
     {
         Task Publish(NotificationModel model);
-        Task Publish(NotificationModel model, EmailNotificationSettings settings);
+        Task Publish(NotificationModel model, Settings settings);
         void Subscribe(INotification notification);
         void UnSubscribe(INotification notification);
 
diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
index c247eed0a..ca0d581cd 100644
--- a/PlexRequests.Services/Notification/EmailMessageNotification.cs
+++ b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -54,11 +54,13 @@ namespace PlexRequests.Services.Notification
             await NotifyAsync(model, configuration);
         }
 
-        public async Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        public async Task NotifyAsync(NotificationModel model, Settings settings)
         {
             if (settings == null) await NotifyAsync(model);
 
-            if (!ValidateConfiguration(settings))
+            var emailSettings = (EmailNotificationSettings)settings;
+
+            if (!ValidateConfiguration(emailSettings))
             {
                 return;
             }
@@ -66,10 +68,10 @@ namespace PlexRequests.Services.Notification
             switch (model.NotificationType)
             {
                 case NotificationType.NewRequest:
-                    await EmailNewRequest(model, settings);
+                    await EmailNewRequest(model, emailSettings);
                     break;
                 case NotificationType.Issue:
-                    await EmailIssue(model, settings);
+                    await EmailIssue(model, emailSettings);
                     break;
                 case NotificationType.RequestAvailable:
                     throw new NotImplementedException();
@@ -81,7 +83,7 @@ namespace PlexRequests.Services.Notification
                     throw new NotImplementedException();
 
                 case NotificationType.Test:
-                    await EmailTest(model, settings);
+                    await EmailTest(model, emailSettings);
                     break;
 
                 default:
diff --git a/PlexRequests.Services/Notification/NotificationService.cs b/PlexRequests.Services/Notification/NotificationService.cs
index c65ad8a1d..8477a2159 100644
--- a/PlexRequests.Services/Notification/NotificationService.cs
+++ b/PlexRequests.Services/Notification/NotificationService.cs
@@ -48,7 +48,7 @@ namespace PlexRequests.Services.Notification
             await Task.WhenAll(notificationTasks).ConfigureAwait(false);
         }
 
-        public async Task Publish(NotificationModel model, EmailNotificationSettings settings)
+        public async Task Publish(NotificationModel model, Settings settings)
         {
             var notificationTasks = Observers.Values.Select(notification => NotifyAsync(notification, model, settings));
 
@@ -72,7 +72,7 @@ namespace PlexRequests.Services.Notification
 
         }
 
-        private static async Task NotifyAsync(INotification notification, NotificationModel model, EmailNotificationSettings settings)
+        private static async Task NotifyAsync(INotification notification, NotificationModel model, Settings settings)
         {
             try
             {
diff --git a/PlexRequests.Services/Notification/PushbulletNotification.cs b/PlexRequests.Services/Notification/PushbulletNotification.cs
index f71d6d5e0..aed796fc1 100644
--- a/PlexRequests.Services/Notification/PushbulletNotification.cs
+++ b/PlexRequests.Services/Notification/PushbulletNotification.cs
@@ -129,7 +129,7 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        public Task NotifyAsync(NotificationModel model, Settings settings)
         {
             throw new NotImplementedException();
         }
diff --git a/PlexRequests.Services/Notification/PushoverNotification.cs b/PlexRequests.Services/Notification/PushoverNotification.cs
index 5e3cc3944..ef3671014 100644
--- a/PlexRequests.Services/Notification/PushoverNotification.cs
+++ b/PlexRequests.Services/Notification/PushoverNotification.cs
@@ -127,7 +127,7 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        public Task NotifyAsync(NotificationModel model, Settings settings)
         {
             throw new NotImplementedException();
         }

From 9742b42fdf634a3400c6a29c0f5e149f55c7688c Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 13:44:11 -0500
Subject: [PATCH 11/23] #96 add the necessary back-end code to produce a test
 message for all notification types (still have to add the test buttons for
 pushbullet/pushover)

---
 .../Notification/EmailMessageNotification.cs  |  5 +-
 .../Notification/PushbulletNotification.cs    | 53 +++++++++++++------
 .../Notification/PushoverNotification.cs      | 52 ++++++++++++------
 3 files changed, 76 insertions(+), 34 deletions(-)

diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
index ca0d581cd..4a359fb23 100644
--- a/PlexRequests.Services/Notification/EmailMessageNotification.cs
+++ b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -60,10 +60,7 @@ namespace PlexRequests.Services.Notification
 
             var emailSettings = (EmailNotificationSettings)settings;
 
-            if (!ValidateConfiguration(emailSettings))
-            {
-                return;
-            }
+            if (!ValidateConfiguration(emailSettings)) return;
 
             switch (model.NotificationType)
             {
diff --git a/PlexRequests.Services/Notification/PushbulletNotification.cs b/PlexRequests.Services/Notification/PushbulletNotification.cs
index aed796fc1..521855dca 100644
--- a/PlexRequests.Services/Notification/PushbulletNotification.cs
+++ b/PlexRequests.Services/Notification/PushbulletNotification.cs
@@ -51,18 +51,25 @@ namespace PlexRequests.Services.Notification
         public string NotificationName => "PushbulletNotification";
         public async Task NotifyAsync(NotificationModel model)
         {
-            if (!ValidateConfiguration())
-            {
-                return;
-            }
+            var configuration = GetSettings();
+            await NotifyAsync(model, configuration);
+        }
+
+        public async Task NotifyAsync(NotificationModel model, Settings settings)
+        {
+            if (settings == null) await NotifyAsync(model);
+
+            var pushSettings = (PushbulletNotificationSettings)settings;
+
+            if (!ValidateConfiguration(pushSettings)) return;
 
             switch (model.NotificationType)
             {
                 case NotificationType.NewRequest:
-                    await PushNewRequestAsync(model);
+                    await PushNewRequestAsync(model, pushSettings);
                     break;
                 case NotificationType.Issue:
-                    await PushIssueAsync(model);
+                    await PushIssueAsync(model, pushSettings);
                     break;
                 case NotificationType.RequestAvailable:
                     break;
@@ -70,18 +77,21 @@ namespace PlexRequests.Services.Notification
                     break;
                 case NotificationType.AdminNote:
                     break;
+                case NotificationType.Test:
+                    await PushTestAsync(model, pushSettings);
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        private bool ValidateConfiguration()
+        private bool ValidateConfiguration(PushbulletNotificationSettings settings)
         {
-            if (!Settings.Enabled)
+            if (!settings.Enabled)
             {
                 return false;
             }
-            if (string.IsNullOrEmpty(Settings.AccessToken))
+            if (string.IsNullOrEmpty(settings.AccessToken))
             {
                 return false;
             }
@@ -93,13 +103,13 @@ namespace PlexRequests.Services.Notification
             return SettingsService.GetSettings();
         }
 
-        private async Task PushNewRequestAsync(NotificationModel model)
+        private async Task PushNewRequestAsync(NotificationModel model, PushbulletNotificationSettings settings)
         {
             var message = $"{model.Title} has been requested by user: {model.User}";
             var pushTitle = $"Plex Requests: {model.Title} has been requested!";
             try
             {
-                var result = await PushbulletApi.PushAsync(Settings.AccessToken, pushTitle, message, Settings.DeviceIdentifier);
+                var result = await PushbulletApi.PushAsync(settings.AccessToken, pushTitle, message, settings.DeviceIdentifier);
                 if (result == null)
                 {
                     Log.Error("Pushbullet api returned a null value, the notification did not get pushed");
@@ -111,13 +121,13 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        private async Task PushIssueAsync(NotificationModel model)
+        private async Task PushIssueAsync(NotificationModel model, PushbulletNotificationSettings settings)
         {
             var message = $"A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}";
             var pushTitle = $"Plex Requests: A new issue has been reported for {model.Title}";
             try
             {
-                var result = await PushbulletApi.PushAsync(Settings.AccessToken, pushTitle, message, Settings.DeviceIdentifier);
+                var result = await PushbulletApi.PushAsync(settings.AccessToken, pushTitle, message, settings.DeviceIdentifier);
                 if (result != null)
                 {
                     Log.Error("Pushbullet api returned a null value, the notification did not get pushed");
@@ -129,9 +139,22 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        public Task NotifyAsync(NotificationModel model, Settings settings)
+        private async Task PushTestAsync(NotificationModel model, PushbulletNotificationSettings settings)
         {
-            throw new NotImplementedException();
+            var message = "This is just a test! Success!";
+            var pushTitle = "Plex Requests: Test Message!";
+            try
+            {
+                var result = await PushbulletApi.PushAsync(settings.AccessToken, pushTitle, message, settings.DeviceIdentifier);
+                if (result != null)
+                {
+                    Log.Error("Pushbullet api returned a null value, the notification did not get pushed");
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/Notification/PushoverNotification.cs b/PlexRequests.Services/Notification/PushoverNotification.cs
index ef3671014..47854b1d5 100644
--- a/PlexRequests.Services/Notification/PushoverNotification.cs
+++ b/PlexRequests.Services/Notification/PushoverNotification.cs
@@ -51,18 +51,25 @@ namespace PlexRequests.Services.Notification
         public string NotificationName => "PushoverNotification";
         public async Task NotifyAsync(NotificationModel model)
         {
-            if (!ValidateConfiguration())
-            {
-                return;
-            }
+            var configuration = GetSettings();
+            await NotifyAsync(model, configuration);
+        }
+
+        public async Task NotifyAsync(NotificationModel model, Settings settings)
+        {
+            if (settings == null) await NotifyAsync(model);
+
+            var pushSettings = (PushoverNotificationSettings)settings;
+
+            if (!ValidateConfiguration(pushSettings)) return;
 
             switch (model.NotificationType)
             {
                 case NotificationType.NewRequest:
-                    await PushNewRequestAsync(model);
+                    await PushNewRequestAsync(model, pushSettings);
                     break;
                 case NotificationType.Issue:
-                    await PushIssueAsync(model);
+                    await PushIssueAsync(model, pushSettings);
                     break;
                 case NotificationType.RequestAvailable:
                     break;
@@ -70,18 +77,21 @@ namespace PlexRequests.Services.Notification
                     break;
                 case NotificationType.AdminNote:
                     break;
+                case NotificationType.Test:
+                    await PushTestAsync(model, pushSettings);
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        private bool ValidateConfiguration()
+        private bool ValidateConfiguration(PushoverNotificationSettings settings)
         {
-            if (!Settings.Enabled)
+            if (!settings.Enabled)
             {
                 return false;
             }
-            if (string.IsNullOrEmpty(Settings.AccessToken) || string.IsNullOrEmpty(Settings.UserToken))
+            if (string.IsNullOrEmpty(settings.AccessToken) || string.IsNullOrEmpty(settings.UserToken))
             {
                 return false;
             }
@@ -93,12 +103,12 @@ namespace PlexRequests.Services.Notification
             return SettingsService.GetSettings();
         }
 
-        private async Task PushNewRequestAsync(NotificationModel model)
+        private async Task PushNewRequestAsync(NotificationModel model, PushoverNotificationSettings settings)
         {
             var message = $"Plex Requests: {model.Title} has been requested by user: {model.User}";
             try
             {
-                var result = await PushoverApi.PushAsync(Settings.AccessToken, message, Settings.UserToken);
+                var result = await PushoverApi.PushAsync(settings.AccessToken, message, settings.UserToken);
                 if (result?.status != 1)
                 {
                     Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed");
@@ -110,12 +120,12 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        private async Task PushIssueAsync(NotificationModel model)
+        private async Task PushIssueAsync(NotificationModel model, PushoverNotificationSettings settings)
         {
             var message = $"Plex Requests: A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}";
             try
             {
-                var result = await PushoverApi.PushAsync(Settings.AccessToken, message, Settings.UserToken);
+                var result = await PushoverApi.PushAsync(settings.AccessToken, message, settings.UserToken);
                 if (result?.status != 1)
                 {
                     Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed");
@@ -127,9 +137,21 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        public Task NotifyAsync(NotificationModel model, Settings settings)
+        private async Task PushTestAsync(NotificationModel model, PushoverNotificationSettings settings)
         {
-            throw new NotImplementedException();
+            var message = $"Plex Requests: Test Message!";
+            try
+            {
+                var result = await PushoverApi.PushAsync(settings.AccessToken, message, settings.UserToken);
+                if (result?.status != 1)
+                {
+                    Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed");
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
         }
     }
 }
\ No newline at end of file

From 3d41445f6fb92a82c8d6f9e8ac58abc428780dad Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 14:42:25 -0500
Subject: [PATCH 12/23] #96 Finished adding test functionality to notifications

---
 PlexRequests.UI/Modules/AdminModule.cs        | 43 +++++++++++++++++++
 .../Admin/PushbulletNotifications.cshtml      | 29 +++++++++++++
 .../Views/Admin/PushoverNotifications.cshtml  | 29 +++++++++++++
 3 files changed, 101 insertions(+)

diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index 084e6fdc4..6aea85bbb 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -145,9 +145,11 @@ namespace PlexRequests.UI.Modules
 
             Get["/pushbulletnotification"] = _ => PushbulletNotifications();
             Post["/pushbulletnotification"] = _ => SavePushbulletNotifications();
+            Post["/testpushbulletnotification"] = _ => TestPushbulletNotifications();
 
             Get["/pushovernotification"] = _ => PushoverNotifications();
             Post["/pushovernotification"] = _ => SavePushoverNotifications();
+            Post["/testpushovernotification"] = _ => TestPushoverNotifications();
 
             Get["/logs"] = _ => Logs();
             Get["/loglevel"] = _ => GetLogLevels();
@@ -377,6 +379,11 @@ namespace PlexRequests.UI.Modules
         private Response TestEmailNotifications()
         {
             var settings = this.Bind<EmailNotificationSettings>();
+            var valid = this.Validate(settings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
             var notificationModel = new NotificationModel
             {
                 NotificationType = NotificationType.Test,
@@ -455,6 +462,24 @@ namespace PlexRequests.UI.Modules
                 : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
+        private Response TestPushbulletNotifications()
+        {
+            var settings = this.Bind<PushbulletNotificationSettings>();
+            var valid = this.Validate(settings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
+            var notificationModel = new NotificationModel
+            {
+                NotificationType = NotificationType.Test,
+                DateTime = DateTime.Now
+            };
+            NotificationService.Publish(notificationModel, settings);
+            Log.Info("Sent pushbullet notification test");
+            return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushbullet Notification!" });
+        }
+
         private Negotiator PushoverNotifications()
         {
             var settings = PushoverService.GetSettings();
@@ -487,6 +512,24 @@ namespace PlexRequests.UI.Modules
                 : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
+        private Response TestPushoverNotifications()
+        {
+            var settings = this.Bind<PushoverNotificationSettings>();
+            var valid = this.Validate(settings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
+            var notificationModel = new NotificationModel
+            {
+                NotificationType = NotificationType.Test,
+                DateTime = DateTime.Now
+            };
+            NotificationService.Publish(notificationModel, settings);
+            Log.Info("Sent pushover notification test");
+            return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushover Notification!" });
+        }
+
         private Response GetCpProfiles()
         {
             var settings = this.Bind<CouchPotatoSettings>();
diff --git a/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml b/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml
index 4f658da53..73d28d87c 100644
--- a/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml
@@ -36,6 +36,12 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <div>
+                    <button id="testPushbullet" type="submit" class="btn btn-primary-outline">Test</button>
+                </div>
+            </div>
+
             <div class="form-group">
                 <div>
                     <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
@@ -70,5 +76,28 @@
                 }
             });
         });
+
+        $('#testPushbullet').click(function (e) {
+            e.preventDefault();
+
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: '/admin/testpushbulletnotification',
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
     });
 </script>
\ No newline at end of file
diff --git a/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml b/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
index 0877739d0..b5fcab7f5 100644
--- a/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
@@ -36,6 +36,12 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <div>
+                    <button id="testPushover" type="submit" class="btn btn-primary-outline">Test</button>
+                </div>
+            </div>
+
             <div class="form-group">
                 <div>
                     <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
@@ -70,5 +76,28 @@
                 }
             });
         });
+
+        $('#testPushover').click(function (e) {
+            e.preventDefault();
+
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: '/admin/testpushovernotification',
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
     });
 </script>
\ No newline at end of file

From eddce77ff5347ad91a243a260e65359d6afa6401 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 14:53:35 -0500
Subject: [PATCH 13/23] UI - increase icon size of nav menu (they were too
 small before)

---
 PlexRequests.UI/Content/custom.css     | 7 +++++++
 PlexRequests.UI/Content/custom.min.css | 2 +-
 PlexRequests.UI/Content/custom.scss    | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index 7ff72e7f4..cb9a400b5 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -45,6 +45,13 @@ label {
 .nav-tabs > li.active > a:focus {
   background: #4e5d6c; }
 
+.navbar .nav a .fa {
+  font-size: 130%;
+  top: 1px;
+  position: relative;
+  display: inline-block;
+  margin-right: 5px; }
+
 .btn-danger-outline {
   color: #d9534f !important;
   background-color: transparent;
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 2a046eb7d..2966b6610 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index 029748ecd..96afda8e8 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -71,6 +71,14 @@ label {
     background: #4e5d6c;
 }
 
+.navbar .nav a .fa {
+    font-size: 130%;
+    top: 1px;
+    position: relative;
+    display: inline-block;
+    margin-right: 5px;
+}
+
 .btn-danger-outline {
     color: $danger-colour $i;
     background-color: transparent;

From a2cbcaa4f1f02eaae761021da3c628a8eceb6a2a Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 20:50:18 -0500
Subject: [PATCH 14/23] fix notification tests

---
 .../Notification/NotificationService.cs                | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/PlexRequests.Services/Notification/NotificationService.cs b/PlexRequests.Services/Notification/NotificationService.cs
index 8477a2159..35e52fd7d 100644
--- a/PlexRequests.Services/Notification/NotificationService.cs
+++ b/PlexRequests.Services/Notification/NotificationService.cs
@@ -67,8 +67,14 @@ namespace PlexRequests.Services.Notification
 
         private static async Task NotifyAsync(INotification notification, NotificationModel model)
         {
-
-            await NotifyAsync(notification, model, null);
+            try
+            {
+                await notification.NotifyAsync(model).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, $"Notification '{notification.NotificationName}' failed with exception");
+            }
 
         }
 

From 855689d0b95a60245fd4ff976a96b9f7df22e13a Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 21:51:48 -0500
Subject: [PATCH 15/23] add some "no results" feedback to the searching + minor
 UI improvements

---
 PlexRequests.UI/Content/custom.css        | 15 +++++++++-
 PlexRequests.UI/Content/custom.min.css    |  2 +-
 PlexRequests.UI/Content/custom.scss       | 35 +++++++++++++++++------
 PlexRequests.UI/Content/search.js         |  8 ++++++
 PlexRequests.UI/Views/Search/Index.cshtml |  2 +-
 5 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index cb9a400b5..51130e9e9 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -22,7 +22,9 @@
 
 .form-control-custom {
   background-color: #4e5d6c !important;
-  color: white !important; }
+  color: white !important;
+  border-radius: 0;
+  box-shadow: 0 0 0 !important; }
 
 h1 {
   font-size: 3.5rem !important;
@@ -138,3 +140,14 @@ label {
 #tvList .mix {
   display: none; }
 
+.no-search-results {
+  text-align: center; }
+
+.no-search-results .no-search-results-icon {
+  font-size: 10em;
+  color: #4e5d6c; }
+
+.no-search-results .no-search-results-text {
+  margin: 20px 0;
+  color: #ccc; }
+
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 2966b6610..9e3d7e793 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index 96afda8e8..f2703ee4a 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -5,7 +5,9 @@ $info-colour: #5bc0de;
 $warning-colour: #f0ad4e;
 $danger-colour: #d9534f;
 $success-colour: #5cb85c;
-$i:!important;
+$i:
+!important
+;
 
 @media (min-width: 768px ) {
     .row {
@@ -42,6 +44,8 @@ $i:!important;
 .form-control-custom {
     background-color: $form-color $i;
     color: white $i;
+    border-radius: 0;
+    box-shadow: 0 0 0 !important;
 }
 
 
@@ -65,8 +69,8 @@ label {
     font-size: 16px $i;
 }
 
-.nav-tabs > li.active > a, 
-.nav-tabs > li.active > a:hover, 
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
 .nav-tabs > li.active > a:focus {
     background: #4e5d6c;
 }
@@ -170,9 +174,24 @@ label {
     border-color: $success-colour $i;
 }
 
-#movieList .mix{
-	display: none;
+#movieList .mix {
+    display: none;
+}
+
+#tvList .mix {
+    display: none;
+}
+
+.no-search-results {
+    text-align: center;
+}
+
+.no-search-results .no-search-results-icon {
+    font-size: 10em;
+    color: $form-color;
+}
+
+.no-search-results .no-search-results-text {
+    margin: 20px 0;
+    color: #ccc;
 }
-#tvList .mix{
-	display: none;
-}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js
index cea4eca66..4d7b001bb 100644
--- a/PlexRequests.UI/Content/search.js
+++ b/PlexRequests.UI/Content/search.js
@@ -7,6 +7,8 @@
 
 var searchSource = $("#search-template").html();
 var searchTemplate = Handlebars.compile(searchSource);
+var noResultsHtml = "<div class='no-search-results'>" +
+    "<i class='fa fa-film no-search-results-icon'></i><div class='no-search-results-text'>Sorry, we didn't find any results!</div></div>";
 var movieTimer = 0;
 var tvimer = 0;
 
@@ -124,6 +126,9 @@ function movieSearch() {
                 $("#movieList").append(html);
             });
         }
+        else {
+            $("#movieList").html(noResultsHtml);
+        }
         $('#movieSearchButton').attr("class","fa fa-search");
     });
 };
@@ -140,6 +145,9 @@ function tvSearch() {
                 $("#tvList").append(html);
             });
         }
+        else {
+            $("#tvList").html(noResultsHtml);
+        }
         $('#tvSearchButton').attr("class", "fa fa-search");
     });
 };
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index 4356c069a..5006a58c2 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -1,6 +1,7 @@
 <div>
     <h1>Search</h1>
     <h4>Want to watch something that is not currently on Plex?! No problem! Just search for it below and request it!</h4>
+    <br />
     <!-- Nav tabs -->
     <ul id="nav-tabs" class="nav nav-tabs" role="tablist">
         @if (Model.SearchForMovies)
@@ -57,7 +58,6 @@
 
 </div>
 
-
 <script id="search-template" type="text/x-handlebars-template">
     <div class="row">
         <div class="col-sm-2">

From 591385ae3439465246d5d60ff797546b0a6b8e31 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 10:11:06 -0500
Subject: [PATCH 16/23] when pulling requests, set each to approved that is
 already available (so the UI avoids showing the approve option for already
 available content)

---
 PlexRequests.UI/Modules/RequestsModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index b49acd013..d6f565f27 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -99,7 +99,7 @@ namespace PlexRequests.UI.Modules
                 ReleaseDateTicks = movie.ReleaseDate.Ticks,
                 RequestedDate = movie.RequestedDate.Humanize(),
                 RequestedDateTicks = movie.RequestedDate.Ticks,
-                Approved = movie.Approved,
+                Approved = movie.Available ? true : movie.Approved,
                 Title = movie.Title,
                 Overview = movie.Overview,
                 RequestedBy = movie.RequestedBy,
@@ -136,7 +136,7 @@ namespace PlexRequests.UI.Modules
                 ReleaseDateTicks = tv.ReleaseDate.Ticks,
                 RequestedDate = tv.RequestedDate.Humanize(),
                 RequestedDateTicks = tv.RequestedDate.Ticks,
-                Approved = tv.Approved,
+                Approved = tv.Available ? true : tv.Approved,
                 Title = tv.Title,
                 Overview = tv.Overview,
                 RequestedBy = tv.RequestedBy,

From 6fc4cbf9a4930bedc6400849f232370e21df4a1d Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 10:54:15 -0500
Subject: [PATCH 17/23] fix the request page sort/approve button alignment

---
 PlexRequests.UI/Modules/RequestsModule.cs   |  4 +-
 PlexRequests.UI/Views/Requests/Index.cshtml | 80 +++++++++++----------
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index d6f565f27..6651b1c8a 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -99,7 +99,7 @@ namespace PlexRequests.UI.Modules
                 ReleaseDateTicks = movie.ReleaseDate.Ticks,
                 RequestedDate = movie.RequestedDate.Humanize(),
                 RequestedDateTicks = movie.RequestedDate.Ticks,
-                Approved = movie.Available ? true : movie.Approved,
+                Approved = movie.Available || movie.Approved,
                 Title = movie.Title,
                 Overview = movie.Overview,
                 RequestedBy = movie.RequestedBy,
@@ -136,7 +136,7 @@ namespace PlexRequests.UI.Modules
                 ReleaseDateTicks = tv.ReleaseDate.Ticks,
                 RequestedDate = tv.RequestedDate.Humanize(),
                 RequestedDateTicks = tv.RequestedDate.Ticks,
-                Approved = tv.Available ? true : tv.Approved,
+                Approved = tv.Available || tv.Approved,
                 Title = tv.Title,
                 Overview = tv.Overview,
                 RequestedBy = tv.RequestedBy,
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index c641126bb..11d8dd33e 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -20,43 +20,49 @@
 
     <!-- Tab panes -->
     <div class="tab-content contentList">
-        <div class="btn-group col-sm-push-8">
-            @if (Context.CurrentUser.IsAuthenticated())
-            {
-                @if (Model.SearchForMovies)
-                {
-                    <button id="approveMovies" class="btn btn-success-outline approve-category" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
-                }
-                @if (Model.SearchForTvShows)
-                {
-                    <button id="approveTVShows" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve TV Shows</button>
-                }
-            }
-        </div>
-        <div class="btn-group col-sm-push-8">
-            <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                Filter
-                <i class="fa fa-filter"></i>
-            </a>
-            <ul class="dropdown-menu">
-                <li><a href="#" class="filter" data-filter="all"><i class="fa fa-square"></i>  All</a></li>
-                <li><a href="#" class="filter" data-filter=".approved-true"><i class="fa fa-square-o"></i>  Approved</a></li>
-                <li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i>  Not Approved</a></li>
-                <li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i>  Available</a></li>
-                <li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i>  Not Available</a></li>
-            </ul>
-        </div>
-        <div class="btn-group col-sm-push-8">
-            <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                Order
-                <i class="fa fa-sort"></i>
-            </a>
-            <ul class="dropdown-menu">
-                <li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-square"></i>  Recent Requests</a></li>
-                <li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i>  Older Requests</a></li>
-                <li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i>  Recent Releases</a></li>
-                <li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i>  Older Releases</a></li>
-            </ul>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="pull-right">
+                    <div class="btn-group">
+                        @if (Context.CurrentUser.IsAuthenticated())
+                        {
+                            @if (Model.SearchForMovies)
+                            {
+                                <button id="approveMovies" class="btn btn-success-outline approve-category" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
+                            }
+                            @if (Model.SearchForTvShows)
+                            {
+                                <button id="approveTVShows" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve TV Shows</button>
+                            }
+                        }
+                    </div>
+                    <div class="btn-group">
+                        <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            Filter
+                            <i class="fa fa-filter"></i>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="#" class="filter" data-filter="all"><i class="fa fa-square"></i>  All</a></li>
+                            <li><a href="#" class="filter" data-filter=".approved-true"><i class="fa fa-square-o"></i>  Approved</a></li>
+                            <li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i>  Not Approved</a></li>
+                            <li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i>  Available</a></li>
+                            <li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i>  Not Available</a></li>
+                        </ul>
+                    </div>
+                    <div class="btn-group">
+                        <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            Order
+                            <i class="fa fa-sort"></i>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-square"></i>  Recent Requests</a></li>
+                            <li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i>  Older Requests</a></li>
+                            <li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i>  Recent Releases</a></li>
+                            <li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i>  Older Releases</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
         </div>
         @if (Model.SearchForMovies)
             {

From 5a5512a1cd34aad163201a82be3db89e3bfe193e Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 11:38:22 -0500
Subject: [PATCH 18/23] #96 fix up notification test feature

---
 PlexRequests.UI/Modules/AdminModule.cs | 51 +++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index df9bfef0d..87bc29da9 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -397,8 +397,21 @@ namespace PlexRequests.UI.Modules
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
-            NotificationService.Publish(notificationModel, settings);
-            Log.Info("Sent email notification test");
+            try
+            {
+                NotificationService.Subscribe(new EmailMessageNotification(EmailService));
+                settings.Enabled = true;
+                NotificationService.Publish(notificationModel, settings);
+                Log.Info("Sent email notification test");
+            }
+            catch (Exception)
+            {
+                Log.Error("Failed to subscribe and publish test Email Notification");
+            }
+            finally
+            {
+                NotificationService.UnSubscribe(new EmailMessageNotification(EmailService));
+            } 
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Email Notification!" });
         }
 
@@ -483,8 +496,21 @@ namespace PlexRequests.UI.Modules
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
-            NotificationService.Publish(notificationModel, settings);
-            Log.Info("Sent pushbullet notification test");
+            try
+            {
+                NotificationService.Subscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
+                settings.Enabled = true;
+                NotificationService.Publish(notificationModel, settings);
+                Log.Info("Sent pushbullet notification test");
+            }
+            catch (Exception)
+            {
+                Log.Error("Failed to subscribe and publish test Pushbullet Notification");
+            }
+            finally
+            {
+                NotificationService.UnSubscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
+            }
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushbullet Notification!" });
         }
 
@@ -533,8 +559,21 @@ namespace PlexRequests.UI.Modules
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
-            NotificationService.Publish(notificationModel, settings);
-            Log.Info("Sent pushover notification test");
+            try
+            {
+                NotificationService.Subscribe(new PushoverNotification(PushoverApi, PushoverService));
+                settings.Enabled = true;
+                NotificationService.Publish(notificationModel, settings);
+                Log.Info("Sent pushover notification test");
+            }
+            catch (Exception)
+            {
+                Log.Error("Failed to subscribe and publish test Pushover Notification");
+            }
+            finally
+            {
+                NotificationService.UnSubscribe(new PushoverNotification(PushoverApi, PushoverService));
+            }
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushover Notification!" });
         }
 

From b8a01b62b9ece14402b1c0071655a023a5c6e916 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 13:41:39 -0500
Subject: [PATCH 19/23] only show requested by users to admins + start
 maintaining a list of users with each request

---
 PlexRequests.Core/IRequestService.cs        |  2 +-
 PlexRequests.Core/JsonRequestService.cs     |  5 +--
 PlexRequests.Store/RequestedModel.cs        | 16 +++++++++
 PlexRequests.UI/Content/requests.js         |  2 +-
 PlexRequests.UI/Models/RequestViewModel.cs  |  2 +-
 PlexRequests.UI/Modules/RequestsModule.cs   |  8 ++---
 PlexRequests.UI/Modules/SearchModule.cs     | 37 +++++++++++++++------
 PlexRequests.UI/Views/Requests/Index.cshtml |  2 +-
 8 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/PlexRequests.Core/IRequestService.cs b/PlexRequests.Core/IRequestService.cs
index fb68fab37..fc5187aed 100644
--- a/PlexRequests.Core/IRequestService.cs
+++ b/PlexRequests.Core/IRequestService.cs
@@ -33,7 +33,7 @@ namespace PlexRequests.Core
     public interface IRequestService
     {
         long AddRequest(RequestedModel model);
-        bool CheckRequest(int providerId);
+        RequestedModel CheckRequest(int providerId);
         void DeleteRequest(RequestedModel request);
         bool UpdateRequest(RequestedModel model);
         RequestedModel Get(int id);
diff --git a/PlexRequests.Core/JsonRequestService.cs b/PlexRequests.Core/JsonRequestService.cs
index 64033b50c..45eccb51e 100644
--- a/PlexRequests.Core/JsonRequestService.cs
+++ b/PlexRequests.Core/JsonRequestService.cs
@@ -58,10 +58,11 @@ namespace PlexRequests.Core
             return result ? id : -1;
         }
 
-        public bool CheckRequest(int providerId)
+        public RequestedModel CheckRequest(int providerId)
         {
             var blobs = Repo.GetAll();
-            return blobs.Any(x => x.ProviderId == providerId);
+            var blob = blobs.FirstOrDefault(x => x.ProviderId == providerId);
+            return blob != null ? ByteConverterHelper.ReturnObject<RequestedModel>(blob.Content) : null;
         }
 
         public void DeleteRequest(RequestedModel request)
diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index 18ef216af..34a9f181c 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -2,6 +2,8 @@
 using System.Security.Cryptography;
 
 using Dapper.Contrib.Extensions;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace PlexRequests.Store
 {
@@ -18,7 +20,10 @@ namespace PlexRequests.Store
         public RequestType Type { get; set; }
         public string Status { get; set; }
         public bool Approved { get; set; }
+
+        [Obsolete("Use RequestedUsers")]
         public string RequestedBy { get; set; }
+
         public DateTime RequestedDate { get; set; }
         public bool Available { get; set; }
         public IssueState Issues { get; set; }
@@ -27,6 +32,17 @@ namespace PlexRequests.Store
         public int[] SeasonList { get; set; }
         public int SeasonCount { get; set; }
         public string SeasonsRequested { get; set; }
+        public List<string> RequestedUsers { get; set; }
+
+        public bool UserHasRequested(string username)
+        {
+            bool alreadyRequested = !string.IsNullOrEmpty(RequestedBy) && RequestedBy.Equals(username, StringComparison.OrdinalIgnoreCase);
+            if (!alreadyRequested && RequestedUsers != null && RequestedUsers.Count > 0)
+            {
+                alreadyRequested = RequestedUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase)); 
+            }
+            return alreadyRequested;
+        }
     }
 
     public enum RequestType
diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 22fba0978..6b6d00572 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -433,7 +433,7 @@ function buildRequestContext(result, type) {
         releaseDate: result.releaseDate,
         releaseDateTicks: result.releaseDateTicks,
         approved: result.approved,
-        requestedBy: result.requestedBy,
+        requestedUsers: result.requestedUsers ? result.requestedUsers.join(', ') : '',
         requestedDate: result.requestedDate,
         requestedDateTicks: result.requestedDateTicks,
         available: result.available,
diff --git a/PlexRequests.UI/Models/RequestViewModel.cs b/PlexRequests.UI/Models/RequestViewModel.cs
index 5ee389be9..292bc39df 100644
--- a/PlexRequests.UI/Models/RequestViewModel.cs
+++ b/PlexRequests.UI/Models/RequestViewModel.cs
@@ -41,7 +41,7 @@ namespace PlexRequests.UI.Models
         public RequestType Type { get; set; }
         public string Status { get; set; }
         public bool Approved { get; set; }
-        public string RequestedBy { get; set; }
+        public string[] RequestedUsers { get; set; }
         public string RequestedDate { get; set; }
         public long RequestedDateTicks { get; set; }
         public string ReleaseYear { get; set; }
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 6651b1c8a..9d43b34a7 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -84,7 +84,7 @@ namespace PlexRequests.UI.Modules
             var dbMovies = Service.GetAll().Where(x => x.Type == RequestType.Movie);
             if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
             {
-                dbMovies = dbMovies.Where(x => x.RequestedBy.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase));
+                dbMovies = dbMovies.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
             }
 
             var viewModel = dbMovies.Select(movie => new RequestViewModel
@@ -102,7 +102,7 @@ namespace PlexRequests.UI.Modules
                 Approved = movie.Available || movie.Approved,
                 Title = movie.Title,
                 Overview = movie.Overview,
-                RequestedBy = movie.RequestedBy,
+                RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { },
                 ReleaseYear = movie.ReleaseDate.Year.ToString(),
                 Available = movie.Available,
                 Admin = isAdmin,
@@ -121,7 +121,7 @@ namespace PlexRequests.UI.Modules
             var dbTv = Service.GetAll().Where(x => x.Type == RequestType.TvShow);
             if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
             {
-                dbTv = dbTv.Where(x => x.RequestedBy.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase));
+                dbTv = dbTv.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
             }
 
             var viewModel = dbTv.Select(tv => new RequestViewModel
@@ -139,7 +139,7 @@ namespace PlexRequests.UI.Modules
                 Approved = tv.Available || tv.Approved,
                 Title = tv.Title,
                 Overview = tv.Overview,
-                RequestedBy = tv.RequestedBy,
+                RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { },
                 ReleaseYear = tv.ReleaseDate.Year.ToString(),
                 Available = tv.Available,
                 Admin = isAdmin,
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index a57bd307b..59614a0c2 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -179,11 +179,20 @@ namespace PlexRequests.UI.Modules
             Log.Trace(movieInfo.DumpJson);
             //#if !DEBUG
 
+            var settings = PrService.GetSettings();
+
+            // check if the movie has already been requested
             Log.Info("Requesting movie with id {0}", movieId);
-            if (RequestService.CheckRequest(movieId))
+            var existingRequest = RequestService.CheckRequest(movieId);
+            if (existingRequest != null)
             {
-                Log.Trace("movie with id {0} exists", movieId);
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{fullMovieName} has already been requested!" });
+                // check if the current user is already marked as a requester for this movie, if not, add them
+                if (!existingRequest.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()))
+                {
+                    existingRequest.RequestedUsers.Add(Session[SessionKeys.UsernameKey].ToString());
+                    RequestService.UpdateRequest(existingRequest);
+                }
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullMovieName} was successfully added!" : $"{fullMovieName} has already been requested!" });
             }
 
             Log.Debug("movie with id {0} doesnt exists", movieId);
@@ -213,12 +222,10 @@ namespace PlexRequests.UI.Modules
                 Status = movieInfo.Status,
                 RequestedDate = DateTime.Now,
                 Approved = false,
-                RequestedBy = Session[SessionKeys.UsernameKey].ToString(),
+                RequestedUsers = new List<string>() { Session[SessionKeys.UsernameKey].ToString() },
                 Issues = IssueState.None,
             };
 
-
-            var settings = PrService.GetSettings();
             Log.Trace(settings.DumpJson());
             if (!settings.RequireMovieApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
             {
@@ -310,9 +317,20 @@ namespace PlexRequests.UI.Modules
             string fullShowName = $"{showInfo.name} ({firstAir.Year})";
             //#if !DEBUG
 
-            if (RequestService.CheckRequest(showId))
+            var settings = PrService.GetSettings();
+
+            // check if the show has already been requested
+            Log.Info("Requesting tv show with id {0}", showId);
+            var existingRequest = RequestService.CheckRequest(showId);
+            if (existingRequest != null)
             {
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{fullShowName} has already been requested!" });
+                // check if the current user is already marked as a requester for this show, if not, add them
+                if (!existingRequest.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()))
+                {
+                    existingRequest.RequestedUsers.Add(Session[SessionKeys.UsernameKey].ToString());
+                    RequestService.UpdateRequest(existingRequest);
+                }
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullShowName} was successfully added!" : $"{fullShowName} has already been requested!" });
             }
 
             try
@@ -340,7 +358,7 @@ namespace PlexRequests.UI.Modules
                 Status = showInfo.status,
                 RequestedDate = DateTime.Now,
                 Approved = false,
-                RequestedBy = Session[SessionKeys.UsernameKey].ToString(),
+                RequestedUsers = new List<string>() { Session[SessionKeys.UsernameKey].ToString() },
                 Issues = IssueState.None,
                 ImdbId = showInfo.externals?.imdb ?? string.Empty,
                 SeasonCount = showInfo.seasonCount
@@ -363,7 +381,6 @@ namespace PlexRequests.UI.Modules
 
             model.SeasonList = seasonsList.ToArray();
 
-            var settings = PrService.GetSettings();
             if (!settings.RequireTvShowApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
             {
                 var sonarrSettings = SonarrService.GetSettings();
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 11d8dd33e..a206b383c 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -140,7 +140,7 @@
                 {{#if_eq type "tv"}}
                 <div>Series Requested: {{seriesRequested}}</div>
                 {{/if_eq}}
-                <div>Requested By: {{requestedBy}}</div>
+                <div>Requested By: {{requestedUsers}}</div>
                 <div>Requested Date: {{requestedDate}}</div>
                 <div id="issueArea{{requestId}}">
                     {{#if otherMessage}}

From cee7bee0249cf1bff71923a0ee611f09c02ea959 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 13:52:44 -0500
Subject: [PATCH 20/23] show the requested by user from legacy request models

---
 PlexRequests.UI/Modules/RequestsModule.cs | 102 ++++++++++++----------
 1 file changed, 57 insertions(+), 45 deletions(-)

diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 9d43b34a7..f1cda331f 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -87,28 +87,34 @@ namespace PlexRequests.UI.Modules
                 dbMovies = dbMovies.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
             }
 
-            var viewModel = dbMovies.Select(movie => new RequestViewModel
-            {
-                ProviderId = movie.ProviderId,
-                Type = movie.Type,
-                Status = movie.Status,
-                ImdbId = movie.ImdbId,
-                Id = movie.Id,
-                PosterPath = movie.PosterPath,
-                ReleaseDate = movie.ReleaseDate.Humanize(),
-                ReleaseDateTicks = movie.ReleaseDate.Ticks,
-                RequestedDate = movie.RequestedDate.Humanize(),
-                RequestedDateTicks = movie.RequestedDate.Ticks,
-                Approved = movie.Available || movie.Approved,
-                Title = movie.Title,
-                Overview = movie.Overview,
-                RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { },
-                ReleaseYear = movie.ReleaseDate.Year.ToString(),
-                Available = movie.Available,
-                Admin = isAdmin,
-                Issues = movie.Issues.Humanize(LetterCasing.Title),
-                OtherMessage = movie.OtherMessage,
-                AdminNotes = movie.AdminNote
+            var viewModel = dbMovies.Select(movie => {
+                if (!string.IsNullOrEmpty(movie.RequestedBy) && !movie.RequestedUsers.Any(x => x.Equals(movie.RequestedBy, StringComparison.OrdinalIgnoreCase)))
+                {
+                    movie.RequestedUsers.Add(movie.RequestedBy);
+                }
+                return new RequestViewModel
+                {
+                    ProviderId = movie.ProviderId,
+                    Type = movie.Type,
+                    Status = movie.Status,
+                    ImdbId = movie.ImdbId,
+                    Id = movie.Id,
+                    PosterPath = movie.PosterPath,
+                    ReleaseDate = movie.ReleaseDate.Humanize(),
+                    ReleaseDateTicks = movie.ReleaseDate.Ticks,
+                    RequestedDate = movie.RequestedDate.Humanize(),
+                    RequestedDateTicks = movie.RequestedDate.Ticks,
+                    Approved = movie.Available || movie.Approved,
+                    Title = movie.Title,
+                    Overview = movie.Overview,
+                    RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { },
+                    ReleaseYear = movie.ReleaseDate.Year.ToString(),
+                    Available = movie.Available,
+                    Admin = isAdmin,
+                    Issues = movie.Issues.Humanize(LetterCasing.Title),
+                    OtherMessage = movie.OtherMessage,
+                    AdminNotes = movie.AdminNote
+                };
             }).ToList();
 
             return Response.AsJson(viewModel);
@@ -124,29 +130,35 @@ namespace PlexRequests.UI.Modules
                 dbTv = dbTv.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
             }
 
-            var viewModel = dbTv.Select(tv => new RequestViewModel
-            {
-                ProviderId = tv.ProviderId,
-                Type = tv.Type,
-                Status = tv.Status,
-                ImdbId = tv.ImdbId,
-                Id = tv.Id,
-                PosterPath = tv.PosterPath,
-                ReleaseDate = tv.ReleaseDate.Humanize(),
-                ReleaseDateTicks = tv.ReleaseDate.Ticks,
-                RequestedDate = tv.RequestedDate.Humanize(),
-                RequestedDateTicks = tv.RequestedDate.Ticks,
-                Approved = tv.Available || tv.Approved,
-                Title = tv.Title,
-                Overview = tv.Overview,
-                RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { },
-                ReleaseYear = tv.ReleaseDate.Year.ToString(),
-                Available = tv.Available,
-                Admin = isAdmin,
-                Issues = tv.Issues.Humanize(LetterCasing.Title),
-                OtherMessage = tv.OtherMessage,
-                AdminNotes = tv.AdminNote,
-                TvSeriesRequestType = tv.SeasonsRequested
+            var viewModel = dbTv.Select(tv => {
+                if (!string.IsNullOrEmpty(tv.RequestedBy) && !tv.RequestedUsers.Any(x => x.Equals(tv.RequestedBy, StringComparison.OrdinalIgnoreCase)))
+                {
+                    tv.RequestedUsers.Add(tv.RequestedBy);
+                }
+                return new RequestViewModel
+                {
+                    ProviderId = tv.ProviderId,
+                    Type = tv.Type,
+                    Status = tv.Status,
+                    ImdbId = tv.ImdbId,
+                    Id = tv.Id,
+                    PosterPath = tv.PosterPath,
+                    ReleaseDate = tv.ReleaseDate.Humanize(),
+                    ReleaseDateTicks = tv.ReleaseDate.Ticks,
+                    RequestedDate = tv.RequestedDate.Humanize(),
+                    RequestedDateTicks = tv.RequestedDate.Ticks,
+                    Approved = tv.Available || tv.Approved,
+                    Title = tv.Title,
+                    Overview = tv.Overview,
+                    RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { },
+                    ReleaseYear = tv.ReleaseDate.Year.ToString(),
+                    Available = tv.Available,
+                    Admin = isAdmin,
+                    Issues = tv.Issues.Humanize(LetterCasing.Title),
+                    OtherMessage = tv.OtherMessage,
+                    AdminNotes = tv.AdminNote,
+                    TvSeriesRequestType = tv.SeasonsRequested
+                };
             }).ToList();
 
             return Response.AsJson(viewModel);

From a668ea04ecf2dbd73cccb7f7e06af9ff104001df Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Wed, 30 Mar 2016 11:06:35 -0500
Subject: [PATCH 21/23] don't query the session as much in the modules, rely on
 a variable from the base class and store the username as needed

---
 PlexRequests.UI/Modules/BaseModule.cs     | 18 ++++++++++++++++--
 PlexRequests.UI/Modules/RequestsModule.cs |  8 ++++----
 PlexRequests.UI/Modules/SearchModule.cs   | 16 ++++++++--------
 PlexRequests.UI/Program.cs                |  2 +-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/PlexRequests.UI/Modules/BaseModule.cs b/PlexRequests.UI/Modules/BaseModule.cs
index 67dc1b553..f34c46f17 100644
--- a/PlexRequests.UI/Modules/BaseModule.cs
+++ b/PlexRequests.UI/Modules/BaseModule.cs
@@ -33,16 +33,30 @@ namespace PlexRequests.UI.Modules
 {
     public class BaseModule : NancyModule
     {
+        private string _username;
+
+        protected string Username
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(_username))
+                {
+                    _username = Session[SessionKeys.UsernameKey].ToString();
+                }
+                return _username;
+            }
+        }
+
         public BaseModule()
         {
-            Before += (ctx)=> CheckAuth();
+            Before += (ctx) => CheckAuth();
         }
 
         public BaseModule(string modulePath) : base(modulePath)
         {
             Before += (ctx) => CheckAuth();
         }
-        
+
 
         private Response CheckAuth()
         {
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index b1bfd1dcf..631cfbfea 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -84,7 +84,7 @@ namespace PlexRequests.UI.Modules
             var dbMovies = Service.GetAll().Where(x => x.Type == RequestType.Movie);
             if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
             {
-                dbMovies = dbMovies.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
+                dbMovies = dbMovies.Where(x => x.UserHasRequested(Username));
             }
 
             var viewModel = dbMovies.Select(movie => {
@@ -127,7 +127,7 @@ namespace PlexRequests.UI.Modules
             var dbTv = Service.GetAll().Where(x => x.Type == RequestType.TvShow);
             if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
             {
-                dbTv = dbTv.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
+                dbTv = dbTv.Where(x => x.UserHasRequested(Username));
             }
 
             var viewModel = dbTv.Select(tv => {
@@ -194,7 +194,7 @@ namespace PlexRequests.UI.Modules
             }
             originalRequest.Issues = issue;
             originalRequest.OtherMessage = !string.IsNullOrEmpty(comment)
-                ? $"{Session[SessionKeys.UsernameKey]} - {comment}"
+                ? $"{Username} - {comment}"
                 : string.Empty;
 
 
@@ -202,7 +202,7 @@ namespace PlexRequests.UI.Modules
 
             var model = new NotificationModel
             {
-                User = Session[SessionKeys.UsernameKey].ToString(),
+                User = Username,
                 NotificationType = NotificationType.Issue,
                 Title = originalRequest.Title,
                 DateTime = DateTime.Now,
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 59614a0c2..6f566217a 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -187,9 +187,9 @@ namespace PlexRequests.UI.Modules
             if (existingRequest != null)
             {
                 // check if the current user is already marked as a requester for this movie, if not, add them
-                if (!existingRequest.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()))
+                if (!existingRequest.UserHasRequested(Username))
                 {
-                    existingRequest.RequestedUsers.Add(Session[SessionKeys.UsernameKey].ToString());
+                    existingRequest.RequestedUsers.Add(Username);
                     RequestService.UpdateRequest(existingRequest);
                 }
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullMovieName} was successfully added!" : $"{fullMovieName} has already been requested!" });
@@ -222,12 +222,12 @@ namespace PlexRequests.UI.Modules
                 Status = movieInfo.Status,
                 RequestedDate = DateTime.Now,
                 Approved = false,
-                RequestedUsers = new List<string>() { Session[SessionKeys.UsernameKey].ToString() },
+                RequestedUsers = new List<string>() { Username },
                 Issues = IssueState.None,
             };
 
             Log.Trace(settings.DumpJson());
-            if (!settings.RequireMovieApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
+            if (!settings.RequireMovieApproval || settings.NoApprovalUserList.Any(x => x.Equals(Username, StringComparison.OrdinalIgnoreCase)))
             {
                 var cpSettings = CpService.GetSettings();
 
@@ -325,9 +325,9 @@ namespace PlexRequests.UI.Modules
             if (existingRequest != null)
             {
                 // check if the current user is already marked as a requester for this show, if not, add them
-                if (!existingRequest.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()))
+                if (!existingRequest.UserHasRequested(Username))
                 {
-                    existingRequest.RequestedUsers.Add(Session[SessionKeys.UsernameKey].ToString());
+                    existingRequest.RequestedUsers.Add(Username);
                     RequestService.UpdateRequest(existingRequest);
                 }
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullShowName} was successfully added!" : $"{fullShowName} has already been requested!" });
@@ -358,7 +358,7 @@ namespace PlexRequests.UI.Modules
                 Status = showInfo.status,
                 RequestedDate = DateTime.Now,
                 Approved = false,
-                RequestedUsers = new List<string>() { Session[SessionKeys.UsernameKey].ToString() },
+                RequestedUsers = new List<string>() { Username },
                 Issues = IssueState.None,
                 ImdbId = showInfo.externals?.imdb ?? string.Empty,
                 SeasonCount = showInfo.seasonCount
@@ -381,7 +381,7 @@ namespace PlexRequests.UI.Modules
 
             model.SeasonList = seasonsList.ToArray();
 
-            if (!settings.RequireTvShowApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
+            if (!settings.RequireTvShowApproval || settings.NoApprovalUserList.Any(x => x.Equals(Username, StringComparison.OrdinalIgnoreCase)))
             {
                 var sonarrSettings = SonarrService.GetSettings();
                 var sender = new TvSender(SonarrApi, SickrageApi);
diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
index 5f07f7436..c8f863f40 100644
--- a/PlexRequests.UI/Program.cs
+++ b/PlexRequests.UI/Program.cs
@@ -69,7 +69,7 @@ namespace PlexRequests.UI
             if (port == -1)
                 port = GetStartupPort();
 
-            var options = new StartOptions( $"http://+:{port}")
+            var options = new StartOptions(Debugger.IsAttached ? $"http://localhost:{port}" : $"http://+:{port}")
             {
                 ServerFactory = "Microsoft.Owin.Host.HttpListener"
             };

From 1ca3e0532b6f2ed777431416e2b89095c468c9b4 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Wed, 30 Mar 2016 13:59:03 -0500
Subject: [PATCH 22/23] add a better way to merge RequestedBy and
 RequestedUsers to avoid code duplication and simplify checks

---
 PlexRequests.Store/RequestedModel.cs      | 25 ++++++++++++++++++-----
 PlexRequests.UI/Modules/RequestsModule.cs | 13 ++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index 839968cd0..81c087ae6 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -4,6 +4,7 @@ using System.Security.Cryptography;
 using Dapper.Contrib.Extensions;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 
 namespace PlexRequests.Store
 {
@@ -39,14 +40,28 @@ namespace PlexRequests.Store
         public string SeasonsRequested { get; set; }
         public List<string> RequestedUsers { get; set; }
 
-        public bool UserHasRequested(string username)
+        [JsonIgnore]
+        public List<string> AllUsers
         {
-            bool alreadyRequested = !string.IsNullOrEmpty(RequestedBy) && RequestedBy.Equals(username, StringComparison.OrdinalIgnoreCase);
-            if (!alreadyRequested && RequestedUsers != null && RequestedUsers.Count > 0)
+            get
             {
-                alreadyRequested = RequestedUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase)); 
+                var u = new List<string>();
+                if (!string.IsNullOrEmpty(RequestedBy))
+                {
+                    u.Add(RequestedBy);
+                }
+
+                if (RequestedUsers.Any())
+                {
+                    u.AddRange(RequestedUsers.Where(requestedUser => requestedUser != RequestedBy));
+                }
+                return u;
             }
-            return alreadyRequested;
+        }
+
+        public bool UserHasRequested(string username)
+        {
+            return AllUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase));
         }
     }
 
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 631cfbfea..b52e81475 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -88,10 +88,6 @@ namespace PlexRequests.UI.Modules
             }
 
             var viewModel = dbMovies.Select(movie => {
-                if (!string.IsNullOrEmpty(movie.RequestedBy) && !movie.RequestedUsers.Any(x => x.Equals(movie.RequestedBy, StringComparison.OrdinalIgnoreCase)))
-                {
-                    movie.RequestedUsers.Add(movie.RequestedBy);
-                }
                 return new RequestViewModel
                 {
                     ProviderId = movie.ProviderId,
@@ -107,7 +103,7 @@ namespace PlexRequests.UI.Modules
                     Approved = movie.Available || movie.Approved,
                     Title = movie.Title,
                     Overview = movie.Overview,
-                    RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { },
+                    RequestedUsers = isAdmin ? movie.AllUsers.ToArray() : new string[] { },
                     ReleaseYear = movie.ReleaseDate.Year.ToString(),
                     Available = movie.Available,
                     Admin = isAdmin,
@@ -131,11 +127,6 @@ namespace PlexRequests.UI.Modules
             }
 
             var viewModel = dbTv.Select(tv => {
-                if (!string.IsNullOrEmpty(tv.RequestedBy) && 
-                    !tv.RequestedUsers.Any(x => x.Equals(tv.RequestedBy, StringComparison.OrdinalIgnoreCase)))
-                {
-                    tv.RequestedUsers.Add(tv.RequestedBy);
-                }
                 return new RequestViewModel
                 {
                     ProviderId = tv.ProviderId,
@@ -151,7 +142,7 @@ namespace PlexRequests.UI.Modules
                     Approved = tv.Available || tv.Approved,
                     Title = tv.Title,
                     Overview = tv.Overview,
-                    RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { },
+                    RequestedUsers = isAdmin ? tv.AllUsers.ToArray() : new string[] { },
                     ReleaseYear = tv.ReleaseDate.Year.ToString(),
                     Available = tv.Available,
                     Admin = isAdmin,

From 934425a0c5a94a87df485e2cc92ac9ef75f77f09 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Wed, 30 Mar 2016 14:35:22 -0500
Subject: [PATCH 23/23] ignore items that are already available when approving
 in bulk, and simplify the checking + compile css

---
 PlexRequests.Store/RequestedModel.cs      | 9 +++++++++
 PlexRequests.UI/Content/custom.css        | 2 +-
 PlexRequests.UI/Content/custom.min.css    | 2 +-
 PlexRequests.UI/Modules/ApprovalModule.cs | 6 +++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index 81c087ae6..dcceeb1ab 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -59,6 +59,15 @@ namespace PlexRequests.Store
             }
         }
 
+        [JsonIgnore]
+        public bool CanApprove
+        {
+            get
+            {
+                return !Approved && !Available;
+            }
+        }
+
         public bool UserHasRequested(string username)
         {
             return AllUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase));
diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index b3b556265..3b8122ea7 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -186,4 +186,4 @@ label {
 .no-search-results .no-search-results-text {
   margin: 20px 0;
   color: #ccc; }
-
+
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 9e3d7e793..045ce1487 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs
index 9895b08d3..64d861c96 100644
--- a/PlexRequests.UI/Modules/ApprovalModule.cs
+++ b/PlexRequests.UI/Modules/ApprovalModule.cs
@@ -225,7 +225,7 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
             }
 
-            var requests = Service.GetAll().Where(x => x.Approved == false && x.Type == RequestType.Movie);
+            var requests = Service.GetAll().Where(x => x.CanApprove && x.Type == RequestType.Movie);
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
             if (!requestedModels.Any())
             {
@@ -250,7 +250,7 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
             }
 
-            var requests = Service.GetAll().Where(x => x.Approved == false && x.Type == RequestType.TvShow);
+            var requests = Service.GetAll().Where(x => x.CanApprove && x.Type == RequestType.TvShow);
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
             if (!requestedModels.Any())
             {
@@ -279,7 +279,7 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
             }
 
-            var requests = Service.GetAll().Where(x => x.Approved == false);
+            var requests = Service.GetAll().Where(x => x.CanApprove);
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
             if (!requestedModels.Any())
             {