[Seeding] Fix system user not being promoted

This commit is contained in:
Earlopain 2021-04-30 23:46:28 +02:00
parent 36130433f1
commit 4b27ebb6f9
No known key found for this signature in database
GPG Key ID: 6CFB948E15246897
5 changed files with 14 additions and 17 deletions

View File

@ -100,7 +100,6 @@ class User < ApplicationRecord
before_create :encrypt_password_on_create
before_update :encrypt_password_on_update
after_save :update_cache
before_create :promote_to_admin_if_first_user
#after_create :notify_sock_puppets
after_create :create_user_status
has_many :feedback, :class_name => "UserFeedback", :dependent => :destroy
@ -304,18 +303,6 @@ class User < ApplicationRecord
UserPromotion.new(self, CurrentUser.user, new_level, options).promote!
end
def promote_to_admin_if_first_user
return if Rails.env.test?
if User.admins.count == 0
self.level = Levels::ADMIN
self.can_approve_posts = true
self.can_upload_free = true
else
self.level = Levels::MEMBER
end
end
def role
level_string.downcase.to_sym
end

View File

@ -58,7 +58,7 @@ module Danbooru
#
# Run `rake db:seed` to create this account if it doesn't already exist in your install.
def system_user
"E621_Bot"
"auto_moderator"
end
def upload_feedback_topic

View File

@ -0,0 +1,9 @@
class SetUserLevelDefault < ActiveRecord::Migration[6.1]
def up
change_column :users, :level, :integer, default: 20
end
def down
change_column :users, :level, :integer, default: 0
end
end

View File

@ -31,7 +31,7 @@ User.find_or_create_by!(name: Danbooru.config.system_user) do |user|
user.password_hash = ""
user.email = "system@e621.net"
user.can_upload_free = true
user.level = User::Levels::ADMIN
user.level = User::Levels::JANITOR
end
unless Rails.env.test?

View File

@ -2558,7 +2558,7 @@ CREATE TABLE public.users (
password_hash character varying NOT NULL,
email character varying,
email_verification_key character varying,
level integer DEFAULT 0 NOT NULL,
level integer DEFAULT 20 NOT NULL,
base_upload_limit integer DEFAULT 10 NOT NULL,
last_logged_in_at timestamp without time zone,
last_forum_read_at timestamp without time zone,
@ -5127,6 +5127,7 @@ INSERT INTO "schema_migrations" (version) VALUES
('20201220190335'),
('20210117173030'),
('20210405040522'),
('20210425020131');
('20210425020131'),
('20210430201028');