about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-02 23:13:35 +0200
committerGitHub <noreply@github.com>2017-09-02 23:13:35 +0200
commit37fdddd927614d550aa47f142e3adc32cf70810b (patch)
treeb215b3df5beb93b192789223a907f71c3f301d8b /app/lib
parent6ec1aa372dca28c476749666d02e1807eb05c42e (diff)
Rename "locked" to "manuallyApprovesFollowers" in ActivityPub (#4779)
See: <https://www.w3.org/wiki/Activity_Streams_extensions#as:manuallyApprovesFollowers>
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/activitypub/adapter.rb15
1 files changed, 7 insertions, 8 deletions
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index fe4dddd38..6ed66a239 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -7,14 +7,13 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
       'https://w3id.org/security/v1',
 
       {
-        'locked'    => 'as:locked',
-        'sensitive' => 'as:sensitive',
-        'Hashtag'   => 'as:Hashtag',
-
-        'ostatus'          => 'http://ostatus.org#',
-        'atomUri'          => 'ostatus:atomUri',
-        'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri',
-        'conversation'     => 'ostatus:conversation',
+        'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
+        'sensitive'                 => 'as:sensitive',
+        'Hashtag'                   => 'as:Hashtag',
+        'ostatus'                   => 'http://ostatus.org#',
+        'atomUri'                   => 'ostatus:atomUri',
+        'inReplyToAtomUri'          => 'ostatus:inReplyToAtomUri',
+        'conversation'              => 'ostatus:conversation',
       },
     ],
   }.freeze