From 520e9cc765b9b8263270f9e311b8beefd6b322f9 Mon Sep 17 00:00:00 2001 From: Robert R George Date: Wed, 29 Mar 2023 00:58:27 -0700 Subject: [PATCH] Wrap db:setup with Chewy.strategy(:mastodon) (#24302) --- db/seeds.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 0bfb5d0db5..695b5f1e78 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,11 +1,13 @@ -Doorkeeper::Application.create!(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow push') +Chewy.strategy(:mastodon) do + Doorkeeper::Application.create!(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow push') -domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain -account = Account.find_or_initialize_by(id: -99, actor_type: 'Application', locked: true, username: domain) -account.save! + domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain + account = Account.find_or_initialize_by(id: -99, actor_type: 'Application', locked: true, username: domain) + account.save! -if Rails.env.development? - admin = Account.where(username: 'admin').first_or_initialize(username: 'admin') - admin.save(validate: false) - User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, admin: true, account: admin, agreement: true, approved: true).save! + if Rails.env.development? + admin = Account.where(username: 'admin').first_or_initialize(username: 'admin') + admin.save(validate: false) + User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, admin: true, account: admin, agreement: true, approved: true).save! + end end