Merge remote-tracking branch 'parent/main' into upstream-20240913

2024-09-13 10:31:48 +09:00 · 2024-09-13 10:31:48 +09:00 · fc9d27ff91
commit fc9d27ff91
parent 3277819b62 202077517c
392 changed files with 3757 additions and 3233 deletions
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@ -50,6 +50,7 @@ module ContextHelper
      'cipherText' => 'toot:cipherText',
    },
    suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
+    attribution_domains: { 'toot' => 'http://joinmastodon.org/ns#', 'attributionDomains' => { '@id' => 'toot:attributionDomains', '@type' => '@id' } },
  }.freeze

  def full_context