From b21e1d219cfbdfbc77973773856f69ce8057994d Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 21 Mar 2020 20:44:14 -0500 Subject: [PATCH] users: remove as_admin and as_current methods. --- app/logical/current_user.rb | 9 --------- app/models/user.rb | 4 ---- db/populate.rb | 3 ++- test/test_helper.rb | 4 ---- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/app/logical/current_user.rb b/app/logical/current_user.rb index 0f439b3fb..6069a2bc3 100644 --- a/app/logical/current_user.rb +++ b/app/logical/current_user.rb @@ -24,15 +24,6 @@ class CurrentUser scoped(user, &block) end - def self.as_admin(&block) - if block_given? - scoped(::User.admins.first, "127.0.0.1", &block) - else - self.user = ::User.admins.first - self.ip_addr = "127.0.0.1" - end - end - def self.as_system(&block) if block_given? scoped(::User.system, "127.0.0.1", &block) diff --git a/app/models/user.rb b/app/models/user.rb index 4765caf7e..684a9815a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -680,10 +680,6 @@ class User < ApplicationRecord include CountMethods extend SearchMethods - def as_current(&block) - CurrentUser.as(self, &block) - end - def hide_favorites? !CurrentUser.is_admin? && enable_private_favorites? && CurrentUser.user.id != id end diff --git a/db/populate.rb b/db/populate.rb index 12dd40213..44abd6bd0 100644 --- a/db/populate.rb +++ b/db/populate.rb @@ -91,7 +91,8 @@ else user = User.find_by_name("albert") end -CurrentUser.as_admin +CurrentUser.user = User.admins.first +CurrentUser.ip_addr = "127.0.0.1" if Upload.count == 0 ENV["SKIP_CLOUDFLARE_CHECK"] = "true" diff --git a/test/test_helper.rb b/test/test_helper.rb index 6b974bc9d..bdc746fbf 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -33,10 +33,6 @@ module TestHelpers CurrentUser.as(@user, &block) end - def as_admin(&block) - CurrentUser.as_admin(&block) - end - def load_pixiv_tokens! if ENV["DANBOORU_PERSIST_PIXIV_SESSION"] && Cache.get("pixiv-papi-access-token") Cache.put("pixiv-papi-access-token", Thread.current[:pixiv_papi_access_token])