Add: #348 新規登録の上限人数 (#527)

* Add: #348 新規登録の上限人数

* Fix test

* Fix test

* Wip

* Fix test

* Add invite support

* Wip

* Fix test

* Fix test

* Fix test
This commit is contained in:
KMY(雪あすか) 2024-02-12 22:05:32 +09:00 committed by GitHub
parent d7cc6b788c
commit e317edecb8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 362 additions and 6 deletions

View file

@ -55,6 +55,7 @@ class User < ApplicationRecord
include LanguagesHelper
include Redisable
include RegistrationLimitationHelper
include User::HasSettings
include User::LdapAuthenticable
include User::Omniauthable
@ -192,6 +193,8 @@ class User < ApplicationRecord
end
def confirm
raise Mastodon::ValidationError, I18n.t('devise.registrations.sign_up_failed_because_reach_limit') if !invited? && reach_registrations_limit?
wrap_email_confirmation do
super
end
@ -482,6 +485,7 @@ class User < ApplicationRecord
ActivityTracker.record('activity:logins', id)
UserMailer.welcome(self).deliver_later
TriggerWebhookWorker.perform_async('account.approved', 'Account', account_id)
reset_registration_limit_caches!
end
def prepare_returning_user!