tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit from fork

Browse Source
This commit is contained in:
Claire 2026-06-03 11:57:50 +02:00 committed by GitHub
parent f0359af358
commit c2daca655f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/context_helper.rb
View File

@ -25,7 +25,7 @@ module ContextHelper
memorial: { 'toot' => 'http://joinmastodon.org/ns#', 'memorial' => 'toot:memorial' }, memorial: { 'toot' => 'http://joinmastodon.org/ns#', 'memorial' => 'toot:memorial' },
voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' }, voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' }, suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
attribution_domains: { 'toot' => 'http://joinmastodon.org/ns#', 'attributionDomains' => { '@id' => 'toot:attributionDomains', '@type' => '@id' } }, attribution_domains: { 'toot' => 'http://joinmastodon.org/ns#', 'attributionDomains' => { '@id' => 'toot:attributionDomains', '@container' => '@set' } },
profile_settings: { profile_settings: {
'toot' => 'http://joinmastodon.org/ns#', 'toot' => 'http://joinmastodon.org/ns#',
'showFeatured' => 'toot:showFeatured', 'showFeatured' => 'toot:showFeatured',

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

@ -150,7 +150,7 @@ class ActivityPub::ProcessAccountService < BaseService
@account.show_featured = @json['showFeatured'] if @json.key?('showFeatured') @account.show_featured = @json['showFeatured'] if @json.key?('showFeatured')
@account.show_media = @json['showMedia'] if @json.key?('showMedia') @account.show_media = @json['showMedia'] if @json.key?('showMedia')
@account.show_media_replies = @json['showRepliesInMedia'] if @json.key?('showRepliesInMedia') @account.show_media_replies = @json['showRepliesInMedia'] if @json.key?('showRepliesInMedia')
@account.attribution_domains = as_array(@json['attributionDomains'] || []).take(Account::ATTRIBUTION_DOMAINS_HARD_LIMIT).map { |item| value_or_id(item) } @account.attribution_domains = as_array(@json['attributionDomains'] || []).take(Account::ATTRIBUTION_DOMAINS_HARD_LIMIT).filter { |item| item.is_a?(String) }
end end
def set_fetchable_key! def set_fetchable_key!