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

fixes #3777

Browse Source
This commit is contained in:
Albert Yi
2018-07-20 11:41:53 -07:00
parent 6943c70a32
commit a06a387725
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/logical/current_user.rb
View File

@@ -16,7 +16,7 @@ class CurrentUser
def self.as(user_or_id, &block) def self.as(user_or_id, &block)
if user_or_id.is_a?(String) || user_or_id.is_a?(Integer) if user_or_id.is_a?(String) || user_or_id.is_a?(Integer)
user = User.find(user_or_id) user = ::User.find(user_or_id)
else else
user = user_or_id user = user_or_id
end end
@@ -26,16 +26,16 @@ class CurrentUser
def self.as_admin(&block) def self.as_admin(&block)
if block_given? if block_given?
scoped(User.admins.first, "127.0.0.1", &block) scoped(::User.admins.first, "127.0.0.1", &block)
else else
self.user = User.admins.first self.user = ::User.admins.first
self.ip_addr = "127.0.0.1" self.ip_addr = "127.0.0.1"
end end
end end
def self.as_system(&block) def self.as_system(&block)
if block_given? if block_given?
scoped(User.system, "127.0.0.1", &block) scoped(::User.system, "127.0.0.1", &block)
else else
self.user = User.system self.user = User.system
self.ip_addr = "127.0.0.1" self.ip_addr = "127.0.0.1"

2
app/logical/upload_service/controller_helper.rb
View File

@@ -15,7 +15,7 @@ class UploadService
if post.nil? if post.nil?
# this gets called from UploadsController#new so we need # this gets called from UploadsController#new so we need
# to preprocess async # to preprocess async
Preprocessor.new(source: url).delay(priority: -1, queue: "default").delayed_start(CurrentUser.id) Preprocessor.new(source: url, referer_url: ref).delay(priority: -1, queue: "default").delayed_start(CurrentUser.id)
end end
begin begin