IP Bans
+ <%= search_form_for(ip_bans_path) do |f| %>
+ <%= f.input :ip_addr, label: "IP Addr", hint: "Use /24 for subnet", input_html: { value: params[:search][:ip_addr] } %>
+ <%= f.input :reason, input_html: { value: params[:search][:reason] } %>
+ <%= f.input :creator_name, label: "Creator", input_html: { value: params[:search][:creator_name], "data-autocomplete": "user" } %>
+ <%= f.input :category, collection: IpBan.categories, include_blank: true, selected: params[:search][:category] %>
+ <%= f.input :is_deleted, label: "Status", collection: [["Active", "false"], ["Deleted", "true"]], include_blank: true, selected: params[:search][:is_deleted] %>
+ <%= f.input :order, collection: [%w[Newest created_at], %w[Oldest created_at_asc], %w[Last\ Seen last_hit_at]], include_blank: true, selected: params[:search][:order] %>
+ <%= f.submit "Search" %>
+ <% end %>
+
<%= table_for @ip_bans, class: "striped autofit", width: "100%" do |t| %>
<% t.column "IP Address" do |ip_ban| %>
- <%= link_to_ip ip_ban.subnetted_ip %>
+ <%= link_to ip_ban.subnetted_ip, ip_address_path(ip_ban.ip_addr.to_s) %>
<% end %>
<% t.column :reason, td: { class: "col-expand" } %>
<% t.column "Status" do |ip_ban| %>
@@ -25,7 +35,6 @@
<%= time_ago_in_words_tagged(ip_ban.created_at) %>
<% end %>
<% t.column column: "control" do |ip_ban| %>
- <%= link_to "Details", ip_address_path(ip_ban.ip_addr.to_s) %> |
<% if ip_ban.is_deleted? %>
<%= link_to "Undelete", ip_ban_path(ip_ban), remote: true, method: :put, "data-params": "ip_ban[is_deleted]=false", "data-confirm": "Are you sure you want to undelete this IP ban?" %>
<% else %>
diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb
index 75d515e36..6ec3071b5 100644
--- a/app/views/layouts/_main_links.html.erb
+++ b/app/views/layouts/_main_links.html.erb
@@ -1,6 +1,6 @@
<% if CurrentUser.is_anonymous? %>
- <%= nav_link_to("Login", login_path(url: request.fullpath)) %>
+ <%= nav_link_to("Login", login_path(url: request.fullpath), rel: "nofollow") %>
<% else %>
<%= nav_link_to("My Account #{unread_dmail_indicator(CurrentUser.user)}", profile_path) %>
<% end %>
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 97174b523..c79fa8acb 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -7,7 +7,7 @@
- <% @artists.each do |artist| %>
- " is_active="<%= !artist.is_deleted? %>" name="<%= artist.name %>" updater_id="0" id="<%= artist.id %>" version="0"/>
- <% end %>
-
diff --git a/app/views/legacy/users.json.erb b/app/views/legacy/users.json.erb
deleted file mode 100644
index 296d0b8e0..000000000
--- a/app/views/legacy/users.json.erb
+++ /dev/null
@@ -1 +0,0 @@
-[<%= @users.map {|x| x.to_legacy_json}.join(", ").html_safe %>]
diff --git a/app/views/legacy/users.xml.erb b/app/views/legacy/users.xml.erb
deleted file mode 100644
index fe0dcb2c1..000000000
--- a/app/views/legacy/users.xml.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- <% @users.each do |user| %>
-
diff --git a/app/views/notes/_secondary_links.html.erb b/app/views/notes/_secondary_links.html.erb
index c3497b7ff..c6b1c2b4c 100644
--- a/app/views/notes/_secondary_links.html.erb
+++ b/app/views/notes/_secondary_links.html.erb
@@ -2,7 +2,6 @@
<%= quick_search_form_for(:body_matches, notes_path, "notes") %>
<%= subnav_link_to "Listing", notes_path %>
<%= subnav_link_to "Posts", posts_path(:tags => "order:note") %>
- <%= subnav_link_to "Search", search_notes_path %>
<%= subnav_link_to "History", note_versions_path %>
<%= subnav_link_to "Requests", posts_path(:tags => "translation_request") %>
<%= subnav_link_to "Help", wiki_page_path("help:notes") %>
diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb
index c52af8bdb..76b6b9099 100644
--- a/app/views/notes/index.html.erb
+++ b/app/views/notes/index.html.erb
@@ -4,6 +4,14 @@
Notes
+ <%= search_form_for(notes_path) do |f| %>
+ <%= f.hidden_field :group_by, value: "note" %>
+
+ <%= f.input :body_matches, label: "Note", hint: "Use * for wildcard", input_html: { value: params[:search][:body_matches] } %>
+ <%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], "data-autocomplete": "tag-query" } %>
+ <%= f.submit "Search" %>
+ <% end %>
+
<%= table_for @notes, class: "striped autofit" do |t| %>
<% t.column "Post" do |note| %>
<%= link_to note.post_id, note.post %>
@@ -12,7 +20,7 @@
<%= link_to "#{note.id}.#{note.version}", post_path(note.post_id, anchor: "note-#{note.id}") %>
<%= link_to "»", note_versions_path(search: { note_id: note.id }) %>
<% end %>
- <% t.column "Body", td: { class: "col-expand" } do |note| %>
+ <% t.column "Text", td: { class: "col-expand" } do |note| %>
<%= note.body %>
<% unless note.is_active? %>
(deleted)
diff --git a/app/views/notes/search.html.erb b/app/views/notes/search.html.erb
deleted file mode 100644
index 4aabd7e71..000000000
--- a/app/views/notes/search.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
Search Notes
-
- <%= search_form_for(notes_path) do |f| %>
- <%= f.hidden_field :group_by, value: "note" %>
-
- <%= f.input :body_matches, label: "Body" %>
- <%= f.input :post_tags_match, label: "Tags", input_html: { data: { autocomplete: "tag-query" } } %>
- <%= f.submit "Search" %>
- <% end %>
-
-
-
-<%= render "secondary_links" %>
diff --git a/app/views/post_replacements/index.html.erb b/app/views/post_replacements/index.html.erb
index b0dd09c87..59a766341 100644
--- a/app/views/post_replacements/index.html.erb
+++ b/app/views/post_replacements/index.html.erb
@@ -29,10 +29,10 @@
<% end %>
<% t.column "MD5" do |post_replacement| %>
- <% if post_replacement.md5_was.present? && post_replacement.md5.present? %>
+ <% if post_replacement.old_md5.present? && post_replacement.md5.present? %>
Original MD5
- <%= post_replacement.md5_was %>
+ <%= post_replacement.old_md5 %>
Replacement MD5
<%= post_replacement.md5 %>
@@ -40,12 +40,12 @@
<% end %>
<% end %>
<% t.column "Size" do |post_replacement| %>
- <% if %i[image_width_was image_height_was file_size_was file_ext_was image_width image_height file_size file_ext].all? { |k| post_replacement[k].present? } %>
+ <% if %i[old_image_width old_image_height old_file_size old_file_ext image_width image_height file_size file_ext].all? { |k| post_replacement[k].present? } %>
Original Size
- <%= post_replacement.image_width_was %>x<%= post_replacement.image_height_was %>
- (<%= post_replacement.file_size_was.to_s(:human_size, precision: 4) %>, <%= post_replacement.file_ext_was %>)
+ <%= post_replacement.old_image_width %>x<%= post_replacement.old_image_height %>
+ (<%= post_replacement.old_file_size.to_s(:human_size, precision: 4) %>, <%= post_replacement.old_file_ext %>)
Replacement Size
diff --git a/app/views/posts/partials/index/_preview.html.erb b/app/views/posts/partials/index/_preview.html.erb
index a9f00ebb1..0e03f2613 100644
--- a/app/views/posts/partials/index/_preview.html.erb
+++ b/app/views/posts/partials/index/_preview.html.erb
@@ -38,11 +38,7 @@
<%= link_to recommended_posts_path(search: { post_id: post.id }), class: "more-recommended-posts", "data-post-id": post.id do %>
<%= post.fav_count %>
- <% if post.favorited_by?(CurrentUser.id) %>
-
- <%= f.input :tag_string, label: false, input_html: { size: "60x5", spellcheck: false, "data-autocomplete": "tag-edit", "data-shortcut": "e", value: post.presenter.split_tag_list_text + " " } %>
+ <%= f.input :tag_string, label: false, input_html: { size: "60x5", "data-autocomplete": "tag-edit", "data-shortcut": "e", value: post.presenter.split_tag_list_text + " " } %>
<%= render "related_tags/buttons" %>
diff --git a/app/views/posts/partials/show/_favorite_list.html.erb b/app/views/posts/partials/show/_favorite_list.html.erb
new file mode 100644
index 000000000..863a24a7a
--- /dev/null
+++ b/app/views/posts/partials/show/_favorite_list.html.erb
@@ -0,0 +1,2 @@
+<%# post %>
+<%= safe_join(post.visible_favorited_users(CurrentUser.user).map { |user| link_to_user(user) }, ", ") %>
diff --git a/app/views/posts/partials/show/_information.html.erb b/app/views/posts/partials/show/_information.html.erb
index dcfc2b11c..51ce633b2 100644
--- a/app/views/posts/partials/show/_information.html.erb
+++ b/app/views/posts/partials/show/_information.html.erb
@@ -37,7 +37,9 @@
<% if policy(post).can_view_favlist? %>
<%= link_to "Show »", "#", id: "show-favlist-link", style: ("display: none;" if post.fav_count == 0) %>
<%= link_to "« Hide", "#", id: "hide-favlist-link", style: "display: none;" %>
- <%= post_favlist(post) %>
+
+ <%= render "posts/partials/show/favorite_list", post: post %>
+
<% end %>
Status:
diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb
index d9d2949c8..7190bdf4c 100644
--- a/app/views/posts/partials/show/_options.html.erb
+++ b/app/views/posts/partials/show/_options.html.erb
@@ -23,10 +23,10 @@
<% if policy(Favorite).create? %>
- <%= link_to "Favorite", favorites_path(post_id: post.id), remote: true, method: :post, id: "add-to-favorites", "data-shortcut": "f", style: ("display: none;" if @post.is_favorited?) %>
+ <%= link_to "Favorite", favorites_path(post_id: post.id), remote: true, method: :post, id: "add-to-favorites", "data-shortcut": "f", style: ("display: none;" if @post.favorited_by?(CurrentUser.user)) %>
- <%= link_to "Unfavorite", favorite_path(post), remote: true, method: :delete, id: "remove-from-favorites", "data-shortcut": "shift+f", "data-shortcut-when": ":visible", style: ("display: none;" if !@post.is_favorited?) %>
+ <%= link_to "Unfavorite", favorite_path(post), remote: true, method: :delete, id: "remove-from-favorites", "data-shortcut": "shift+f", "data-shortcut-when": ":visible", style: ("display: none;" if !@post.favorited_by?(CurrentUser.user)) %>
<% end %>
<% if policy(post).update? %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index b035b389c..a2f202f27 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -50,7 +50,7 @@
<% end -%>
<% if policy(Favorite).create? %>
- <%= content_tag(:div, class: "fav-buttons fav-buttons-#{@post.is_favorited?}") do %>
+ <%= content_tag(:div, class: "fav-buttons fav-buttons-#{@post.favorited_by?(CurrentUser.user)}") do %>
<%= form_tag(favorites_path(post_id: @post.id), method: "post", id: "add-fav-button", "data-remote": true) do %>
<%= button_tag tag.i(class: "far fa-heart"), class: "ui-button ui-widget ui-corner-all", "data-disable-with": tag.i(class: "fas fa-spinner fa-spin") %>
<% end %>
diff --git a/app/views/robots/index.text.erb b/app/views/robots/index.text.erb
index 57244f162..ca2007b76 100644
--- a/app/views/robots/index.text.erb
+++ b/app/views/robots/index.text.erb
@@ -6,25 +6,29 @@ Allow: /$
Disallow: /*.atom
Disallow: /*.json
-Allow: /artists
-Allow: /artist_commentaries
-Allow: /comments
-Allow: /explore
-Allow: /favorite_groups
-Allow: /forum_posts
-Allow: /forum_topics
-Allow: /iqdb_queries
-Allow: /login
-Allow: /notes
-Allow: /pools
-Allow: /posts
-Allow: /sessions
-Allow: /static
-Allow: /tags
-Allow: /uploads
-Allow: /user_upgrade
-Allow: /users
-Allow: /wiki_pages
+Allow: <%= artists_path %>
+Allow: <%= artist_commentaries_path %>
+Allow: <%= comments_path %>
+Allow: <%= popular_explore_posts_path %>
+Allow: <%= curated_explore_posts_path %>
+Allow: <%= viewed_explore_posts_path %>
+Allow: <%= searches_explore_posts_path %>
+Allow: <%= missed_searches_explore_posts_path %>
+Allow: <%= favorite_groups_path %>
+Allow: <%= forum_posts_path %>
+Allow: <%= forum_topics_path %>
+Allow: <%= iqdb_queries_path %>
+Allow: <%= login_path %>
+Allow: <%= notes_path %>
+Allow: <%= pools_path %>
+Allow: <%= posts_path %>
+Allow: <%= new_session_path %>
+Allow: <%= sign_out_session_path %>
+Allow: <%= tags_path %>
+Allow: <%= uploads_path %>
+Allow: <%= user_upgrades_path %>
+Allow: <%= users_path %>
+Allow: <%= wiki_pages_path %>
<%# Legacy redirects %>
Allow: /artist
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 7ce1ffa31..c9f748da0 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,5 +1,6 @@
<% page_title "Login" %>
<% meta_description "Login to #{Danbooru.config.app_name}" %>
+<% canonical_url login_url %>
<%= render "sessions/secondary_links" %>
diff --git a/app/views/static/contact.html.erb b/app/views/static/contact.html.erb
index edefb96a5..95b3a17c6 100644
--- a/app/views/static/contact.html.erb
+++ b/app/views/static/contact.html.erb
@@ -4,8 +4,11 @@
diff --git a/app/views/static/not_found.html.erb b/app/views/static/not_found.html.erb
new file mode 100644
index 000000000..8393490a5
--- /dev/null
+++ b/app/views/static/not_found.html.erb
@@ -0,0 +1,26 @@
+<% page_title "Page not found" %>
+
+
@@ -134,7 +133,6 @@
<% end %>
<%= link_to_wiki "Help", "help:users" %>
<%= link_to("Listing", users_path) %>
- <%= link_to("Search", search_users_path) %>
<%= link_to("Bans", bans_path) %>
<%= link_to("Feedback", user_feedbacks_path) %>
<%= link_to("Terms of Service", terms_of_service_path) %>
@@ -154,6 +152,10 @@
<%= link_to("Moderation Reports", moderation_reports_path) %>
<% end %>
+ <% if policy(EmailAddress).index? %>
+ <%= link_to("Email Addresses", emails_path) %>
+ <% end %>
+
<% if policy(IpAddress).index? %>
<%= link_to("IP Addresses", ip_addresses_path) %>
<% end %>
diff --git a/app/views/status/_list.html.erb b/app/views/status/_list.html.erb
new file mode 100644
index 000000000..e5b304b21
--- /dev/null
+++ b/app/views/status/_list.html.erb
@@ -0,0 +1,7 @@
+<%# hash %>
+
+ <% hash.each do |key, value| %>
+ <%= key.to_s.humanize %>
+ <%= value %>
+ <% end %>
+
diff --git a/app/views/status/_table.html.erb b/app/views/status/_table.html.erb
new file mode 100644
index 000000000..05678ff5c
--- /dev/null
+++ b/app/views/status/_table.html.erb
@@ -0,0 +1,19 @@
+<%# rows %>
+
+
+
+
+ <% rows.first.keys.each do |key| %>
+ <%= key.humanize %>
+ <% end %>
+
+
+
+ <% rows.each do |row| %>
+
+ <% row.each do |key, value| %>
+ <%= value %>
+ <% end %>
+
+ <% end %>
+
diff --git a/app/views/status/show.html.erb b/app/views/status/show.html.erb
new file mode 100644
index 000000000..c0f138359
--- /dev/null
+++ b/app/views/status/show.html.erb
@@ -0,0 +1,32 @@
+
+
+
Status
+
+
+
+ Server: <%= @status.hostname %>
+
+ <%= render "list", hash: @status.serializable_hash[:status] %>
+
+
+ Postgres
+
+
+
+ <%= pluralize @status.postgres_active_connections, "active connection" %>.
+
+
+ <%= render "table", rows: @status.serializable_hash[:postgres][:connection_stats] %>
+
+
+ Redis
+
+
+
+ <%= @status.redis_used_memory %> memory used.
+
+
+ <%= render "list", hash: @status.serializable_hash[:redis][:info] %>
+
+
+
-
You can pay with a credit or debit card. Safebooru uses Stripe as a payment intermediary so none of your personal information will be stored on the site.
-
- <% if user.level < User::Levels::GOLD %>
- <%= stripe_button("Upgrade to Gold", UserUpgrade.gold_price, user) %>
- <%= stripe_button("Upgrade to Platinum", UserUpgrade.platinum_price, user) %>
- <% elsif user.level < User::Levels::PLATINUM %>
- <%= stripe_button("Upgrade Gold to Platinum", UserUpgrade.upgrade_price, user) %>
- <% end %>
-
-
You can pay with a credit or debit card on <%= link_to "Safebooru", new_user_upgrade_url(host: "safebooru.donmai.us", protocol: "https") %>. Your account will then also be upgraded on Danbooru. You can login to Safebooru with the same username and password you use on Danbooru.
-
+
+ <%= search_form_for(user_upgrades_path) do |f| %>
+ <%= f.input :recipient_name, label: "Recipient", input_html: { value: params[:search][:recipient_name], data: { autocomplete: "user" } } %>
+ <%= f.input :purchaser_name, label: "Purchaser", input_html: { value: params[:search][:purchaser_name], data: { autocomplete: "user" } } %>
+ <%= f.input :upgrade_type, collection: UserUpgrade.upgrade_types, include_blank: true, selected: params[:search][:upgrade_type] %>
+ <%= f.input :status, collection: UserUpgrade.statuses, include_blank: true, selected: params[:search][:status] %>
+ <%= f.input :is_gifted, label: "Gifted?", as: :select, include_blank: true, selected: params[:search][:is_gifted] %>
+ <%= f.submit "Search" %>
+ <% end %>
+
+ <%= table_for @user_upgrades, class: "striped autofit" do |t| %>
+ <% t.column "Recipient" do |user_upgrade| %>
+ <%= link_to_user user_upgrade.recipient %>
+ <% end %>
+
+ <% t.column "Purchaser" do |user_upgrade| %>
+ <%= link_to_user user_upgrade.purchaser %>
+ <% end %>
+
+ <% t.column :upgrade_type do |user_upgrade| %>
+ <%= user_upgrade.upgrade_type.humanize %>
+ <% end %>
+
+ <% t.column "Gifted?" do |user_upgrade| %>
+ <%= "Yes" if user_upgrade.is_gift? %>
+ <% end %>
+
+ <% t.column :status %>
+
+ <% t.column "Updated" do |user_upgrade| %>
+ <%= time_ago_in_words_tagged(user_upgrade.updated_at) %>
+ <% end %>
+
+ <% t.column column: "control" do |user_upgrade| %>
+ <%= link_to "Show", user_upgrade %>
+ <% if policy(user_upgrade).receipt? %>
+ | <%= link_to "Receipt", receipt_user_upgrade_path(user_upgrade), target: "_blank" %>
+ <% end %>
+ <% if policy(user_upgrade).payment? %>
+ | <%= link_to "Payment", payment_user_upgrade_path(user_upgrade), target: "_blank" %>
+ <% end %>
+ <% if policy(user_upgrade).refund? %>
+ | <%= link_to "Refund", refund_user_upgrade_path(user_upgrade), remote: true, method: :put, "data-confirm": "Are you sure you want to refund this payment?" %>
+ <% end %>
+ <% end %>
+ <% end %>
+
+ <%= numbered_paginator(@user_upgrades) %>
+
+
-
Upgrade Account
- <% unless params[:user_id] %>
-
Want more searching power? Upgrade your account and become a power user of the best database of anime artwork on the internet.
+ <% if @user_upgrade.is_gift? %>
+
Gift Account Upgrade
-
-
-
-
- Basic
- Gold
- Platinum
-
-
-
-
- Cost
- Free
-
- <%= cents_to_usd(UserUpgrade.gold_price) %>
- One time fee
-
-
- <%= cents_to_usd(UserUpgrade.platinum_price) %>
- One time fee
-
-
-
- Tag Limit
- 2
- <%= Danbooru.config.base_tag_query_limit %>
- <%= Danbooru.config.base_tag_query_limit*2 %>
-
-
- Favorite Limit
- 10,000
- 20,000
- Unlimited
-
-
- Favorite Groups
- 3
- 5
- 10
-
-
- Page Limit
- 1,000
- 2,000
- 5,000
-
-
- Saved Searches
- 250
- 250
- 1,000
-
-
- See Hidden Tags
- No
- Yes
- Yes
-
-
- Search Timeout
- 3 sec
- 6 sec
- 9 sec
-
-
-
-
+ <% if @user_upgrade.recipient.is_platinum? %>
+
<%= link_to_user @recipient %> is already above Platinum level and can't be upgraded!
+ <% else %>
+
You are gifting this upgrade to <%= link_to_user @user_upgrade.recipient %>.
+ <% end %>
+ <% else %>
+
Upgrade Account
+
+
Upgrading your account gives you exclusive benefits and helps support
+ <%= Danbooru.config.canonical_app_name %>. Your support helps keep the
+ site ad-free for everyone!
+
+
You can also gift an account upgrade to someone else. Just go to
+ their profile page and look for a "Gift Upgrade" link.
<% end %>
-
- <% if params[:user_id] %>
-
You are gifting this account upgrade to <%= link_to user.pretty_name, user_path(params[:user_id]) %>.
- <% else %>
-
You can also upgrade someone else's account for the same price. The easiest way is to go to their profile page and look for a "Gift Upgrade" link.
- <% end %>
+
+
+
+ Basic
+ Gold
+ Platinum
+
+
+
+
+ Free
+
+ <%= cents_to_usd(UserUpgrade.gold_price) %>
+ One time fee
+
+
+ <%= cents_to_usd(UserUpgrade.platinum_price) %>
+ One time fee
+
+
+
+ Tag Limit
+ <%= User.tag_query_limit(User::Levels::MEMBER) %>
+ <%= User.tag_query_limit(User::Levels::GOLD) %>
+ <%= User.tag_query_limit(User::Levels::PLATINUM) %>
+
+
+ See Hidden Tags
+ No
+ Yes
+ Yes
+
+
+ Page Limit
+ 1,000
+ 2,000
+ 5,000
+
+
+ Favorite Limit
+ 10,000
+ 20,000
+ Unlimited
+
+
+ Favorite Groups
+ 3
+ 5
+ 10
+
+
+ Saved Searches
+ 250
+ 250
+ 1,000
+
+
+ Search Timeout
+ 3 sec
+ 6 sec
+ 9 sec
+
+
+ <%= link_to "Login", login_path(url: new_user_upgrade_path), class: "login-button" %>
+ <%= link_to "Get #{Danbooru.config.canonical_app_name} Gold", login_path(url: new_user_upgrade_path), class: "login-button" %>
+ <%= link_to "Get #{Danbooru.config.canonical_app_name} Platinum", login_path(url: new_user_upgrade_path), class: "login-button" %>
+ <% elsif @recipient.level == User::Levels::MEMBER %>
+ <%= button_to "Get #{Danbooru.config.canonical_app_name} Gold", user_upgrades_path(user_id: @recipient.id, upgrade_type: "gold", country: params[:country], promo: params[:promo]), remote: true, disable_with: "Redirecting..." %>
+ <%= button_to "Get #{Danbooru.config.canonical_app_name} Platinum", user_upgrades_path(user_id: @recipient.id, upgrade_type: "platinum", country: params[:country], promo: params[:promo]), remote: true, disable_with: "Redirecting..." %>
+ <% elsif @recipient.level == User::Levels::GOLD %>
+ <%= button_to "Get #{Danbooru.config.canonical_app_name} Gold", nil, disabled: true %>
+ <%= button_to "Get #{Danbooru.config.canonical_app_name} Platinum", user_upgrades_path(user_id: @recipient.id, upgrade_type: "gold_to_platinum", country: params[:country], promo: params[:promo]), remote: true, disable_with: "Redirecting..." %>
+ <% else %>
+ <%= button_to "Get #{Danbooru.config.canonical_app_name} Gold", nil, disabled: true %>
+ <%= button_to "Get #{Danbooru.config.canonical_app_name} Platinum", nil, disabled: true %>
+ <% end %>
+
+
+
+
+
Frequently Asked Questions
+
+
+
+ What are the benefits of <%= Danbooru.config.canonical_app_name %> Gold?
+
+ <%= Danbooru.config.canonical_app_name %> Gold lets you do more
+ complicated searches, and it lets you see hidden tags that non-Gold users
+ can't see. You can search more tags at once, browser deeper in search
+ results, and also keep more favorites, favorite groups, and saved searches.
+
+
+
+ What are the benefits of <%= Danbooru.config.canonical_app_name %> Platinum?
+
+ Platinum is like Gold, but it lets you search even more tags at once,
+ and keep even more favorites, favorite groups, and saved searches.
+
+
+
+ What payment methods do you support?
+
+ We support all major credit and debit cards, including international
+ cards. We also support bank payments in several European countries,
+ including Austria, Belgium, Germany, the Netherlands, and Poland.
+
+ Payments are securely handled by Stripe .
+ We don't support PayPal or Bitcoin at this time.
+
+
+
+ Is this a subscription?
+
+ No, this is not a subscription. This is a one-time payment. You pay
+ only once and keep the upgrade forever.
+
+
+
+ If I upgrade to Gold first, can I upgrade to Platinum later?
+
+ Yes, if you have a Gold account, you can always upgrade to a Platinum
+ account later. You don't have to pay full price to upgrade from Gold to
+ Platinum. You only have to pay the difference.
+
+
+
+ What is your refund policy?
+
+ You can <%= link_to "contact us", contact_path %> to request a refund
+ for any reason within 48 hours of your purchase.
+
-
- <% if Danbooru.config.stripe_publishable_key %>
- <% if CurrentUser.is_anonymous? %>
-
<%= link_to "Sign up", new_user_path %> or <%= link_to "login", login_path(url: new_user_upgrade_path) %> first to upgrade your account.
- <% elsif CurrentUser.safe_mode? %>
- <%= render "stripe_payment" %>
- <% else %>
- <%= render "stripe_payment_safebooru" %>
- <% end %>
- <% end %>
diff --git a/app/views/user_upgrades/refund.js.erb b/app/views/user_upgrades/refund.js.erb
new file mode 100644
index 000000000..345366b9b
--- /dev/null
+++ b/app/views/user_upgrades/refund.js.erb
@@ -0,0 +1 @@
+location.reload();
diff --git a/app/views/user_upgrades/show.html.erb b/app/views/user_upgrades/show.html.erb
index 014421551..a81978fc5 100644
--- a/app/views/user_upgrades/show.html.erb
+++ b/app/views/user_upgrades/show.html.erb
@@ -1,22 +1,56 @@
-<% page_title "Account Upgraded" %>
+<% page_title "User Upgrade Status" %>
<%= render "users/secondary_links" %>
- <% if flash[:success] %>
-
Congratulations!
+
User Upgrade
- <% if user != CurrentUser.user %>
-
<%= user.name %> is now a <%= user.level_string %> user. Thanks for supporting the site!
+
+
+
+ Purchased
+ by <%= link_to_user @user_upgrade.purchaser %>
+ <% if @user_upgrade.is_gift? %>
+ for <%= link_to_user @user_upgrade.recipient %>
+ <% end %>
+
+
+ Updated
+ <%= time_ago_in_words_tagged @user_upgrade.updated_at %>
+
+
+ Upgrade Type
+ <%= @user_upgrade.upgrade_type.humanize %>
+
+
+ Status
+ <%= @user_upgrade.status.humanize %>
+
+
+
+
+ <% if @user_upgrade.complete? %>
+ <% if @user_upgrade.is_gift? && CurrentUser.user == @user_upgrade.recipient %>
+
<%= link_to_user @user_upgrade.purchaser %> has upgraded your account to <%= @user_upgrade.level_string %>. Enjoy your new account!
+ <% elsif @user_upgrade.is_gift? && CurrentUser.user == @user_upgrade.purchaser %>
+
<%= link_to_user @user_upgrade.recipient %> is now a <%= @user_upgrade.level_string %> user. Thanks for supporting the site! A receipt has been sent to your email.
<% else %>
-
You are now a <%= user.level_string %> user. Thanks for supporting the site!
+
You are now a <%= @user_upgrade.level_string %> user. Thanks for supporting the site! A receipt has been sent to your email.
<% end %>
-
<%= link_to "Go back to #{Danbooru.config.canonical_app_name}", "https://danbooru.donmai.us" %> to start using your new account.
- <% elsif flash[:error] %>
-
An error occurred!
-
<%= flash[:error] %>
-
<%= link_to "Try again", new_user_upgrade_path %>
+ <%= render "stripe_links", user_upgrade: @user_upgrade %>
+ <% elsif @user_upgrade.refunded? %>
+
This purchase has been refunded. A receipt has been sent to your email. It can take up to
+ 5-10 days for the refund to appear on your credit card or bank statement. If it takes longer,
+ please contact your bank for assistance.
+
+ <%= render "stripe_links", user_upgrade: @user_upgrade %>
+ <% else %>
+ <%= content_for :html_header do %>
+
+ <% end %>
+
+
This order is still being processed. You will be notified as soon as the order is complete.
<% end %>
diff --git a/app/views/users/_post_summary.html.erb b/app/views/users/_post_summary.html.erb
index 208a237ca..b8987744e 100644
--- a/app/views/users/_post_summary.html.erb
+++ b/app/views/users/_post_summary.html.erb
@@ -18,7 +18,7 @@
<% presenter.favorites.each do |post| %>
- <%= PostPresenter.preview(post, :tags => "fav:#{user.name}") %>
+ <%= PostPresenter.preview(post, tags: "ordfav:#{user.name}") %>
<% end %>
diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb
index e1b885966..4487865cd 100644
--- a/app/views/users/_secondary_links.html.erb
+++ b/app/views/users/_secondary_links.html.erb
@@ -1,7 +1,6 @@
<% content_for(:secondary_links) do %>
<%= quick_search_form_for(:name_matches, users_path, "users", autocomplete: "user", redirect: true) %>
<%= subnav_link_to "Listing", users_path %>
- <%= subnav_link_to "Search", search_users_path %>
<% if CurrentUser.user.is_anonymous? %>
<%= subnav_link_to "Sign up", new_user_path %>
diff --git a/app/views/users/_statistics.html.erb b/app/views/users/_statistics.html.erb
index 884a4c100..581028cbd 100644
--- a/app/views/users/_statistics.html.erb
+++ b/app/views/users/_statistics.html.erb
@@ -10,6 +10,14 @@
Join Date
<%= presenter.join_date %>
+
+ <% if policy(User).can_see_last_logged_in_at? %>
+
+ Last Seen
+ <%= time_ago_in_words_tagged(user.last_logged_in_at) %>
+
+ <% end %>
+
<% if policy(IpAddress).show? %>
Last IP
@@ -27,6 +35,33 @@
<% end %>
+ <% if policy(user.email_address).show? %>
+
+ Email Address
+
+ <% if user.email_address.present? %>
+ <%= user.email_address.address %>
+
+ <% if user == CurrentUser.user %>
+ (<%= link_to "edit", edit_user_email_path(user) %>)
+ <% end %>
+
+ <% if user.email_address.is_verified? %>
+ none
+ <% end %>
+
+
+ <% end %>
+
Inviter
<% if user.inviter %>
@@ -40,8 +75,13 @@
Level
<%= user.level_string %>
- <% if CurrentUser.user == user && !CurrentUser.is_gold? %>
- (<%= link_to "upgrade", new_user_upgrade_path %>)
+
+ <% if !user.is_platinum? %>
+ <% if CurrentUser.user == user %>
+ (<%= link_to "Upgrade account", new_user_upgrade_path %>)
+ <% else %>
+ (<%= link_to "Gift upgrade", new_user_upgrade_path(user_id: user.id) %>)
+ <% end %>
<% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 2c3bae957..18dfbc6c2 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -2,40 +2,54 @@
Users
- <%= table_for @users, width: "100%" do |t| %>
- <% t.column column: "control" do |user| %>
- <% if policy(CurrentUser.user).promote? %>
- <%= link_to "Edit", edit_admin_user_path(user) %>
- <% end %>
- <% end %>
- <% t.column "Name" do |user| %>
+ <%= search_form_for(users_path) do |f| %>
+ <%= f.input :name_matches, label: "Name", hint: "Use * for wildcard", input_html: { value: params[:search][:name_matches], data: { autocomplete: "user" } } %>
+ <%= f.input :level, collection: User.level_hash.to_a, include_blank: true, selected: params[:search][:level] %>
+ <%= f.input :can_upload_free, label: "Contributor?", as: :select, include_blank: true, selected: params[:search][:can_upload_free] %>
+ <%= f.input :can_approve_posts, label: "Approver?", as: :select, include_blank: true, selected: params[:search][:can_approve_posts] %>
+ <%= f.input :order, collection: [["Joined", "date"], ["Name", "name"], ["Posts", "post_upload_count"], ["Edits", "post_update_count"], ["Notes", "note_count"]], include_blank: true, selected: params[:search][:order] %>
+ <%= f.submit "Search" %>
+ <% end %>
+
+ <%= table_for @users, width: "100%", class: "striped autofit" do |t| %>
+ <% t.column "Name", td: { class: "col-expand" } do |user| %>
<%= link_to_user user %>
- <% if user.inviter %>
- ← <%= link_to_user user.inviter %>
+ <% end %>
+ <% if policy(IpAddress).show? %>
+ <% t.column "IP" do |user| %>
+ <% if user.last_ip_addr.present? %>
+ <%= link_to user.last_ip_addr, ip_address_path(user.last_ip_addr) %>
+ <% end %>
<% end %>
<% end %>
<% t.column "Posts" do |user| %>
<%= link_to user.post_upload_count, posts_path(:tags => "user:#{user.name}") %>
<% end %>
- <% t.column "Deleted" do |user| %>
- <%= user.posts.deleted.count %>
+ <% t.column "Edits" do |user| %>
+ <%= link_to user.post_update_count, post_versions_path(:search => {:updater_id => user.id}) %>
<% end %>
<% t.column "Notes" do |user| %>
<%= link_to user.note_update_count, note_versions_path(:search => {:updater_id => user.id}) %>
<% end %>
- <% t.column "Edits" do |user| %>
- <%= link_to user.post_update_count, post_versions_path(:search => {:updater_id => user.id}) %>
- <% end %>
<% t.column "Level" do |user| %>
<%= user.level_string %>
<% end %>
+ <% if policy(User).can_see_last_logged_in_at? %>
+ <% t.column "Last Seen" do |user| %>
+ <%= time_ago_in_words_tagged(user.last_logged_in_at) %>
+ <% end %>
+ <% end %>
<% t.column "Joined" do |user| %>
<%= compact_time user.created_at %>
<% end %>
+ <% t.column column: "control" do |user| %>
+ <% if policy(CurrentUser.user).promote? %>
+ <%= link_to "Promote", edit_admin_user_path(user) %>
+ <% end %>
+ <% end %>
<% end %>
<%= numbered_paginator(@users) %>
-
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
deleted file mode 100644
index c41962a0b..000000000
--- a/app/views/users/search.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- <%= search_form_for(users_path) do |f| %>
- <%= f.input :name_matches, label: "Name", hint: "Use * for wildcard", input_html: { value: params[:search][:name_matches], data: { autocomplete: "user" } } %>
- <%= f.input :inviter_name, label: "Inviter Name", hint: "Use * for wildcard", input_html: { value: params.dig(:search, :inviter_name), data: { autocomplete: "user" } } %>
-
- <%= f.input :level, collection: User.level_hash.to_a, include_blank: true, selected: params[:search][:level] %>
- <%= f.input :min_level, collection: User.level_hash.to_a, include_blank: true, selected: params[:search][:min_level] %>
- <%= f.input :max_level, collection: User.level_hash.to_a, include_blank: true, selected: params[:search][:max_level] %>
-
- <%= f.input :can_upload_free, label: "Unrestricted uploads?", collection: [%w[Yes true], %w[No false]], include_blank: true, selected: params[:search][:can_upload_free] %>
- <%= f.input :can_approve_posts, label: "Approver?", collection: [%w[Yes true], %w[No false]], include_blank: true, selected: params[:search][:can_approve_posts] %>
-
- <%= f.input :order, collection: [["Join date", "date"], ["Name", "name"], ["Upload count", "post_upload_count"], ["Note count", "note_count"], ["Post update count", "post_update_count"]], selected: params[:search][:order] %>
- <%= f.submit "Search" %>
- <% end %>
-
-
Wiki
+ <%= render "search" %>
+
<%= table_for @wiki_pages, width: "100%" do |t| %>
<% t.column "Title" do |wiki_page| %>
<%= link_to_wiki wiki_page.title %>
diff --git a/app/views/wiki_pages/search.html.erb b/app/views/wiki_pages/search.html.erb
index 3297d9695..c21832632 100644
--- a/app/views/wiki_pages/search.html.erb
+++ b/app/views/wiki_pages/search.html.erb
@@ -1,16 +1,6 @@
- <%= search_form_for(wiki_pages_path) do |f| %>
- <%= f.input :title_normalize, label: "Title", hint: "Use * for wildcard searches", input_html: { "data-autocomplete": "wiki-page" } %>
- <%= f.input :other_names_match, label: "Other names", hint: "Use * for wildcard searches" %>
- <%= f.input :body_matches, label: "Body" %>
- <%= f.input :linked_to, hint: "Which wikis link to the specified wiki.", input_html: { "data-autocomplete": "wiki-page" } %>
- <%= f.input :not_linked_to, hint: "Which wikis do not link to the specified wiki.", input_html: { "data-autocomplete": "wiki-page" } %>
- <%= f.input :other_names_present, as: :select %>
- <%= f.input :hide_deleted, as: :select, include_blank: false %>
- <%= f.input :order, collection: [%w[Name title], %w[Date time], %w[Posts post_count]], include_blank: false %>
- <%= f.submit "Search" %>
- <% end %>
+ <%= render "search" %>
diff --git a/bin/rails b/bin/rails
index 073966023..6fb4e4051 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby
APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
+require_relative "../config/boot"
+require "rails/commands"
diff --git a/bin/rake b/bin/rake
index 9275675e8..4fbf10b96 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,29 +1,4 @@
#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
- Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
- if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
- load(bundle_binstub)
- else
- abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
- end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rake", "rake")
+require_relative "../config/boot"
+require "rake"
+Rake.application.run
diff --git a/bin/setup b/bin/setup
index 5853b5ea8..90700ac4f 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-require 'fileutils'
+require "fileutils"
# path to your application root.
APP_ROOT = File.expand_path('..', __dir__)
@@ -9,8 +9,8 @@ def system!(*args)
end
FileUtils.chdir APP_ROOT do
- # This script is a way to setup or update your development environment automatically.
- # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
+ # This script is a way to set up or update your development environment automatically.
+ # This script is idempotent, so that you can run it at any time and get an expectable outcome.
# Add necessary setup steps to this file.
puts '== Installing dependencies =='
@@ -18,7 +18,7 @@ FileUtils.chdir APP_ROOT do
system('bundle check') || system!('bundle install')
# Install JavaScript dependencies
- # system('bin/yarn')
+ system! 'bin/yarn'
# puts "\n== Copying sample files =="
# unless File.exist?('config/database.yml')
diff --git a/bin/yarn b/bin/yarn
index 460dd565b..241546e51 100755
--- a/bin/yarn
+++ b/bin/yarn
@@ -1,9 +1,17 @@
#!/usr/bin/env ruby
+require 'pathname'
+
APP_ROOT = File.expand_path('..', __dir__)
Dir.chdir(APP_ROOT) do
- begin
- exec "yarnpkg", *ARGV
- rescue Errno::ENOENT
+ executable_path = ENV["PATH"].split(File::PATH_SEPARATOR).find do |path|
+ normalized_path = File.expand_path(path)
+
+ normalized_path != __dir__ && File.executable?(Pathname.new(normalized_path).join('yarn'))
+ end
+
+ if executable_path
+ exec File.expand_path(Pathname.new(executable_path).join('yarn')), *ARGV
+ else
$stderr.puts "Yarn executable was not detected in the system."
$stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
exit 1
diff --git a/config.ru b/config.ru
index 401c7482f..a0a19dff8 100644
--- a/config.ru
+++ b/config.ru
@@ -1,6 +1,6 @@
# This file is used by Rack-based servers to start the application.
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative "config/environment"
if defined?(Unicorn) && Rails.env.production?
# Unicorn self-process killer
@@ -14,3 +14,4 @@ if defined?(Unicorn) && Rails.env.production?
end
run Rails.application
+Rails.application.load_server
diff --git a/config/application.rb b/config/application.rb
index 5f2e046ac..85ebe5db0 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -35,7 +35,7 @@ module Danbooru
config.app_generators.scaffold_controller :responders_controller
# Initialize configuration defaults for originally generated Rails version.
- config.load_defaults 6.0
+ config.load_defaults 6.1
config.active_record.schema_format = :sql
config.encoding = "utf-8"
config.filter_parameters += [:password, :password_confirmation, :password_hash, :api_key]
diff --git a/config/boot.rb b/config/boot.rb
index b9e460cef..3cda23b4d 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,4 @@
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-require 'bundler/setup' # Set up gems listed in the Gemfile.
-require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+require "bundler/setup" # Set up gems listed in the Gemfile.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 0d2cc3321..ed77e0ae9 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -46,6 +46,21 @@ module Danbooru
"DanbooruBot"
end
+ # The name of the cookie that stores the current user's login session.
+ # Changing this will force all users to login again.
+ def session_cookie_name
+ "_danbooru2_session"
+ end
+
+ # Debug mode does some things to make testing easier. It disables parallel
+ # testing and it replaces Danbooru's custom exception page with the default
+ # Rails exception page. This is only useful during development and testing.
+ #
+ # Usage: `DANBOORU_DEBUG_MODE=true bin/rails test
+ def debug_mode
+ false
+ end
+
def source_code_url
"https://github.com/danbooru/danbooru"
end
@@ -54,6 +69,19 @@ module Danbooru
"#{source_code_url}/issues"
end
+ # If true, new accounts will require email verification if they seem
+ # suspicious (they were created using a proxy, multiple accounts were
+ # created by the same IP, etc).
+ #
+ # This doesn't apply to personal or development installs running on
+ # localhost or the local network.
+ #
+ # Disable this if you're running a public booru and you don't want email
+ # verification for new accounts.
+ def new_user_verification?
+ true
+ end
+
# An array of regexes containing disallowed usernames.
def user_name_blacklist
[]
@@ -79,11 +107,6 @@ module Danbooru
2
end
- # Users cannot search for more than X regular tags at a time.
- def base_tag_query_limit
- 6
- end
-
# After this many pages, the paginator will switch to sequential mode.
def max_numbered_pages
1_000
@@ -266,6 +289,11 @@ module Danbooru
restricted_tags + %w[censored condom nipples nude penis pussy sexually_suggestive]
end
+ # If present, the 404 page will show a random post from this pool.
+ def page_not_found_pool_id
+ nil
+ end
+
# Tags that are only visible to Gold+ users.
def restricted_tags
[]
@@ -339,6 +367,30 @@ module Danbooru
def stripe_publishable_key
end
+ def stripe_webhook_secret
+ end
+
+ def stripe_gold_usd_price_id
+ end
+
+ def stripe_platinum_usd_price_id
+ end
+
+ def stripe_gold_to_platinum_usd_price_id
+ end
+
+ def stripe_gold_eur_price_id
+ end
+
+ def stripe_platinum_eur_price_id
+ end
+
+ def stripe_gold_to_platinum_eur_price_id
+ end
+
+ def stripe_promotion_discount_id
+ end
+
def twitter_api_key
end
diff --git a/config/environment.rb b/config/environment.rb
index 426333bb4..cac531577 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
# Load the Rails application.
-require_relative 'application'
+require_relative "application"
# Initialize the Rails application.
Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9b5b48df6..f0d62dc0c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,8 +1,10 @@
+require "active_support/core_ext/integer/time"
+
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- # In the development environment your application's code is reloaded on
- # every request. This slows down response time but is perfect for development
+ # In the development environment your application's code is reloaded any time
+ # it changes. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
@@ -28,9 +30,6 @@ Rails.application.configure do
config.cache_store = :null_store
end
- # Store uploaded files on the local file system (see config/storage.yml for options).
- # config.active_storage.service = :local
-
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false
@@ -39,24 +38,29 @@ Rails.application.configure do
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log
+ # Raise exceptions for disallowed deprecations.
+ config.active_support.disallowed_deprecation = :raise
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
# Raise an error on page load if there are pending migrations.
config.active_record.migration_error = :page_load
# Highlight code that triggered database queries in logs.
config.active_record.verbose_query_logs = true
- # Debug mode disables concatenation and preprocessing of assets.
- # This option may cause significant delays in view rendering with a large
- # number of complex assets.
- # config.assets.debug = true
-
- # Suppress logger output for asset requests.
- # config.assets.quiet = true
# Raises error for missing translations.
- # config.action_view.raise_on_missing_translations = true
+ # config.i18n.raise_on_missing_translations = true
+
+ # Annotate rendered view with file names.
+ # config.action_view.annotate_rendered_view_with_filenames = true
# Use an evented file watcher to asynchronously detect changes in source code,
# routes, locales, etc. This feature depends on the listen gem.
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+ # Uncomment if you wish to allow Action Cable access from any origin.
+ # config.action_cable.disable_request_forgery_protection = true
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4550af040..21706aae9 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
@@ -22,36 +24,22 @@ Rails.application.configure do
# Apache or NGINX already handles this.
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
- # Compress CSS using a preprocessor.
- # config.assets.css_compressor = :sass
-
- # Do not fallback to assets pipeline if a precompiled asset is missed.
- # config.assets.compile = false
-
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = 'http://assets.example.com'
+ # config.asset_host = 'http://assets.example.com'
# Specifies the header that your server uses for sending files.
# config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
- # Store uploaded files on the local file system (see config/storage.yml for options).
- # config.active_storage.service = :local
-
- # Mount Action Cable outside main process or domain.
- # config.action_cable.mount_path = nil
- # config.action_cable.url = 'wss://example.com/cable'
- # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
-
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true
- # Use the lowest log level to ensure availability of diagnostic information
- # when problems arise.
+ # Include generic and useful information about system operation, but avoid logging too much
+ # information to avoid inadvertent exposure of personally identifiable information (PII).
config.log_level = :error
# Prepend all log lines with the following tags.
- config.log_tags = [:request_id]
+ config.log_tags = [ :request_id ]
# Use a different cache store in production.
# config.cache_store = :mem_cache_store
@@ -70,16 +58,22 @@ Rails.application.configure do
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation cannot be found).
- config.i18n.fallbacks = [I18n.default_locale]
+ config.i18n.fallbacks = true
# Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify
+ # Log disallowed deprecations.
+ config.active_support.disallowed_deprecation = :log
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
# Use default logging formatter so that PID and timestamp are not suppressed.
config.log_formatter = ::Logger::Formatter.new
# Use a different logger for distributed setups.
- # require 'syslog/logger'
+ # require "syslog/logger"
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
if ENV["RAILS_LOG_TO_STDOUT"].present?
diff --git a/config/environments/test.rb b/config/environments/test.rb
index eebb71d5e..d66c042f9 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
# The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
@@ -30,9 +32,6 @@ Rails.application.configure do
# Disable request forgery protection in test environment.
config.action_controller.allow_forgery_protection = false
- # Store uploaded files on the local file system in a temporary directory.
- # config.active_storage.service = :test
-
config.action_mailer.perform_caching = false
# Tell Action Mailer not to deliver emails to the real world.
@@ -43,6 +42,15 @@ Rails.application.configure do
# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr
+ # Raise exceptions for disallowed deprecations.
+ config.active_support.disallowed_deprecation = :raise
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
# Raises error for missing translations.
- # config.action_view.raise_on_missing_translations = true
+ # config.i18n.raise_on_missing_translations = true
+
+ # Annotate rendered view with file names.
+ # config.action_view.annotate_rendered_view_with_filenames = true
end
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 59385cdf3..33699c309 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,7 +1,8 @@
# Be sure to restart your server when you modify this file.
# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
+# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
+Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
diff --git a/config/initializers/core_extensions.rb b/config/initializers/core_extensions.rb
index 61f85f9d0..2456c6b9a 100644
--- a/config/initializers/core_extensions.rb
+++ b/config/initializers/core_extensions.rb
@@ -16,6 +16,11 @@ module Danbooru
string
end
+ # escape \ and * characters so that they're treated literally in LIKE searches.
+ def escape_wildcards
+ gsub(/\\/, '\\\\').gsub(/\*/, '\*')
+ end
+
def to_escaped_for_tsquery_split
scan(/\S+/).map {|x| x.to_escaped_for_tsquery}.join(" & ")
end
@@ -36,6 +41,19 @@ module Danbooru
pattern = Regexp.escape(pattern).gsub(/\\\*/, ".*")
match?(/\A#{pattern}\z/i)
end
+
+ def normalize_whitespace
+ # Normalize various horizontal space characters to ASCII space.
+ text = gsub(/\p{Zs}|\t/, " ")
+
+ # Strip various zero width space characters.
+ text = text.gsub(/[\u180E\u200B\u200C\u200D\u2060\uFEFF]/, "")
+
+ # Normalize various line ending characters to CRLF.
+ text = text.gsub(/\r?\n|\r|\v|\f|\u0085|\u2028|\u2029/, "\r\n")
+
+ text
+ end
end
end
end
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
new file mode 100644
index 000000000..00f64d71b
--- /dev/null
+++ b/config/initializers/permissions_policy.rb
@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+# f.camera :none
+# f.gyroscope :none
+# f.microphone :none
+# f.usb :none
+# f.fullscreen :self
+# f.payment :self, "https://secure.example.com"
+# end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 6cb8f0eb3..2bbb72e68 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,11 @@
# Be sure to restart your server when you modify this file.
-Rails.application.config.session_store :cookie_store, key: '_danbooru2_session', domain: :all, tld_length: 2, same_site: :lax, secure: Rails.env.production?
+# https://api.rubyonrails.org/classes/ActionDispatch/Cookies.html
+Rails.application.config.session_store(
+ :cookie_store,
+ key: Danbooru.config.session_cookie_name,
+ domain: :all,
+ tld_length: 2,
+ same_site: :lax,
+ secure: Rails.env.production?
+)
diff --git a/config/initializers/stripe.rb b/config/initializers/stripe.rb
index 43495044b..7a60018c9 100644
--- a/config/initializers/stripe.rb
+++ b/config/initializers/stripe.rb
@@ -1 +1,2 @@
Stripe.api_key = Danbooru.config.stripe_secret_key
+Stripe.api_version = "2020-08-27"
diff --git a/config/puma.rb b/config/puma.rb
index 1e19380dc..d9b3e836c 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -4,19 +4,28 @@
# the maximum value specified for Puma. Default is set to 5 threads for minimum
# and maximum; this matches the default thread size of Active Record.
#
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-threads threads_count, threads_count
+max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+threads min_threads_count, max_threads_count
+
+# Specifies the `worker_timeout` threshold that Puma will use to wait before
+# terminating a worker in development environments.
+#
+worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
#
-port ENV.fetch("PORT") { 3000 }
+port ENV.fetch("PORT") { 3000 }
# Specifies the `environment` that Puma will run in.
#
environment ENV.fetch("RAILS_ENV") { "development" }
+# Specifies the `pidfile` that Puma will use.
+pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+
# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
+# Workers are forked web server processes. If using threads and workers together
# the concurrency of the application would be max `threads` * `workers`.
# Workers do not work on JRuby or Windows (both of which do not support
# processes).
@@ -26,31 +35,9 @@ environment ENV.fetch("RAILS_ENV") { "development" }
# Use the `preload_app!` method when specifying a `workers` number.
# This directive tells Puma to first boot the application and load code
# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory. If you use this option
-# you need to make sure to reconnect any threads in the `on_worker_boot`
-# block.
+# process behavior so workers use less memory.
#
# preload_app!
-# If you are preloading your application and using Active Record, it's
-# recommended that you close any connections to the database before workers
-# are forked to prevent connection leakage.
-#
-# before_fork do
-# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
-# end
-
-# The code in the `on_worker_boot` will be called if you are using
-# clustered mode by specifying a number of `workers`. After each worker
-# process is booted, this block will be run. If you are using the `preload_app!`
-# option, you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, as Ruby
-# cannot share connections between processes.
-#
-# on_worker_boot do
-# ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
-# end
-#
-
# Allow puma to be restarted by `rails restart` command.
plugin :tmp_restart
diff --git a/config/routes.rb b/config/routes.rb
index ce3a273c1..13e8a809c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,14 @@
Rails.application.routes.draw do
+ resources :posts, only: [:index, :show, :update, :destroy] do
+ get :random, on: :collection
+ end
+
+ resources :autocomplete, only: [:index]
+
+ # XXX This comes *after* defining posts above because otherwise the paginator
+ # generates `/?page=2` instead of `/posts?page=2` on the posts#index page.
+ root "posts#index"
+
namespace :admin do
resources :users, :only => [:edit, :update]
resource :dashboard, :only => [:show]
@@ -67,7 +77,6 @@ Rails.application.routes.draw do
get :search
end
end
- resources :autocomplete, only: [:index]
resources :bans
resources :bulk_update_requests do
member do
@@ -103,6 +112,7 @@ Rails.application.routes.draw do
end
resource :dtext_preview, :only => [:create]
resources :dtext_links, only: [:index]
+ resources :emails, only: [:index, :show]
resources :favorites, :only => [:index, :create, :destroy]
resources :favorite_groups do
member do
@@ -141,9 +151,6 @@ Rails.application.routes.draw do
resources :modqueue, only: [:index]
resources :news_updates
resources :notes do
- collection do
- get :search
- end
member do
put :revert
end
@@ -173,7 +180,9 @@ Rails.application.routes.draw do
end
resources :post_replacements, :only => [:index, :new, :create, :update]
resources :post_votes, only: [:index]
- resources :posts, only: [:index, :show, :update, :destroy] do
+
+ # XXX Use `only: []` to avoid redefining post routes defined at top of file.
+ resources :posts, only: [] do
resources :events, :only => [:index], :controller => "post_events"
resources :replacements, :only => [:index, :new, :create], :controller => "post_replacements"
resource :artist_commentary, :only => [:index, :show] do
@@ -181,9 +190,6 @@ Rails.application.routes.draw do
member { put :revert }
end
resource :votes, controller: "post_votes", only: [:create, :destroy], as: "post_votes"
- collection do
- get :random
- end
member do
put :revert
put :copy_notes
@@ -217,20 +223,13 @@ Rails.application.routes.draw do
resource :related_tag, :only => [:show, :update]
resources :recommended_posts, only: [:index]
resources :robots, only: [:index]
- resources :saved_searches, :except => [:show] do
- collection do
- get :labels
- end
- end
+ resources :saved_searches, :except => [:show]
resource :session, only: [:new, :create, :destroy] do
get :sign_out, on: :collection
end
resource :source, :only => [:show]
- resources :tags do
- collection do
- get :autocomplete
- end
- end
+ resource :status, only: [:show], controller: "status"
+ resources :tags
resources :tag_aliases, only: [:show, :index, :destroy]
resources :tag_implications, only: [:show, :index, :destroy]
resources :uploads do
@@ -252,13 +251,19 @@ Rails.application.routes.draw do
end
collection do
- get :search
get :custom_style
end
end
- resource :user_upgrade, :only => [:new, :create, :show]
+ resources :user_upgrades, only: [:new, :create, :show, :index] do
+ get :receipt, on: :member
+ get :payment, on: :member
+ put :refund, on: :member
+ end
resources :user_feedbacks, except: [:destroy]
resources :user_name_change_requests, only: [:new, :create, :show, :index]
+ resources :webhooks do
+ post :receive, on: :collection
+ end
resources :wiki_pages, id: /.+?(?=\.json|\.xml|\.html)|.+/ do
put :revert, on: :member
get :search, on: :collection
@@ -270,100 +275,40 @@ Rails.application.routes.draw do
end
end
- # legacy aliases
- get "/artist" => redirect {|params, req| "/artists?page=#{req.params[:page]}&search[name]=#{CGI.escape(req.params[:name].to_s)}"}
- get "/artist/index.xml", :controller => "legacy", :action => "artists", :format => "xml"
- get "/artist/index.json", :controller => "legacy", :action => "artists", :format => "json"
- get "/artist/index" => redirect {|params, req| "/artists?page=#{req.params[:page]}"}
- get "/artist/show/:id" => redirect("/artists/%{id}")
- get "/artist/show" => redirect {|params, req| "/artists?name=#{CGI.escape(req.params[:name].to_s)}"}
- get "/artist/history/:id" => redirect("/artist_versions?search[artist_id]=%{id}")
- get "/artist/recent_changes" => redirect("/artist_versions")
-
- get "/comment" => redirect {|params, req| "/comments?page=#{req.params[:page]}"}
- get "/comment/index" => redirect {|params, req| "/comments?page=#{req.params[:page]}"}
- get "/comment/show/:id" => redirect("/comments/%{id}")
- get "/comment/new" => redirect("/comments")
- get("/comment/search" => redirect do |params, req|
- if req.params[:query] =~ /^user:(.+)/i
- "/comments?group_by=comment&search[creator_name]=#{CGI.escape($1)}"
- else
- "/comments/search"
- end
- end)
-
- get "/favorite" => redirect {|params, req| "/favorites?page=#{req.params[:page]}"}
- get "/favorite/index" => redirect {|params, req| "/favorites?page=#{req.params[:page]}"}
- get "/favorite/list_users.json", :controller => "legacy", :action => "unavailable"
-
- get "/forum" => redirect {|params, req| "/forum_topics?page=#{req.params[:page]}"}
- get "/forum/index" => redirect {|params, req| "/forum_topics?page=#{req.params[:page]}"}
- get "/forum/show/:id" => redirect {|params, req| "/forum_posts/#{req.params[:id]}?page=#{req.params[:page]}"}
- get "/forum/search" => redirect("/forum_posts/search")
-
- get "/help/:title" => redirect {|params, req| "/wiki_pages?title=#{CGI.escape('help:' + req.params[:title])}"}
-
- get "/note" => redirect {|params, req| "/notes?page=#{req.params[:page]}"}
- get "/note/index" => redirect {|params, req| "/notes?page=#{req.params[:page]}"}
- get "/note/history" => redirect {|params, req| "/note_versions?search[updater_id]=#{req.params[:user_id]}"}
-
- get "/pool" => redirect {|params, req| "/pools?page=#{req.params[:page]}"}
- get "/pool/index" => redirect {|params, req| "/pools?page=#{req.params[:page]}"}
- get "/pool/show/:id" => redirect("/pools/%{id}")
- get "/pool/history/:id" => redirect("/pool_versions?search[pool_id]=%{id}")
- get "/pool/recent_changes" => redirect("/pool_versions")
-
- get "/post/index.xml", :controller => "legacy", :action => "posts", :format => "xml"
- get "/post/index.json", :controller => "legacy", :action => "posts", :format => "json"
- get "/post/piclens", :controller => "legacy", :action => "unavailable"
- get "/post/index" => redirect {|params, req| "/posts?tags=#{CGI.escape(req.params[:tags].to_s)}&page=#{req.params[:page]}"}
- get "/post" => redirect {|params, req| "/posts?tags=#{CGI.escape(req.params[:tags].to_s)}&page=#{req.params[:page]}"}
- get "/post/upload" => redirect("/uploads/new")
- get "/post/moderate" => redirect("/moderator/post/queue")
- get "/post/atom" => redirect {|params, req| "/posts.atom?tags=#{CGI.escape(req.params[:tags].to_s)}"}
- get "/post/atom.feed" => redirect {|params, req| "/posts.atom?tags=#{CGI.escape(req.params[:tags].to_s)}"}
- get "/post/popular_by_day" => redirect("/explore/posts/popular")
- get "/post/popular_by_week" => redirect("/explore/posts/popular")
- get "/post/popular_by_month" => redirect("/explore/posts/popular")
- get "/post/show/:id/:tag_title" => redirect("/posts/%{id}")
- get "/post/show/:id" => redirect("/posts/%{id}")
- get "/post/show" => redirect {|params, req| "/posts?md5=#{req.params[:md5]}"}
- get "/post/view/:id/:tag_title" => redirect("/posts/%{id}")
- get "/post/view/:id" => redirect("/posts/%{id}")
- get "/post/flag/:id" => redirect("/posts/%{id}")
-
- get("/post_tag_history" => redirect do |params, req|
- page = req.params[:before_id].present? ? "b#{req.params[:before_id]}" : req.params[:page]
- "/post_versions?page=#{page}&search[updater_id]=#{req.params[:user_id]}"
- end)
- get "/post_tag_history/index" => redirect {|params, req| "/post_versions?page=#{req.params[:page]}&search[post_id]=#{req.params[:post_id]}"}
-
+ # Legacy Danbooru 1 API endpoints
get "/tag/index.xml", :controller => "legacy", :action => "tags", :format => "xml"
get "/tag/index.json", :controller => "legacy", :action => "tags", :format => "json"
+ get "/post/index.xml", :controller => "legacy", :action => "posts", :format => "xml"
+ get "/post/index.json", :controller => "legacy", :action => "posts", :format => "json"
+
+ # Legacy Danbooru 1 redirects.
+ get "/artist" => redirect {|params, req| "/artists?page=#{req.params[:page]}&search[name]=#{CGI.escape(req.params[:name].to_s)}"}
+ get "/artist/show/:id" => redirect("/artists/%{id}")
+ get "/artist/show" => redirect {|params, req| "/artists?name=#{CGI.escape(req.params[:name].to_s)}"}
+
+ get "/forum" => redirect {|params, req| "/forum_topics?page=#{req.params[:page]}"}
+ get "/forum/show/:id" => redirect {|params, req| "/forum_posts/#{req.params[:id]}?page=#{req.params[:page]}"}
+
+ get "/pool/show/:id" => redirect("/pools/%{id}")
+
+ get "/post/index" => redirect {|params, req| "/posts?tags=#{CGI.escape(req.params[:tags].to_s)}&page=#{req.params[:page]}"}
+ get "/post/atom" => redirect {|params, req| "/posts.atom?tags=#{CGI.escape(req.params[:tags].to_s)}"}
+ get "/post/show/:id/:tag_title" => redirect("/posts/%{id}")
+ get "/post/show/:id" => redirect("/posts/%{id}")
+
get "/tag" => redirect {|params, req| "/tags?page=#{req.params[:page]}&search[name_matches]=#{CGI.escape(req.params[:name].to_s)}&search[order]=#{req.params[:order]}&search[category]=#{req.params[:type]}"}
get "/tag/index" => redirect {|params, req| "/tags?page=#{req.params[:page]}&search[name_matches]=#{CGI.escape(req.params[:name].to_s)}&search[order]=#{req.params[:order]}"}
- get "/tag_implication" => redirect {|params, req| "/tag_implications?search[name_matches]=#{CGI.escape(req.params[:query].to_s)}"}
-
- get "/user/index.xml", :controller => "legacy", :action => "users", :format => "xml"
- get "/user/index.json", :controller => "legacy", :action => "users", :format => "json"
- get "/user" => redirect {|params, req| "/users?page=#{req.params[:page]}"}
- get "/user/index" => redirect {|params, req| "/users?page=#{req.params[:page]}"}
get "/user/show/:id" => redirect("/users/%{id}")
- get "/user/login" => redirect("/sessions/new")
- get "/user_record" => redirect {|params, req| "/user_feedbacks?search[user_id]=#{req.params[:user_id]}"}
+
+ get "/wiki/show" => redirect {|params, req| "/wiki_pages?title=#{CGI.escape(req.params[:title].to_s)}"}
+ get "/help/:title" => redirect {|params, req| "/wiki_pages?title=#{CGI.escape('help:' + req.params[:title])}"}
+
get "/login", to: "sessions#new", as: :login
get "/logout", to: "sessions#sign_out", as: :logout
get "/profile", to: "users#profile", as: :profile
get "/settings", to: "users#settings", as: :settings
- get "/wiki" => redirect {|params, req| "/wiki_pages?page=#{req.params[:page]}"}
- get "/wiki/index" => redirect {|params, req| "/wiki_pages?page=#{req.params[:page]}"}
- get "/wiki/rename" => redirect("/wiki_pages")
- get "/wiki/show" => redirect {|params, req| "/wiki_pages?title=#{CGI.escape(req.params[:title].to_s)}"}
- get "/wiki/recent_changes" => redirect {|params, req| "/wiki_page_versions?search[updater_id]=#{req.params[:user_id]}"}
- get "/wiki/history/:title" => redirect("/wiki_page_versions?title=%{title}")
-
get "/sitemap" => "static#sitemap_index"
get "/opensearch" => "static#opensearch", :as => "opensearch"
get "/privacy" => "static#privacy_policy", :as => "privacy_policy"
@@ -373,7 +318,8 @@ Rails.application.routes.draw do
get "/static/site_map" => "static#site_map", :as => "site_map"
get "/static/contact" => "static#contact", :as => "contact"
get "/static/dtext_help" => "static#dtext_help", :as => "dtext_help"
- get "/static/terms_of_service" => redirect { "/terms_of_service" }
+ get "/static/terms_of_service", to: redirect("/terms_of_service")
+ get "/user_upgrade/new", to: redirect("/user_upgrades/new")
get "/mock/recommender/recommend/:user_id" => "mock_services#recommender_recommend", as: "mock_recommender_recommend"
get "/mock/recommender/similiar/:post_id" => "mock_services#recommender_similar", as: "mock_recommender_similar"
@@ -383,7 +329,5 @@ Rails.application.routes.draw do
get "/mock/iqdbs/similar" => "mock_services#iqdbs_similar", as: "mock_iqdbs_similar"
post "/mock/iqdbs/similar" => "mock_services#iqdbs_similar"
- root :to => "posts#index"
-
- get "*other", :to => "static#not_found"
+ match "*other", to: "static#not_found", via: :all
end
diff --git a/db/migrate/20201213052805_add_extension_fuzzy_str_match.rb b/db/migrate/20201213052805_add_extension_fuzzy_str_match.rb
new file mode 100644
index 000000000..bea09b809
--- /dev/null
+++ b/db/migrate/20201213052805_add_extension_fuzzy_str_match.rb
@@ -0,0 +1,5 @@
+class AddExtensionFuzzyStrMatch < ActiveRecord::Migration[6.0]
+ def change
+ enable_extension "fuzzystrmatch"
+ end
+end
diff --git a/db/migrate/20201219201007_rename_post_replacement_attributes.rb b/db/migrate/20201219201007_rename_post_replacement_attributes.rb
new file mode 100644
index 000000000..31584c920
--- /dev/null
+++ b/db/migrate/20201219201007_rename_post_replacement_attributes.rb
@@ -0,0 +1,9 @@
+class RenamePostReplacementAttributes < ActiveRecord::Migration[6.1]
+ def change
+ rename_column :post_replacements, :file_ext_was, :old_file_ext
+ rename_column :post_replacements, :file_size_was, :old_file_size
+ rename_column :post_replacements, :image_width_was, :old_image_width
+ rename_column :post_replacements, :image_height_was, :old_image_height
+ rename_column :post_replacements, :md5_was, :old_md5
+ end
+end
diff --git a/db/migrate/20201224101208_create_user_upgrades.rb b/db/migrate/20201224101208_create_user_upgrades.rb
new file mode 100644
index 000000000..46b44f22a
--- /dev/null
+++ b/db/migrate/20201224101208_create_user_upgrades.rb
@@ -0,0 +1,20 @@
+class CreateUserUpgrades < ActiveRecord::Migration[6.1]
+ def change
+ create_table :user_upgrades do |t|
+ t.timestamps
+
+ t.references :recipient, index: true, null: false
+ t.references :purchaser, index: true, null: false
+ t.integer :upgrade_type, index: true, null: false
+ t.integer :status, index: true, null: false
+ t.string :stripe_id, index: true, null: true
+ end
+
+ # Reserve ID space for backfilling old upgrades.
+ reversible do |dir|
+ dir.up do
+ execute "SELECT setval('user_upgrades_id_seq', 25000, false)"
+ end
+ end
+ end
+end
diff --git a/db/populate.rb b/db/populate.rb
index c6451e7b7..76a517ed3 100644
--- a/db/populate.rb
+++ b/db/populate.rb
@@ -53,7 +53,7 @@ if User.count == 0
password: "password1",
password_confirmation: "password1"
)
- newuser.promote_to!(User::Levels.const_get(level), :is_upgrade => true, :skip_dmail => true)
+ newuser.promote_to!(User::Levels.const_get(level), user)
end
newuser = User.create(
@@ -68,14 +68,14 @@ if User.count == 0
:password => "password1",
:password_confirmation => "password1"
)
- newuser.promote_to!(User::Levels::BUILDER, :can_upload_free => true, :is_upgrade => true, :skip_dmail => true)
+ newuser.promote_to!(User::Levels::BUILDER, :can_upload_free => true, :skip_dmail => true)
newuser = User.create(
:name => "approver",
:password => "password1",
:password_confirmation => "password1"
)
- newuser.promote_to!(User::Levels::BUILDER, :can_approve_posts => true, :is_upgrade => true, :skip_dmail => true)
+ newuser.promote_to!(User::Levels::BUILDER, :can_approve_posts => true, :skip_dmail => true)
end
0.upto(10) do |i|
diff --git a/db/structure.sql b/db/structure.sql
index 7da011e05..f57281afa 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -9,6 +9,21 @@ SET xmloption = content;
SET client_min_messages = warning;
SET row_security = off;
+
+--
+-- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS fuzzystrmatch WITH SCHEMA public;
+
+
+--
+-- Name: EXTENSION fuzzystrmatch; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION fuzzystrmatch IS 'determine similarities and distance between strings';
+
+
--
-- Name: pg_trgm; Type: EXTENSION; Schema: -; Owner: -
--
@@ -2721,11 +2736,11 @@ CREATE TABLE public.post_replacements (
replacement_url text NOT NULL,
created_at timestamp without time zone NOT NULL,
updated_at timestamp without time zone NOT NULL,
- file_ext_was character varying,
- file_size_was integer,
- image_width_was integer,
- image_height_was integer,
- md5_was character varying,
+ old_file_ext character varying,
+ old_file_size integer,
+ old_image_width integer,
+ old_image_height integer,
+ old_md5 character varying,
file_ext character varying,
file_size integer,
image_width integer,
@@ -3089,6 +3104,41 @@ CREATE SEQUENCE public.user_name_change_requests_id_seq
ALTER SEQUENCE public.user_name_change_requests_id_seq OWNED BY public.user_name_change_requests.id;
+--
+-- Name: user_upgrades; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.user_upgrades (
+ id bigint NOT NULL,
+ created_at timestamp(6) without time zone NOT NULL,
+ updated_at timestamp(6) without time zone NOT NULL,
+ recipient_id bigint NOT NULL,
+ purchaser_id bigint NOT NULL,
+ upgrade_type integer NOT NULL,
+ status integer NOT NULL,
+ stripe_id character varying
+);
+
+
+--
+-- Name: user_upgrades_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.user_upgrades_id_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+
+--
+-- Name: user_upgrades_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.user_upgrades_id_seq OWNED BY public.user_upgrades.id;
+
+
--
-- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: -
--
@@ -4157,6 +4207,13 @@ ALTER TABLE ONLY public.user_feedback ALTER COLUMN id SET DEFAULT nextval('publi
ALTER TABLE ONLY public.user_name_change_requests ALTER COLUMN id SET DEFAULT nextval('public.user_name_change_requests_id_seq'::regclass);
+--
+-- Name: user_upgrades id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.user_upgrades ALTER COLUMN id SET DEFAULT nextval('public.user_upgrades_id_seq'::regclass);
+
+
--
-- Name: users id; Type: DEFAULT; Schema: public; Owner: -
--
@@ -4522,6 +4579,14 @@ ALTER TABLE ONLY public.user_name_change_requests
ADD CONSTRAINT user_name_change_requests_pkey PRIMARY KEY (id);
+--
+-- Name: user_upgrades user_upgrades_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.user_upgrades
+ ADD CONSTRAINT user_upgrades_pkey PRIMARY KEY (id);
+
+
--
-- Name: users users_pkey; Type: CONSTRAINT; Schema: public; Owner: -
--
@@ -7030,6 +7095,41 @@ CREATE INDEX index_user_name_change_requests_on_original_name ON public.user_nam
CREATE INDEX index_user_name_change_requests_on_user_id ON public.user_name_change_requests USING btree (user_id);
+--
+-- Name: index_user_upgrades_on_purchaser_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_user_upgrades_on_purchaser_id ON public.user_upgrades USING btree (purchaser_id);
+
+
+--
+-- Name: index_user_upgrades_on_recipient_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_user_upgrades_on_recipient_id ON public.user_upgrades USING btree (recipient_id);
+
+
+--
+-- Name: index_user_upgrades_on_status; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_user_upgrades_on_status ON public.user_upgrades USING btree (status);
+
+
+--
+-- Name: index_user_upgrades_on_stripe_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_user_upgrades_on_stripe_id ON public.user_upgrades USING btree (stripe_id);
+
+
+--
+-- Name: index_user_upgrades_on_upgrade_type; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_user_upgrades_on_upgrade_type ON public.user_upgrades USING btree (upgrade_type);
+
+
--
-- Name: index_users_on_created_at; Type: INDEX; Schema: public; Owner: -
--
@@ -7420,6 +7520,9 @@ INSERT INTO "schema_migrations" (version) VALUES
('20200520060951'),
('20200803022359'),
('20200816175151'),
-('20201201211748');
+('20201201211748'),
+('20201213052805'),
+('20201219201007'),
+('20201224101208');
diff --git a/public/404.html b/public/404.html
deleted file mode 100644
index 108e3337c..000000000
--- a/public/404.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- Page not found
- Failbooru
-