From f46416388553a2fb39c19d78f75916a9430b744f Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sat, 21 Mar 2020 23:04:12 -0500
Subject: [PATCH] users: allow all users to use the posts per page setting.

---
 app/models/user.rb                   | 7 -------
 app/views/user_upgrades/new.html.erb | 6 ------
 app/views/users/edit.html.erb        | 4 +---
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index ca2f90a74..75cde16bc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -78,7 +78,6 @@ class User < ApplicationRecord
   validates_presence_of :comment_threshold
   validate :validate_sock_puppets, :on => :create, :if => -> { Danbooru.config.enable_sock_puppet_validation? }
   before_validation :normalize_blacklisted_tags
-  before_validation :set_per_page
   before_create :encrypt_password_on_create
   before_update :encrypt_password_on_update
   before_create :promote_to_admin_if_first_user
@@ -349,12 +348,6 @@ class User < ApplicationRecord
     def is_approver?
       can_approve_posts?
     end
-
-    def set_per_page
-      if per_page.nil? || !is_gold?
-        self.per_page = Danbooru.config.posts_per_page
-      end
-    end
   end
 
   module EmailMethods
diff --git a/app/views/user_upgrades/new.html.erb b/app/views/user_upgrades/new.html.erb
index cd39249f9..1876ba5f8 100644
--- a/app/views/user_upgrades/new.html.erb
+++ b/app/views/user_upgrades/new.html.erb
@@ -91,12 +91,6 @@
               <td>6 sec</td>
               <td>9 sec</td>
             </tr>
-            <tr>
-              <td>Variable Posts Per Page</td>
-              <td>No</td>
-              <td>Yes</td>
-              <td>Yes</td>
-            </tr>
           </tbody>
         </table>
       </div>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 61d0d8240..427004e6b 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -41,9 +41,7 @@
         <%= f.input :theme, collection: User.themes.keys, include_blank: false, hint: "The site's colorscheme (light mode or dark mode)." %>
         <%= f.input :enable_safe_mode, label: "Safe mode", hint: "Show only safe images. Hide questionable and explicit images.", as: :select, include_blank: false, collection: [["Yes", "true"], ["No", "false"]] %>
         
-        <% if CurrentUser.user.is_gold? %>
-          <%= f.input :per_page, :label => "Posts per page", :as => :select, :hint => "Number of thumbnails per page", :collection => (1..PostSets::Post::MAX_PER_PAGE), :include_blank => false %>
-        <% end %>
+        <%= f.input :per_page, label: "Posts per page", as: :select, hint: "Number of thumbnails per page", collection: (1..PostSets::Post::MAX_PER_PAGE), include_blank: false %>
         <%= f.input :default_image_size, hint: "Show full original images or resized #{Danbooru.config.large_image_width}px width samples.", label: "Default image width", collection: [["850px", "large"], ["original", "original"]], include_blank: false %>
         <%= f.input :receive_email_notifications, as: :select, include_blank: false, collection: [["Yes", "true"], ["No", "false"]], hint: "Receive an email when you receive a new dmail." %>
         <%= f.input :time_zone, include_blank: false, hint: "The timezone to use for timestamps." %>