From 51e154f5e87968d6bb115e053689767ab33e80cd Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 14 Mar 2019 05:28:30 +0100
Subject: Admission-based registrations mode (#10250)
Fix #6856
Fix #6951
---
app/helpers/admin/filter_helper.rb | 2 +-
app/helpers/application_helper.rb | 18 +++++++++++++++++-
app/helpers/home_helper.rb | 10 ++++++++++
3 files changed, 28 insertions(+), 2 deletions(-)
(limited to 'app/helpers')
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 275b5f2fe..8f78bf5f8 100644
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Admin::FilterHelper
- ACCOUNT_FILTERS = %i(local remote by_domain active silenced suspended username display_name email ip staff).freeze
+ ACCOUNT_FILTERS = %i(local remote by_domain active pending silenced suspended username display_name email ip staff).freeze
REPORT_FILTERS = %i(resolved account_id target_account_id).freeze
INVITE_FILTER = %i(available expired).freeze
CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5097a0953..b42b1bbdf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -20,7 +20,23 @@ module ApplicationHelper
end
def open_registrations?
- Setting.open_registrations
+ Setting.registrations_mode == 'open'
+ end
+
+ def approved_registrations?
+ Setting.registrations_mode == 'approved'
+ end
+
+ def closed_registrations?
+ Setting.registrations_mode == 'none'
+ end
+
+ def available_sign_up_path
+ if closed_registrations?
+ 'https://joinmastodon.org/#getting-started'
+ else
+ new_user_registration_path
+ end
end
def open_deletion?
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
index 1f648649f..df60b7dd7 100644
--- a/app/helpers/home_helper.rb
+++ b/app/helpers/home_helper.rb
@@ -64,4 +64,14 @@ module HomeHelper
content_tag(:div, &block)
end
end
+
+ def sign_up_message
+ if closed_registrations?
+ t('auth.registration_closed', instance: site_hostname)
+ elsif open_registrations?
+ t('auth.register')
+ elsif approved_registrations?
+ t('auth.apply_for_account')
+ end
+ end
end
--
cgit