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

move uploader upload count increment from upload to post

Browse Source
This commit is contained in:
Albert Yi
2018-06-20 10:43:48 -07:00
parent 3f6e069eed
commit 62218fdb51
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/logical/upload_service.rb
View File

@@ -304,11 +304,7 @@ class UploadService
end end
def start!(uploader_id) def start!(uploader_id)
if source.present? if Utils.is_downloadable?(source)
if !Utils.is_downloadable?(source)
return
end
CurrentUser.as_system do CurrentUser.as_system do
if Post.tag_match("source:#{source}").exists? if Post.tag_match("source:#{source}").exists?
return return

1
app/models/post.rb
View File

@@ -40,6 +40,7 @@ class Post < ApplicationRecord
after_commit :remove_iqdb_async, :on => :destroy after_commit :remove_iqdb_async, :on => :destroy
after_commit :update_iqdb_async, :on => :create after_commit :update_iqdb_async, :on => :create
after_commit :notify_pubsub after_commit :notify_pubsub
after_create {|rec| rec.uploader.increment!(:post_upload_count)}
belongs_to :updater, :class_name => "User", optional: true # this is handled in versions belongs_to :updater, :class_name => "User", optional: true # this is handled in versions
belongs_to :approver, class_name: "User", optional: true belongs_to :approver, class_name: "User", optional: true

1
app/models/upload.rb
View File

@@ -63,7 +63,6 @@ class Upload < ApplicationRecord
validates :file_ext, format: { with: /jpg|gif|png|swf|webm|mp4|zip/ }, allow_nil: true validates :file_ext, format: { with: /jpg|gif|png|swf|webm|mp4|zip/ }, allow_nil: true
validates_with Validator validates_with Validator
serialize :context, JSON serialize :context, JSON
after_create {|rec| rec.uploader.increment!(:post_upload_count)}
def initialize_attributes def initialize_attributes
self.uploader_id = CurrentUser.user.id self.uploader_id = CurrentUser.user.id