Merge remote-tracking branch 'upstream/pull/5288'

[rails.git] / app / models / user_block.rb

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index eb0daba6569731cad0fe0486b6ea814099e6d2d5..9dd8d3138cefb11c887255371f01ec7b9bc2e939 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -1,16 +1,47 @@
-class UserBlock < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: user_blocks
+#
+#  id             :integer          not null, primary key
+#  user_id        :bigint(8)        not null
+#  creator_id     :bigint(8)        not null
+#  reason         :text             not null
+#  ends_at        :datetime         not null
+#  needs_view     :boolean          default(FALSE), not null
+#  revoker_id     :bigint(8)
+#  created_at     :datetime
+#  updated_at     :datetime
+#  reason_format  :enum             default("markdown"), not null
+#  deactivates_at :datetime
+#
+# Indexes
+#
+#  index_user_blocks_on_creator_id_and_id  (creator_id,id)
+#  index_user_blocks_on_user_id            (user_id)
+#
+# Foreign Keys
+#
+#  user_blocks_moderator_id_fkey  (creator_id => users.id)
+#  user_blocks_revoker_id_fkey    (revoker_id => users.id)
+#  user_blocks_user_id_fkey       (user_id => users.id)
+#
+
+class UserBlock < ApplicationRecord

   validate :moderator_permissions
   validate :moderator_permissions

+  validates :reason, :characters => true
+  validates :deactivates_at, :comparison => { :greater_than_or_equal_to => :ends_at }, :unless => -> { needs_view }
+  validates :deactivates_at, :absence => true, :if => -> { needs_view }

 
 

-  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
+  belongs_to :user, :class_name => "User"
+  belongs_to :creator, :class_name => "User"
+  belongs_to :revoker, :class_name => "User", :optional => true

 
 

-  PERIODS = USER_BLOCK_PERIODS
+  PERIODS = Settings.user_block_periods

 
   ##
   # scope to match active blocks
   def self.active
 
   ##
   # scope to match active blocks
   def self.active

-    where("needs_view or ends_at > ?", Time.now.getutc)
+    where("needs_view or ends_at > ?", Time.now.utc)

   end
 
   ##
   end
 
   ##


@@ -23,7 +54,7 @@ class UserBlock < ActiveRecord::Base
   # returns true if the block is currently active (i.e: the user can't
   # use the API).
   def active?
   # returns true if the block is currently active (i.e: the user can't
   # use the API).
   def active?

-    needs_view || ends_at > Time.now.getutc
+    needs_view || ends_at > Time.now.utc

   end
 
   ##
   end
 
   ##


@@ -37,8 +68,9 @@ class UserBlock < ActiveRecord::Base
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.
   def revoke!(revoker)
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.
   def revoke!(revoker)

-    update_attributes(
-      :ends_at => Time.now.getutc,
+    update(
+      :ends_at => Time.now.utc,
+      :deactivates_at => Time.now.utc,

       :revoker_id => revoker.id,
       :needs_view => false
     )
       :revoker_id => revoker.id,
       :needs_view => false
     )


@@ -51,7 +83,7 @@ class UserBlock < ActiveRecord::Base
   # block. this should be caught and dealt with in the controller,
   # but i've also included it here just in case.
   def moderator_permissions
   # block. this should be caught and dealt with in the controller,
   # but i've also included it here just in case.
   def moderator_permissions

-    errors.add(:base, I18n.t("user_block.model.non_moderator_update")) if creator_id_changed? && !creator.moderator?
-    errors.add(:base, I18n.t("user_block.model.non_moderator_revoke")) unless revoker_id.nil? || revoker.moderator?
+    errors.add(:base, I18n.t("user_blocks.model.non_moderator_update")) if creator_id_changed? && !creator.moderator?
+    errors.add(:base, I18n.t("user_blocks.model.non_moderator_revoke")) if revoker_id_changed? && !revoker_id.nil? && !revoker.moderator?

   end
 end
   end
 end