jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "potential fix for #1210"

Browse Source 
This reverts commit d5f10f41fd.
This commit is contained in:
r888888888
2014-06-22 19:43:17 -07:00
parent bd1de1d434
commit e15fb6eac9
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/favorite.rb
View File

@@ -14,13 +14,10 @@ class Favorite < ActiveRecord::Base
def self.add(post, user) def self.add(post, user)
Favorite.transaction do Favorite.transaction do
return if Favorite.for_user(user.id).where(:user_id => user.id, :post_id => post.id).lock("FOR UPDATE NOWAIT").exists? return if Favorite.for_user(user.id).where(:user_id => user.id, :post_id => post.id).exists?
Favorite.create!(:user_id => user.id, :post_id => post.id) Favorite.create!(:user_id => user.id, :post_id => post.id)
changes = "fav_count = fav_count + 1" Post.where(:id => post.id).update_all("fav_count = fav_count + 1")
if user.is_gold? Post.where(:id => post.id).update_all("score = score + 1") if user.is_gold?
changes = "#{changes}, score = score + 1"
end
Post.where(:id => post.id).update_all(changes)
post.append_user_to_fav_string(user.id) post.append_user_to_fav_string(user.id)
User.where(:id => user.id).update_all("favorite_count = favorite_count + 1") User.where(:id => user.id).update_all("favorite_count = favorite_count + 1")
user.favorite_count += 1 user.favorite_count += 1
@@ -31,7 +28,7 @@ class Favorite < ActiveRecord::Base
def self.remove(post, user) def self.remove(post, user)
Favorite.transaction do Favorite.transaction do
return unless Favorite.for_user(user.id).where(:user_id => user.id, :post_id => post.id).lock("FOR UPDATE NOWAIT").exists? return unless Favorite.for_user(user.id).where(:user_id => user.id, :post_id => post.id).exists?
Favorite.destroy_all(:user_id => user.id, :post_id => post.id) Favorite.destroy_all(:user_id => user.id, :post_id => post.id)
Post.where(:id => post.id).update_all("fav_count = fav_count - 1") Post.where(:id => post.id).update_all("fav_count = fav_count - 1")
Post.where(:id => post.id).update_all("Score = score - 1") if user.is_gold? Post.where(:id => post.id).update_all("Score = score - 1") if user.is_gold?