diff options
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 4 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 4 | ||||
| -rw-r--r-- | app/lib/activitypub/adapter.rb | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb index 327def623..21fe556af 100644 --- a/app/lib/activitypub/activity/announce.rb +++ b/app/lib/activitypub/activity/announce.rb @@ -44,9 +44,9 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity def visibility_from_audience if audience_to.include?(ActivityPub::TagManager::COLLECTIONS[:public]) - :public + @account.private? ? :private : :public elsif audience_cc.include?(ActivityPub::TagManager::COLLECTIONS[:public]) - :unlisted + @account.private? ? :private : :unlisted elsif audience_to.include?(@account.followers_url) :private else diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 98bcada7a..3053b1bb3 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -462,9 +462,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity def visibility_from_audience if audience_to.include?(ActivityPub::TagManager::COLLECTIONS[:public]) - :public + @account.private? ? :private : :public elsif audience_cc.include?(ActivityPub::TagManager::COLLECTIONS[:public]) - :unlisted + @account.private? ? :private : :unlisted elsif audience_to.include?(@account.followers_url) :private elsif direct_message == false diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb index 3063f7a4b..6fcf219be 100644 --- a/app/lib/activitypub/adapter.rb +++ b/app/lib/activitypub/adapter.rb @@ -12,7 +12,6 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base show_replies: { 'mp' => 'https://the.monsterpit.net/ns#', 'showReplies' => 'mp:showReplies' }, show_unlisted: { 'mp' => 'https://the.monsterpit.net/ns#', 'showUnlisted' => 'mp:showUnlisted' }, private: { 'mp' => 'https://the.monsterpit.net/ns#', 'private' => 'mp:private' }, - require_auth: { 'mp' => 'https://the.monsterpit.net/ns#', 'requireAuth' => 'mp:requireAuth' }, metadata: { 'mp' => 'https://the.monsterpit.net/ns#', 'metadata' => { '@id' => 'mp:metadata', '@type' => '@id' } }, server_metadata: { 'mp' => 'https://the.monsterpit.net/ns#', 'serverMetadata' => { '@id' => 'mp:serverMetadata', '@type' => '@id' } }, root: { 'mp' => 'https://the.monsterpit.net/ns#', 'root' => { '@id' => 'mp:root', '@type' => '@id' } }, |