diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2018-02-02 18:22:15 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-02 10:22:15 +0100 |
| commit | 0be9a1e3212b0b9918abe1536e51efe2fefa49f1 (patch) | |
| tree | e647ba7cf1c01cd82f1e1a8cc54075801dc3f3f2 /app | |
| parent | 8e4cf6282b8a3bcb100506b27ecaed3e88832681 (diff) | |
Accept ActivityPub announce from the author of the original note (#6236)
Diffstat (limited to 'app')
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 5 |
1 files 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 |