From 0be9a1e3212b0b9918abe1536e51efe2fefa49f1 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Fri, 2 Feb 2018 18:22:15 +0900
Subject: [PATCH] Accept ActivityPub announce from the author of the original
note (#6236)
---
app/lib/activitypub/activity/announce.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index abf2b9b80..c8a358195 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -15,7 +15,8 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
account: @account,
reblog: original_status,
uri: @json['id'],
- created_at: @options[:override_timestamps] ? nil : @json['published']
+ created_at: @options[:override_timestamps] ? nil : @json['published'],
+ visibility: original_status.visibility
)
distribute(status)
@@ -35,6 +36,6 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
end
def announceable?(status)
- status.public_visibility? || status.unlisted_visibility?
+ status.account_id == @account.id || status.public_visibility? || status.unlisted_visibility?
end
end