Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream

2025-12-14 00:08:46 +00:00 · 2024-09-12 12:09:21 +02:00
parent 7cfa8bb782 0c3c06f7cc
commit 10e2b87774
101 changed files with 465 additions and 219 deletions
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@@ -42,6 +42,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