techhub/mastodon
2
0
Fork 0
Code Activity

Fix permalink redirects continuing to work for suspended accounts (#36453)

Browse Source
This commit is contained in:
Eugen Rochko
2025-10-13 17:18:01 +02:00
committed by GitHub
parent 254fff93ca
commit 33f739da44
2 changed files with 71 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/permalink_redirector.rb
View File

@@ -12,15 +12,15 @@ class PermalinkRedirector
@object ||= begin
if at_username_status_request? || statuses_status_request?
status = Status.find_by(id: second_segment)
status if status&.distributable? && !status&.local?
status if status&.distributable? && !status&.local? && !status&.account&.suspended?
elsif at_username_request?
username, domain = first_segment.delete_prefix('@').split('@')
domain = nil if TagManager.instance.local_domain?(domain)
account = Account.find_remote(username, domain)
account unless account&.local?
account if !account&.local? && !account&.suspended?
elsif accounts_request? && record_integer_id_request?
account = Account.find_by(id: second_segment)
account unless account&.local?
account if !account&.local? && !account&.suspended?
end
end
end