techhub/mastodon
2
0
Fork 0
Code Activity

Autofix Rubocop remaining Layout rules (#23679)

Browse Source
This commit is contained in:
Nick Schonning
2023-02-20 00:58:28 -05:00
committed by GitHub
parent d2dcb6c45a
commit 717683d1c3
117 changed files with 265 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/validators/follow_limit_validator.rb
View File

@@ -6,6 +6,7 @@ class FollowLimitValidator < ActiveModel::Validator
def validate(follow)
return if follow.account.nil? || !follow.account.local?
follow.errors.add(:base, I18n.t('users.follow_limit_reached', limit: self.class.limit_for_account(follow.account))) if limit_reached?(follow.account)
end

2
app/validators/unreserved_username_validator.rb
View File

@@ -13,12 +13,14 @@ class UnreservedUsernameValidator < ActiveModel::Validator
def pam_controlled?
return false unless Devise.pam_authentication && Devise.pam_controlled_service
Rpam2.account(Devise.pam_controlled_service, @username).present?
end
def reserved_username?
return true if pam_controlled?
return false unless Setting.reserved_usernames
Setting.reserved_usernames.include?(@username.downcase)
end
end