Merge pull request #392 from NobodyNada/patch-2

Require review privileges to use regex search
Charcoal-SE · Apr 2, 2018 · 74a97a6 · 74a97a6
2 parents 1fa5623 + 2ff24a5
commit 74a97a6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
@@ -10,7 +10,7 @@ def index
     body, body_operation,
     why, why_operation,
     username, username_operation = [:title, :body, :why, :username].map do |s|
-      SearchHelper.parse_search_params(params, s, user_signed_in?)
+      SearchHelper.parse_search_params(params, s, current_user)
     end.flatten
 
     if [title_operation, body_operation, why_operation, username_operation].any?(&:!)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 module SearchHelper
-  def self.parse_search_params(params, symbol, user_signed_in)
+  def self.parse_search_params(params, symbol, user)
     input = params[symbol] || ''
 
     if params[is_regex?(symbol)]
-      operation = if user_signed_in
+      operation = if !user.nil? && user.can_use_regex_search?
                     params[is_inverse_regex?(symbol)] ? 'NOT REGEXP' : 'REGEXP'
                   else
                     false

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -251,4 +251,8 @@ def add_pinned_role(name)
   def has_pinned_role?(role)
     UsersRole.where(user: self, role: Role.find_by(name: role), pinned: true).exists?
   end
+
+  def can_use_regex_search?
+    (has_role? :reviewer) || moderator_sites.any?
+  end
 end
diff --git a/app/views/search/search.html.erb b/app/views/search/search.html.erb
@@ -3,31 +3,31 @@
 <%= form_tag (params[:option] == 'graphs' ? search_path(anchor: "graphs") : search_path), method: "get" do |f| %>
   <div class="form-group">
     <%= label_tag :title %>
-    <% if user_signed_in? %>
+    <% if current_user&.can_use_regex_search? %>
       <%= check_box_tag :title_is_regex, 1, params[:title_is_regex] %> <span class="text-muted">regex</span>
       <%= check_box_tag :title_is_inverse_regex, 1, params[:title_is_inverse_regex] %> <span class="text-muted">invert</span>
     <% end %>
     <%= text_field_tag :title, params[:title], placeholder: "*", class: "form-control" %>
   </div>
   <div class="form-group">
     <%= label_tag :body %>
-    <% if user_signed_in? %>
+    <% if current_user&.can_use_regex_search? %>
       <%= check_box_tag :body_is_regex, 1, params[:body_is_regex] %> <span class="text-muted">regex</span>
       <%= check_box_tag :body_is_inverse_regex, 1, params[:body_is_inverse_regex] %> <span class="text-muted">invert</span>
     <% end %>
     <%= text_field_tag :body, params[:body], placeholder: "*", class: "form-control" %>
   </div>
   <div class="form-group">
     <%= label_tag :username %>
-    <% if user_signed_in? %>
+    <% if current_user&.can_use_regex_search? %>
       <%= check_box_tag :username_is_regex, 1, params[:username_is_regex] %> <span class="text-muted">regex</span>
       <%= check_box_tag :username_is_inverse_regex, 1, params[:username_is_inverse_regex] %> <span class="text-muted">invert</span>
     <% end %>
     <%= text_field_tag :username, params[:username], placeholder: "*", class: "form-control" %>
   </div>
   <div class="form-group">
     <%= label_tag :why %>
-    <% if user_signed_in? %>
+    <% if current_user&.can_use_regex_search? %>
       <%= check_box_tag :why_is_regex, 1, params[:why_is_regex] %> <span class="text-muted">regex</span>
       <%= check_box_tag :why_is_inverse_regex, 1, params[:why_is_inverse_regex] %> <span class="text-muted">invert</span>
     <% end %>