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 @@
- Want more searching power? Upgrade your account and - become a power user of the best database of anime artwork on the - internet. -
- - <% if Danbooru.config.is_promotion? %> --
Want more searching power? Upgrade your account and become a power user of the best database of anime artwork on the internet.
| Cost | Free |
- <% if Danbooru.config.is_promotion? %>
- One time fee
|
- <% if Danbooru.config.is_promotion? %>
- One time fee
|
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