fe89554a54
Conflicts: - `app/lib/activitypub/activity/create.rb`: Upstream refactored how `Create` activities are handled and how values are extracted from `Create`d objects. This conflicted with how glitch-soc supported the `directMessage` flag to explicitly distinguish between limited and direct messages. Ported glitch-soc's changes to latest upstream changes. - `app/services/fan_out_on_write_service.rb`: Upstream largely refactored that file and changed some of the logic. This conflicted with glitch-soc's handling of the direct timeline and the options to allow replies and boosts in public feeds. Ported those glitch-soc changes on top of latest upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored to move mention-related ActivityPub deliveries to `ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check to not send local-only toots to remote mentioned users. Took upstream's version, as the check is not needed anymore, since it is performed at the `ActivityPub::DeliveryWorker` call site already. - `app/workers/feed_insert_worker.rb`: Upstream added support for `update` toot events, while glitch-soc had support for an extra timeline support, `direct`. Ported upstream changes and extended them to the `direct` timeline. Additional changes: - `app/lib/activitypub/parser/status_parser.rb`: Added code to handle the `directMessage` flag and take it into account to compute visibility. - `app/lib/feed_manager.rb`: Extended upstream's support of `update` toot events to glitch-soc's `direct` timeline.
83 lines
1.9 KiB
Ruby
83 lines
1.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class FeedInsertWorker
|
|
include Sidekiq::Worker
|
|
|
|
def perform(status_id, id, type = :home, options = {})
|
|
@type = type.to_sym
|
|
@status = Status.find(status_id)
|
|
@options = options.symbolize_keys
|
|
|
|
case @type
|
|
when :home
|
|
@follower = Account.find(id)
|
|
when :list
|
|
@list = List.find(id)
|
|
@follower = @list.account
|
|
when :direct
|
|
@account = Account.find(id)
|
|
end
|
|
|
|
check_and_insert
|
|
rescue ActiveRecord::RecordNotFound
|
|
true
|
|
end
|
|
|
|
private
|
|
|
|
def check_and_insert
|
|
if feed_filtered?
|
|
perform_unpush if update?
|
|
else
|
|
perform_push
|
|
perform_notify if notify?
|
|
end
|
|
end
|
|
|
|
def feed_filtered?
|
|
case @type
|
|
when :home
|
|
FeedManager.instance.filter?(:home, @status, @follower)
|
|
when :list
|
|
FeedManager.instance.filter?(:list, @status, @list)
|
|
when :direct
|
|
FeedManager.instance.filter?(:direct, @status, @account)
|
|
end
|
|
end
|
|
|
|
def notify?
|
|
return false if @type != :home || @status.reblog? || (@status.reply? && @status.in_reply_to_account_id != @status.account_id)
|
|
|
|
Follow.find_by(account: @follower, target_account: @status.account)&.notify?
|
|
end
|
|
|
|
def perform_push
|
|
case @type
|
|
when :home
|
|
FeedManager.instance.push_to_home(@follower, @status, update: update?)
|
|
when :list
|
|
FeedManager.instance.push_to_list(@list, @status, update: update?)
|
|
when :direct
|
|
FeedManager.instance.push_to_direct(@account, @status, update: update?)
|
|
end
|
|
end
|
|
|
|
def perform_unpush
|
|
case @type
|
|
when :home
|
|
FeedManager.instance.unpush_from_home(@follower, @status, update: true)
|
|
when :list
|
|
FeedManager.instance.unpush_from_list(@list, @status, update: true)
|
|
when :direct
|
|
FeedManager.instance.unpush_from_direct(@account, @status, update: true)
|
|
end
|
|
end
|
|
|
|
def perform_notify
|
|
NotifyService.new.call(@follower, :status, @status)
|
|
end
|
|
|
|
def update?
|
|
@options[:update]
|
|
end
|
|
end
|