chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 11 Wiki Activity

Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053)

Browse source
This commit is contained in:
Claire 2023-11-30 16:43:26 +01:00 • committed by GitHub
commit 963354978a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 57 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/services/follow_service.rb
View file

@ -50,7 +50,7 @@ class FollowService < BaseService
end
def following_not_possible?
@target_account.nil? || @target_account.id == @source_account.id || @target_account.suspended?
@target_account.nil? || @target_account.id == @source_account.id || @target_account.unavailable?
end
def following_not_allowed?

2
app/services/notify_service.rb
View file

@ -108,7 +108,7 @@ class NotifyService < BaseService
end
def blocked?
blocked = @recipient.suspended?
blocked = @recipient.unavailable?
blocked ||= from_self? && @notification.type != :poll
return blocked if message? && from_staff?

2
app/services/process_mentions_service.rb
View file

@ -51,7 +51,7 @@ class ProcessMentionsService < BaseService
# If after resolving it still isn't found or isn't the right
# protocol, then give up
next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended?
next match if mention_undeliverable?(mentioned_account) || mentioned_account&.unavailable?
mention = @previous_mentions.find { |x| x.account_id == mentioned_account.id }
mention ||= @current_mentions.find { |x| x.account_id == mentioned_account.id }

2
app/services/report_service.rb
View file

@ -12,7 +12,7 @@ class ReportService < BaseService
@rule_ids = options.delete(:rule_ids).presence
@options = options
raise ActiveRecord::RecordNotFound if @target_account.suspended?
raise ActiveRecord::RecordNotFound if @target_account.unavailable?
create_report!
notify_staff!