From c251d145e435f4715ac69644c0e9b644857ec330 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 2 Jan 2020 01:14:16 -0600
Subject: [PATCH] Revert "Add Danbooru Winter Sale."

This reverts commit 963f1f7991813443f414bbfba28590cbcbf9b30b.
---
 app/javascript/src/javascripts/common.js |  7 -------
 app/logical/user_upgrade.rb              | 18 +++---------------
 app/models/user.rb                       |  2 --
 app/views/layouts/default.html.erb       | 10 +---------
 app/views/user_upgrades/new.html.erb     | 18 +-----------------
 config/danbooru_default_config.rb        |  6 ------
 6 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/app/javascript/src/javascripts/common.js b/app/javascript/src/javascripts/common.js
index 996b8fce2..c03552164 100644
--- a/app/javascript/src/javascripts/common.js
+++ b/app/javascript/src/javascripts/common.js
@@ -8,13 +8,6 @@ $(function() {
     e.preventDefault();
   });
 
-  $("#hide-promotion-notice").on("click.danbooru", function(e) {
-    $("#promotion-notice").hide();
-    Cookie.put('hide_promotion_notice', '1', 7);
-    Cookie.put('hide_upgrade_account_notice', '1', 7);
-    e.preventDefault();
-  });
-
   $("#hide-dmail-notice").on("click.danbooru", function(e) {
     var $dmail_notice = $("#dmail-notice");
     $dmail_notice.hide();
diff --git a/app/logical/user_upgrade.rb b/app/logical/user_upgrade.rb
index eb4e18e0c..b29909faf 100644
--- a/app/logical/user_upgrade.rb
+++ b/app/logical/user_upgrade.rb
@@ -1,25 +1,13 @@
 class UserUpgrade
   def self.gold_price
-    if Danbooru.config.is_promotion?
-      1500
-    else
-      2000
-    end
+    2000
   end
 
   def self.platinum_price
-    if Danbooru.config.is_promotion?
-      3000
-    else
-      4000
-    end
+    4000
   end
 
   def self.upgrade_price
-    if Danbooru.config.is_promotion?
-      1500
-    else
-      2000
-    end
+    2000
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4e0fbabdc..db59924e5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -505,8 +505,6 @@ class User < ApplicationRecord
         Danbooru.config.base_tag_query_limit * 2
       elsif is_gold?
         Danbooru.config.base_tag_query_limit
-      elsif is_member? && Danbooru.config.is_promotion?
-        Danbooru.config.base_tag_query_limit
       else
         2
       end
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 8605902c9..409dc93ba 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -97,15 +97,7 @@
   </header>
 
   <div id="page">
-    <% if Danbooru.config.is_promotion? && cookies[:hide_promotion_notice].blank? %>
-      <div class="notice notice-info notice-large" id="promotion-notice">
-        <%= link_to "Danbooru Winter Sale!", forum_topic_path(16501) %> 25% off Gold and free 6-tag searches for Members!
-
-        (<%= link_to "close", "#", id: "hide-promotion-notice" %>)
-      </div>
-    <% end %>
-
-    <% if !Danbooru.config.is_promotion? && !CurrentUser.is_anonymous? && !CurrentUser.is_gold? && cookies[:hide_upgrade_account_notice].blank? && params[:action] != "upgrade_information" %>
+    <% if !CurrentUser.is_anonymous? && !CurrentUser.is_gold? && cookies[:hide_upgrade_account_notice].blank? && params[:action] != "upgrade_information" %>
       <%= render "users/upgrade_notice" %>
     <% end %>
 
diff --git a/app/views/user_upgrades/new.html.erb b/app/views/user_upgrades/new.html.erb
index 76bf124cc..2102cffca 100644
--- a/app/views/user_upgrades/new.html.erb
+++ b/app/views/user_upgrades/new.html.erb
@@ -3,17 +3,7 @@
     <h1>Upgrade Account</h1>
 
     <% unless params[:user_id] %>
-      <p class="copy">
-        Want more searching power? Upgrade your account and
-        become a power user of the best database of anime artwork on the
-        internet.
-      </p>
-
-      <% if Danbooru.config.is_promotion? %>
-        <p>
-          <h6>Danbooru Winter Sale! Gold and Platinum upgrades are 25% off from now until December 28th.</h6>
-        </p>
-      <% end %>
+      <p class="copy">Want more searching power? Upgrade your account and become a power user of the best database of anime artwork on the internet.</p>
 
       <div id="feature-comparison">
         <table>
@@ -34,16 +24,10 @@
               <td>Cost</td>
               <td>Free</td>
               <td>
-                <% if Danbooru.config.is_promotion? %>
-                  <s>$20</s>
-                <% end %>
                 <%= cents_to_usd(UserUpgrade.gold_price) %>
                 <div class="fineprint">One time fee</div>
               </td>
               <td>
-                <% if Danbooru.config.is_promotion? %>
-                  <s>$40</s>
-                <% end %>
                 <%= cents_to_usd(UserUpgrade.platinum_price) %>
                 <div class="fineprint">One time fee</div>
               </td>
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index e4f99361c..90a67efe5 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -638,12 +638,6 @@ module Danbooru
     def redis_url
       "redis://localhost:6379"
     end
-
-    def is_promotion?
-      Time.use_zone("UTC") do
-        Time.zone.now.in?(Time.zone.parse("2019-12-25")..Time.zone.parse("2019-12-28"))
-      end
-    end
   end
 
   class EnvironmentConfiguration