updated tests, switched to rails 3.0.0rc2
This commit is contained in:
@@ -5,8 +5,8 @@ class Comment < ActiveRecord::Base
|
||||
belongs_to :creator, :class_name => "User"
|
||||
has_many :votes, :class_name => "CommentVote", :dependent => :destroy
|
||||
after_save :update_last_commented_at
|
||||
after_destroy :update_last_commented_at
|
||||
attr_accessible :body
|
||||
attr_accessor :do_not_bump_post
|
||||
|
||||
scope :recent, :order => "comments.id desc", :limit => 6
|
||||
scope :search_body, lambda {|query| where("body_index @@ plainto_tsquery(?)", query).order("comments.id DESC")}
|
||||
@@ -21,10 +21,30 @@ class Comment < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def update_last_commented_at
|
||||
if Comment.where(["post_id = ?", post_id]).count <= Danbooru.config.comment_threshold
|
||||
if Comment.where(["post_id = ?", post_id]).count <= Danbooru.config.comment_threshold && !do_not_bump_post
|
||||
execute_sql("UPDATE posts SET last_commented_at = ? WHERE id = ?", created_at, post_id)
|
||||
end
|
||||
end
|
||||
|
||||
def vote!(is_positive)
|
||||
if !CurrentUser.user.can_comment_vote?
|
||||
raise CommentVote::Error.new("You can only vote ten times an hour on comments")
|
||||
|
||||
elsif !is_positive && creator.is_janitor_or_higher?
|
||||
raise CommentVote::Error.new("You cannot downvote janitor/moderator/admin comments")
|
||||
|
||||
elsif votes.find_by_user_id(CurrentUser.user.id).nil?
|
||||
if is_positive
|
||||
update_attribute(:score, score + 1)
|
||||
else
|
||||
update_attribute(:score, score - 1)
|
||||
end
|
||||
votes.create(:user_id => CurrentUser.user.id)
|
||||
|
||||
else
|
||||
raise CommentVote::Error.new("You have already voted for this comment")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Comment.connection.extend(PostgresExtensions)
|
||||
|
||||
Reference in New Issue
Block a user