bans: change expires_at field to duration.
Changes: * Change the `expires_at` field to `duration`. * Make moderators choose from a fixed set of standard ban lengths, instead of allowing arbitrary ban lengths. * List `duration` in seconds in the /bans.json API. * Dump bans to BigQuery. Note that some old bans have a negative duration. This is because their expiration date was before their creation date, which is because in 2013 bans were migrated to Danbooru 2 and the original ban creation dates were lost.
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
<%= edit_form_for(ban) do |f| %>
|
||||
<%= f.input :user_name, :as => :string, :input_html => { data: { autocomplete: "user" } } %>
|
||||
<%= f.input :duration, :hint => "in days" %>
|
||||
<% if ban.new_record? %>
|
||||
<%= f.input :user_name, as: :string, input_html: { "data-autocomplete": "user" } %>
|
||||
<% end %>
|
||||
|
||||
<%= f.input :duration, collection: [["1 day", 1.day.iso8601], ["3 days", 3.days.iso8601], ["1 week", 1.week.iso8601], ["1 month", 1.month.iso8601], ["3 months", 3.months.iso8601], ["6 months", 6.months.iso8601], ["1 year", 1.year.iso8601], ["forever", 100.years.iso8601]] %>
|
||||
<%= f.input :reason %>
|
||||
<%= f.button :submit, :value => "Ban" %>
|
||||
<%= f.button :submit %>
|
||||
<% end %>
|
||||
|
||||
@@ -1 +1 @@
|
||||
$("#ban-<%= @ban.id %>").remove();
|
||||
location.reload();
|
||||
|
||||
@@ -2,11 +2,7 @@
|
||||
<div id="a-edit">
|
||||
<h1>Edit Ban</h1>
|
||||
|
||||
<%= edit_form_for(@ban) do |f| %>
|
||||
<%= f.input :duration, :hint => "in days" %>
|
||||
<%= f.input :reason %>
|
||||
<%= f.button :submit, :value => "Ban" %>
|
||||
<% end %>
|
||||
<%= render "form", ban: @ban %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
<%= link_to_user(ban.user) %>
|
||||
<%= link_to "»", bans_path(search: search_params.merge(user_name: ban.user.name)) %>
|
||||
<% end %>
|
||||
<% t.column "Duration" do |ban| %>
|
||||
<%= humanized_duration(ban.created_at, ban.expires_at) %>
|
||||
<% end %>
|
||||
<% t.column "Reason", td: {class: "col-expand"} do |ban| %>
|
||||
<div class="prose">
|
||||
<%= format_text ban.reason %>
|
||||
</div>
|
||||
<% end %>
|
||||
<% t.column "Duration" do |ban| %>
|
||||
<%= humanized_duration(ban.created_at, ban.expires_at) %>
|
||||
<% end %>
|
||||
<% t.column "Banner" do |ban| %>
|
||||
<%= link_to_user ban.banner %>
|
||||
<%= link_to "»", bans_path(search: { banner_name: ban.banner.name }) %>
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
<div id="a-show">
|
||||
<h1>Show Ban</h1>
|
||||
<ul style="margin-bottom: 1em;">
|
||||
<li><strong>User</strong>: <%= link_to_user(@ban.user) %></li>
|
||||
<li><strong>Expires</strong>: <%= compact_time @ban.expires_at %></li>
|
||||
<li><strong>User</strong> <%= link_to_user(@ban.user) %></li>
|
||||
<li><strong>Duration</strong> <%= humanized_duration(@ban.created_at, @ban.expires_at) %></li>
|
||||
<li>
|
||||
<strong>Reason</strong>:
|
||||
<strong>Reason</strong>
|
||||
<div class="prose">
|
||||
<%= format_text @ban.reason %>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user