Add support for editing for published statuses (#16697)
* Add support for editing for published statuses * Fix references to stripped-out code * Various fixes and improvements * Further fixes and improvements * Fix updates being potentially sent to unauthorized recipients * Various fixes and improvements * Fix wrong words in test * Fix notifying accounts that were tagged but were not in the audience * Fix mistake
This commit is contained in:
parent
2d1f082bb6
commit
1060666c58
56 changed files with 1415 additions and 574 deletions
|
@ -6,19 +6,44 @@ class PollExpirationNotifyWorker
|
|||
sidekiq_options lock: :until_executed
|
||||
|
||||
def perform(poll_id)
|
||||
poll = Poll.find(poll_id)
|
||||
@poll = Poll.find(poll_id)
|
||||
|
||||
# Notify poll owner and remote voters
|
||||
if poll.local?
|
||||
ActivityPub::DistributePollUpdateWorker.perform_async(poll.status.id)
|
||||
NotifyService.new.call(poll.account, :poll, poll)
|
||||
end
|
||||
return if does_not_expire?
|
||||
requeue! && return if not_due_yet?
|
||||
|
||||
# Notify local voters
|
||||
poll.votes.includes(:account).group(:account_id).select(:account_id).map(&:account).select(&:local?).each do |account|
|
||||
NotifyService.new.call(account, :poll, poll)
|
||||
end
|
||||
notify_remote_voters_and_owner! if @poll.local?
|
||||
notify_local_voters!
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
true
|
||||
end
|
||||
|
||||
def self.remove_from_scheduled(poll_id)
|
||||
queue = Sidekiq::ScheduledSet.new
|
||||
queue.select { |scheduled| scheduled.klass == name && scheduled.args[0] == poll_id }.map(&:delete)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def does_not_expire?
|
||||
@poll.expires_at.nil?
|
||||
end
|
||||
|
||||
def not_due_yet?
|
||||
@poll.expires_at.present? && !@poll.expired?
|
||||
end
|
||||
|
||||
def requeue!
|
||||
PollExpirationNotifyWorker.perform_at(@poll.expires_at + 5.minutes, @poll.id)
|
||||
end
|
||||
|
||||
def notify_remote_voters_and_owner!
|
||||
ActivityPub::DistributePollUpdateWorker.perform_async(@poll.status.id)
|
||||
NotifyService.new.call(@poll.account, :poll, @poll)
|
||||
end
|
||||
|
||||
def notify_local_voters!
|
||||
@poll.voters.merge(Account.local).find_each do |account|
|
||||
NotifyService.new.call(account, :poll, @poll)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue