gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-06 01:41:08 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Prefer delegated nil-wrapping methods to safe navigation (#35541)

Browse Source
This commit is contained in:
Matt Jankowski 2025-07-28 04:03:23 -04:00 committed by GitHub
parent b464b87c2b
commit 5d69157e62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/admin/accounts/_counters.html.haml
View File

@ -30,9 +30,9 @@
= t('admin.accounts.suspended') = t('admin.accounts.suspended')
- elsif account.silenced? - elsif account.silenced?
= t('admin.accounts.silenced') = t('admin.accounts.silenced')
- elsif account.local? && account.user&.disabled? - elsif account.local? && account.user_disabled?
= t('admin.accounts.disabled') = t('admin.accounts.disabled')
- elsif account.local? && !account.user&.confirmed? - elsif account.local? && !account.user_confirmed?
= t('admin.accounts.confirming') = t('admin.accounts.confirming')
- elsif account.local? && !account.user_approved? - elsif account.local? && !account.user_approved?
= t('admin.accounts.pending') = t('admin.accounts.pending')

2
app/views/admin/accounts/_local_account.html.haml
View File

@ -34,7 +34,7 @@
%tr %tr
%th= t('admin.accounts.email_status') %th= t('admin.accounts.email_status')
%td %td
- if account.user&.confirmed? - if account.user_confirmed?
= t('admin.accounts.confirmed') = t('admin.accounts.confirmed')
- else - else
= t('admin.accounts.confirming') = t('admin.accounts.confirming')

2
app/views/admin/reports/index.html.haml
View File

@ -42,7 +42,7 @@
%span.red= t('admin.accounts.suspended') %span.red= t('admin.accounts.suspended')
- elsif target_account.silenced? - elsif target_account.silenced?
%span.red= t('admin.accounts.silenced') %span.red= t('admin.accounts.silenced')
- elsif target_account.user&.disabled? - elsif target_account.user_disabled?
%span.red= t('admin.accounts.disabled') %span.red= t('admin.accounts.disabled')
- else - else
%span.neutral= t('admin.accounts.no_limits_imposed') %span.neutral= t('admin.accounts.no_limits_imposed')

4
app/workers/move_worker.rb
View File

@ -81,7 +81,7 @@ class MoveWorker
def copy_account_notes! def copy_account_notes!
AccountNote.where(target_account: @source_account).find_each do |note| AccountNote.where(target_account: @source_account).find_each do |note|
text = I18n.with_locale(note.account.user&.locale.presence || I18n.default_locale) do text = I18n.with_locale(note.account.user_locale.presence || I18n.default_locale) do
I18n.t('move_handler.copy_account_note_text', acct: @source_account.acct) I18n.t('move_handler.copy_account_note_text', acct: @source_account.acct)
end end
@ -124,7 +124,7 @@ class MoveWorker
def add_account_note_if_needed!(account, id) def add_account_note_if_needed!(account, id)
unless AccountNote.exists?(account: account, target_account: @target_account) unless AccountNote.exists?(account: account, target_account: @target_account)
text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do text = I18n.with_locale(account.user_locale.presence || I18n.default_locale) do
I18n.t(id, acct: @source_account.acct) I18n.t(id, acct: @source_account.acct)
end end
AccountNote.create!(account: account, target_account: @target_account, comment: text) AccountNote.create!(account: account, target_account: @target_account, comment: text)

2
app/workers/publish_scheduled_status_worker.rb
View File

@ -9,7 +9,7 @@ class PublishScheduledStatusWorker
scheduled_status = ScheduledStatus.find(scheduled_status_id) scheduled_status = ScheduledStatus.find(scheduled_status_id)
scheduled_status.destroy! scheduled_status.destroy!
return true if scheduled_status.account.user.disabled? return true if scheduled_status.account.user_disabled?
PostStatusService.new.call( PostStatusService.new.call(
scheduled_status.account, scheduled_status.account,