hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept ActivityPub announce from the author of the original note (#6236)

signup-info-prompt
Akihiko Odaki 2018-02-02 18:22:15 +09:00 committed by Eugen Rochko
parent 8e4cf6282b
commit 0be9a1e321
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/activitypub/activity/announce.rb
View File

@ -15,7 +15,8 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
account: @account, account: @account,
reblog: original_status, reblog: original_status,
uri: @json['id'], 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) distribute(status)
@ -35,6 +36,6 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
end end
def announceable?(status) def announceable?(status)
status.public_visibility? || status.unlisted_visibility? status.account_id == @account.id || status.public_visibility? || status.unlisted_visibility?
end end
end end