Move the notes api methods into a controller in the api namespace

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index edea23c80aad2547c8c369e2e4a18d9d29d4f92c..02af385a7a09389c88aa722ca8766054e3f2f29f 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -1,5 +1,32 @@
+# == Schema Information
+#
+# Table name: user_blocks
+#
+#  id            :integer          not null, primary key
+#  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    :integer
+#  created_at    :datetime
+#  updated_at    :datetime
+#  reason_format :enum             default("markdown"), not null
+#
+# Indexes
+#
+#  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 < ActiveRecord::Base
   validate :moderator_permissions
 class UserBlock < ActiveRecord::Base
   validate :moderator_permissions

+  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 :user, :class_name => "User", :foreign_key => :user_id
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id


@@ -29,14 +56,15 @@ class UserBlock < ActiveRecord::Base
   ##
   # returns true if the block is a "zero hour" block
   def zero_hour?
   ##
   # returns true if the block is a "zero hour" block
   def zero_hour?

-    needs_view && (ends_at.to_i == updated_at.to_i)
+    # if the times differ more than 1 minute we probably have more important issues
+    needs_view && (ends_at.to_i - updated_at.to_i) < 60

   end
 
   ##
   # 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)
   end
 
   ##
   # 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(
+    update(

       :ends_at => Time.now.getutc,
       :revoker_id => revoker.id,
       :needs_view => false
       :ends_at => Time.now.getutc,
       :revoker_id => revoker.id,
       :needs_view => false