From 4c0c3360e770537bdbb684e567c80770bf23b1c7 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 4 Feb 2021 00:14:21 -0600
Subject: [PATCH] Fix #4689: Remove 7 day waiting period for new uploaders.

---
 app/logical/upload_limit.rb    | 18 +-----------------
 app/models/post.rb             |  3 ++-
 app/views/uploads/new.html.erb |  6 +++---
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/app/logical/upload_limit.rb b/app/logical/upload_limit.rb
index 05baa35b2..9f6f8ae2b 100644
--- a/app/logical/upload_limit.rb
+++ b/app/logical/upload_limit.rb
@@ -13,23 +13,7 @@ class UploadLimit
   end
 
   def limited?
-    if user.can_upload_free?
-      false
-    elsif user.created_at > 1.week.ago
-      true
-    else
-      used_upload_slots >= upload_slots
-    end
-  end
-
-  def limit_reason
-    if user.created_at > 1.week.ago
-      "cannot upload during your first week of registration"
-    elsif limited?
-      "have reached your upload limit"
-    else
-      nil
-    end
+    !user.can_upload_free? && used_upload_slots >= upload_slots
   end
 
   def maxed?
diff --git a/app/models/post.rb b/app/models/post.rb
index 412e9b892..ef6d14d6a 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -62,6 +62,7 @@ class Post < ApplicationRecord
   scope :pending, -> { where(is_pending: true) }
   scope :flagged, -> { where(is_flagged: true) }
   scope :banned, -> { where(is_banned: true) }
+  # XXX conflict with deletable
   scope :active, -> { where(is_pending: false, is_deleted: false, is_flagged: false).where.not(id: PostAppeal.pending) }
   scope :appealed, -> { deleted.where(id: PostAppeal.pending.select(:post_id)) }
   scope :in_modqueue, -> { pending.or(flagged).or(appealed) }
@@ -1389,7 +1390,7 @@ class Post < ApplicationRecord
     end
 
     def uploader_is_not_limited
-      errors.add(:uploader, uploader.upload_limit.limit_reason) if uploader.upload_limit.limited?
+      errors.add(:uploader, "have reached your upload limit") if uploader.upload_limit.limited?
     end
 
     def added_tags_are_valid
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index e63600178..c5cdf4b64 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -2,7 +2,9 @@
   <div id="a-new" data-image-size="small">
     <h1>Upload</h1>
 
-    <% if !CurrentUser.user.upload_limit.limited? %>
+    <% if CurrentUser.user.upload_limit.limited? %>
+      <h2 style="margin-bottom: 1em;">You have reached your upload limit</h2>
+    <% else %>
       <%= embed_wiki("help:upload_notice", id: "upload-guide-notice") %>
 
       <% unless CurrentUser.can_upload_free? %>
@@ -79,8 +81,6 @@
 
         <%= render "related_tags/container" %>
       <% end %>
-    <% else %>
-      <h2 style="margin-bottom: 1em;">You <%= CurrentUser.user.upload_limit.limit_reason %></h2>
     <% end %>
   </div>
 </div>