Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream

Conflicts:
- `docker-compose.yml`:
  Conflict because of different repo names. Updated version.
This commit is contained in:
Claire
2025-05-06 16:30:33 +02:00
8 changed files with 56 additions and 9 deletions

View File

@@ -29,7 +29,10 @@ class ActivityPub::Parser::StatusParser
end
def url
url_to_href(@object['url'], 'text/html') if @object['url'].present?
return if @object['url'].blank?
url = url_to_href(@object['url'], 'text/html')
url unless unsupported_uri_scheme?(url)
end
def text