added present/past/future filters to pinned links

Author: Oaphi

app/controllers/pinned_links_controller.rb

@@ -4,21 +4,36 @@ class PinnedLinksController < ApplicationController
   before_action :verify_mod_on_current_community, only: [:edit, :update]
 
   def index
-    links = if current_user.at_least_global_moderator? && params[:global] == '2'
-              PinnedLink.unscoped
-            elsif current_user.at_least_global_moderator? && params[:global] == '1'
-              PinnedLink.where(community: nil)
-            else
-              PinnedLink.where(community: @community)
-            end
+    @period = params[:period].presence || 'present'
+
+    @links = if current_user.at_least_global_moderator? && params[:global] == '2'
+               PinnedLink.unscoped
+             elsif current_user.at_least_global_moderator? && params[:global] == '1'
+               PinnedLink.where(community: nil)
+             else
+               PinnedLink.where(community: @community)
+             end
+
+    @links = case @period
+             when 'past'
+               @links.past
+             when 'present'
+               @links.present
+             when 'future'
+               @links.future
+             else
+               @links
+             end
+
     @links = case params[:filter]
              when 'all'
-               links.all
+               @links.all
              when 'inactive'
-               links.where(active: false).all
+               @links.where(active: false).all
              else
-               links.where(active: true).all
+               @links.where(active: true).all
              end
+
     render layout: 'without_sidebar'
   end
 

app/models/pinned_link.rb

@@ -7,6 +7,31 @@ class PinnedLink < ApplicationRecord
     includes(:post, post: [:community])
   }
 
+  # a past link is one that ended in the past
+  scope :past, lambda {
+    timed.where('shown_before < ?', DateTime.now)
+  }
+
+  # a present link is not timed or started in the past and ends in the future
+  scope :present, lambda {
+    where(shown_after: nil, shown_before: nil).or(
+      timed.where('shown_after <= ?', DateTime.now)
+           .where('shown_before > ?', DateTime.now)
+    )
+  }
+
+  # a future link is one that both starts and ends in the future
+  scope :future, lambda {
+    timed.where('shown_after > ?', DateTime.now)
+         .where('shown_before > ?', DateTime.now)
+  }
+
+  scope :timed, lambda {
+    after = where.not(shown_after: nil)
+    before = where.not(shown_before: nil)
+    before.or(after)
+  }
+
   validate :check_post_or_url
 
   # Is the link time-constrained?

app/views/pinned_links/index.html.erb

@@ -28,6 +28,22 @@
                         class: "button is-muted is-outlined #{(params[:filter] == 'all') ? 'is-active' : ''}" %>
         </div>
     </div>
+    <div class="grid--cell">
+        <div class="button-list is-gutterless">
+            <%= link_to 'past',
+                        query_url(period: 'past'),
+                        class: "button is-muted is-outlined #{'is-active' if @period == 'past'}" %>
+            <%= link_to 'present',
+                        query_url(period: 'present'),
+                        class: "button is-muted is-outlined #{'is-active' if @period == 'present'}" %>
+            <%= link_to 'future',
+                        query_url(period: 'future'),
+                        class: "button is-muted is-outlined #{'is-active' if @period == 'future'}" %>
+            <%= link_to 'any',
+                        query_url(period: 'any'),
+                        class: "button is-muted is-outlined #{'is-active' if @period == 'any'}" %>
+        </div>
+    </div>
     <div class="grid--cell is-flexible">
     </div>
     <div class="grid--cell">