X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c2f23fea6a7821a4ad4c97fd65744b138ec86267..077834704e79259e60967b0cde8f8785017e9145:/app/models/user_block.rb

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index f56f87b9d..27bc40498 100644
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -3,12 +3,12 @@
 # Table name: user_blocks
 #
 #  id            :integer          not null, primary key
-#  user_id       :bigint(8)        not null
-#  creator_id    :bigint(8)        not null
+#  user_id       :integer          not null
+#  creator_id    :integer          not null
 #  reason        :text             not null
 #  ends_at       :datetime         not null
 #  needs_view    :boolean          default(FALSE), not null
-#  revoker_id    :bigint(8)
+#  revoker_id    :integer
 #  created_at    :datetime
 #  updated_at    :datetime
 #  reason_format :enum             default("markdown"), not null
@@ -26,13 +26,13 @@
 
 class UserBlock < ActiveRecord::Base
   validate :moderator_permissions
-  validates :reason, :invalid_chars => true
+  validates :reason, :characters => true
 
   belongs_to :user, :class_name => "User", :foreign_key => :user_id
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
 
-  PERIODS = USER_BLOCK_PERIODS
+  PERIODS = Settings.user_block_periods
 
   ##
   # scope to match active blocks