forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Automatically switch from open to approved registrations in absence o…
…f moderators (mastodon#29318)
- Loading branch information
1 parent
8b7bd16
commit 9c00975
Showing
6 changed files
with
109 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<%= raw t('admin_mailer.auto_close_registrations.body', instance: @instance) %> | ||
|
||
<%= raw t('application_mailer.view')%> <%= admin_settings_registrations_url %> |
33 changes: 33 additions & 0 deletions
33
app/workers/scheduler/auto_close_registrations_scheduler.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
# frozen_string_literal: true | ||
|
||
class Scheduler::AutoCloseRegistrationsScheduler | ||
include Sidekiq::Worker | ||
include Redisable | ||
|
||
sidekiq_options retry: 0 | ||
|
||
# Automatically switch away from open registrations if no | ||
# moderator had any activity in that period of time | ||
OPEN_REGISTRATIONS_MODERATOR_THRESHOLD = 1.week + UserTrackingConcern::SIGN_IN_UPDATE_FREQUENCY | ||
|
||
def perform | ||
return if Rails.configuration.x.email_domains_whitelist.present? || ENV['DISABLE_AUTOMATIC_SWITCHING_TO_APPROVED_REGISTRATIONS'] == 'true' | ||
return unless Setting.registrations_mode == 'open' | ||
|
||
switch_to_approval_mode! unless active_moderators? | ||
end | ||
|
||
private | ||
|
||
def active_moderators? | ||
User.those_who_can(:manage_reports).exists?(current_sign_in_at: OPEN_REGISTRATIONS_MODERATOR_THRESHOLD.ago...) | ||
end | ||
|
||
def switch_to_approval_mode! | ||
Setting.registrations_mode = 'approved' | ||
|
||
User.those_who_can(:view_devops).includes(:account).find_each do |user| | ||
AdminMailer.with(recipient: user.account).auto_close_registrations.deliver_later | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
# frozen_string_literal: true | ||
|
||
require 'rails_helper' | ||
|
||
describe Scheduler::AutoCloseRegistrationsScheduler do | ||
subject { described_class.new } | ||
|
||
describe '#perform' do | ||
let(:moderator_activity_date) { Time.now.utc } | ||
|
||
before do | ||
Fabricate(:user, role: UserRole.find_by(name: 'Owner'), current_sign_in_at: 10.years.ago) | ||
Fabricate(:user, role: UserRole.find_by(name: 'Moderator'), current_sign_in_at: moderator_activity_date) | ||
end | ||
|
||
context 'when registrations are open' do | ||
before do | ||
Setting.registrations_mode = 'open' | ||
end | ||
|
||
context 'when a moderator has logged in recently' do | ||
let(:moderator_activity_date) { Time.now.utc } | ||
|
||
it 'does not change registrations mode' do | ||
expect { subject.perform }.to_not change(Setting, :registrations_mode) | ||
end | ||
end | ||
|
||
context 'when a moderator has not recently signed in' do | ||
let(:moderator_activity_date) { 1.year.ago } | ||
|
||
it 'changes registrations mode from open to approved' do | ||
expect { subject.perform }.to change(Setting, :registrations_mode).from('open').to('approved') | ||
end | ||
end | ||
end | ||
|
||
context 'when registrations are closed' do | ||
before do | ||
Setting.registrations_mode = 'none' | ||
end | ||
|
||
context 'when a moderator has logged in recently' do | ||
let(:moderator_activity_date) { Time.now.utc } | ||
|
||
it 'does not change registrations mode' do | ||
expect { subject.perform }.to_not change(Setting, :registrations_mode) | ||
end | ||
end | ||
|
||
context 'when a moderator has not recently signed in' do | ||
let(:moderator_activity_date) { 1.year.ago } | ||
|
||
it 'does not change registrations mode' do | ||
expect { subject.perform }.to_not change(Setting, :registrations_mode) | ||
end | ||
end | ||
end | ||
end | ||
end |