vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix wrong person being notified after nested reblog call, fix favourites leaking private toots in Atom feeds

Browse source
This commit is contained in:
Eugen Rochko 2016-12-28 13:21:12 +01:00
parent e2c2fefc36
commit 8b94d283fb
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/favourite.rb
View file

@ -29,6 +29,10 @@ class Favourite < ApplicationRecord
thread thread
end end
def hidden?
status.private_visibility?
end
before_validation do before_validation do
self.status = status.reblog if status.reblog? self.status = status.reblog if status.reblog?
end end

4
app/services/reblog_service.rb
View file

@ -14,9 +14,9 @@ class ReblogService < BaseService
Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id) Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
if reblogged_status.local? if reblogged_status.local?
NotifyService.new.call(reblogged_status.account, reblog) NotifyService.new.call(reblog.reblog.account, reblog)
else else
NotificationWorker.perform_async(reblog.stream_entry.id, reblogged_status.account_id) NotificationWorker.perform_async(reblog.stream_entry.id, reblog.reblog.account_id)
end end
reblog reblog