Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-28 17:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change media description length limit for remote media attachments from 1500 to 10000 characters (#37921)

Browse Source
This commit is contained in:
Claire
2026-03-23 11:32:41 +01:00
committed by GitHub
parent 506d0afa53
commit d48470a1fc
6 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FEDERATION.md
View File

@@ -68,6 +68,6 @@ The following table summarizes those limits.
| Account `attributionDomains` | 256 | List will be truncated |
| Account aliases (actor `alsoKnownAs`) | 256 | List will be truncated |
| Custom emoji shortcode (`Emoji` `name`) | 2048 | Emoji will be rejected |
| Media and avatar/header descriptions (`name`/`summary`) | 1500 | Description will be truncated |
| Media and avatar/header descriptions (`name`/`summary`) | 10000 | Description will be truncated |
| Collection name (`FeaturedCollection` `name`) | 256 | Name will be truncated |
| Collection description (`FeaturedCollection` `summary`) | 2048 | Description will be truncated |

2
app/lib/activitypub/parser/media_attachment_parser.rb
View File

@@ -30,7 +30,7 @@ class ActivityPub::Parser::MediaAttachmentParser
def description
str = @json['summary'].presence || @json['name'].presence
str = str.strip[0...MediaAttachment::MAX_DESCRIPTION_LENGTH] if str.present?
str = str.strip[0...MediaAttachment::MAX_DESCRIPTION_HARD_LENGTH_LIMIT] if str.present?
str
end

2
app/models/concerns/account/avatar.rb
View File

@@ -25,7 +25,7 @@ module Account::Avatar
validates_attachment_size :avatar, less_than: AVATAR_LIMIT
remotable_attachment :avatar, AVATAR_LIMIT, suppress_errors: false
validates :avatar_description, length: { maximum: MediaAttachment::MAX_DESCRIPTION_LENGTH }
validates :avatar_description, length: { maximum: MediaAttachment::MAX_DESCRIPTION_LENGTH }, if: -> { local? && will_save_change_to_avatar_description? }
end
def avatar_original_url

2
app/models/concerns/account/header.rb
View File

@@ -26,7 +26,7 @@ module Account::Header
validates_attachment_size :header, less_than: HEADER_LIMIT
remotable_attachment :header, HEADER_LIMIT, suppress_errors: false
validates :header_description, length: { maximum: MediaAttachment::MAX_DESCRIPTION_LENGTH }
validates :header_description, length: { maximum: MediaAttachment::MAX_DESCRIPTION_LENGTH }, if: -> { local? && will_save_change_to_header_description? }
end
def header_original_url

1
app/models/media_attachment.rb
View File

@@ -39,6 +39,7 @@ class MediaAttachment < ApplicationRecord
enum :processing, { queued: 0, in_progress: 1, complete: 2, failed: 3 }, prefix: true
MAX_DESCRIPTION_LENGTH = 1_500
MAX_DESCRIPTION_HARD_LENGTH_LIMIT = 10_000
IMAGE_LIMIT = 16.megabytes
VIDEO_LIMIT = 99.megabytes

2
app/services/activitypub/process_account_service.rb
View File

@@ -238,7 +238,7 @@ class ActivityPub::ProcessAccountService < BaseService
url = first_of_value(value['url'])
url = url['href'] if url.is_a?(Hash)
description = value['summary'].presence || value['name'].presence
description = description.strip[0...MediaAttachment::MAX_DESCRIPTION_LENGTH] if description.present?
description = description.strip[0...MediaAttachment::MAX_DESCRIPTION_HARD_LENGTH_LIMIT] if description.present?
else
url = value
end