Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases 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
parent 35deaaf90b
commit 963354978a
25 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/account_statuses_filter.rb
View File

@@ -32,7 +32,7 @@ class AccountStatusesFilter
private
def initial_scope
return Status.none if suspended?
return Status.none if account.unavailable?
if anonymous?
account.statuses.where(visibility: %i(public unlisted))
@@ -95,10 +95,6 @@ class AccountStatusesFilter
end
end
def suspended?
account.suspended?
end
def anonymous?
current_account.nil?
end

2
app/lib/activitypub/activity/move.rb
View File

@@ -9,7 +9,7 @@ class ActivityPub::Activity::Move < ActivityPub::Activity
target_account = ActivityPub::FetchRemoteAccountService.new.call(target_uri)
if target_account.nil? || target_account.suspended? || !target_account.also_known_as.include?(origin_account.uri)
if target_account.nil? || target_account.unavailable? || !target_account.also_known_as.include?(origin_account.uri)
unmark_as_processing!
return
end