mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-25 17:51:36 +01:00
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.
159 lines
5.1 KiB
Ruby
159 lines
5.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class RemoveStatusService < BaseService
|
|
include Redisable
|
|
include Payloadable
|
|
|
|
# Delete a status
|
|
# @param [Status] status
|
|
# @param [Hash] options
|
|
# @option [Boolean] :redraft
|
|
# @option [Boolean] :immediate
|
|
# @option [Boolean] :preserve
|
|
# @option [Boolean] :original_removed
|
|
def call(status, **options)
|
|
@payload = Oj.dump(event: :delete, payload: status.id.to_s)
|
|
@status = status
|
|
@account = status.account
|
|
@options = options
|
|
|
|
@status.discard
|
|
|
|
RedisLock.acquire(lock_options) do |lock|
|
|
if lock.acquired?
|
|
remove_from_self if @account.local?
|
|
remove_from_followers
|
|
remove_from_lists
|
|
|
|
# There is no reason to send out Undo activities when the
|
|
# cause is that the original object has been removed, since
|
|
# original object being removed implicitly removes reblogs
|
|
# of it. The Delete activity of the original is forwarded
|
|
# separately.
|
|
remove_from_remote_reach if @account.local? && !@options[:original_removed]
|
|
|
|
# Since reblogs don't mention anyone, don't get reblogged,
|
|
# favourited and don't contain their own media attachments
|
|
# or hashtags, this can be skipped
|
|
unless @status.reblog?
|
|
remove_from_mentions
|
|
remove_reblogs
|
|
remove_from_hashtags
|
|
remove_from_public
|
|
remove_from_media if @status.media_attachments.any?
|
|
remove_from_direct if status.direct_visibility?
|
|
remove_media
|
|
end
|
|
|
|
@status.destroy! if permanently?
|
|
else
|
|
raise Mastodon::RaceConditionError
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def remove_from_self
|
|
FeedManager.instance.unpush_from_home(@account, @status)
|
|
FeedManager.instance.unpush_from_direct(@account, @status) if @status.direct_visibility?
|
|
end
|
|
|
|
def remove_from_followers
|
|
@account.followers_for_local_distribution.reorder(nil).find_each do |follower|
|
|
FeedManager.instance.unpush_from_home(follower, @status)
|
|
end
|
|
end
|
|
|
|
def remove_from_lists
|
|
@account.lists_for_local_distribution.select(:id, :account_id).reorder(nil).find_each do |list|
|
|
FeedManager.instance.unpush_from_list(list, @status)
|
|
end
|
|
end
|
|
|
|
def remove_from_mentions
|
|
# For limited visibility statuses, the mentions that determine
|
|
# who receives them in their home feed are a subset of followers
|
|
# and therefore the delete is already handled by sending it to all
|
|
# followers. Here we send a delete to actively mentioned accounts
|
|
# that may not follow the account
|
|
|
|
@status.active_mentions.find_each do |mention|
|
|
redis.publish("timeline:#{mention.account_id}", @payload)
|
|
end
|
|
end
|
|
|
|
def remove_from_remote_reach
|
|
# Followers, relays, people who got mentioned in the status,
|
|
# or who reblogged it from someone else might not follow
|
|
# the author and wouldn't normally receive the delete
|
|
# notification - so here, we explicitly send it to them
|
|
|
|
status_reach_finder = StatusReachFinder.new(@status, unsafe: true)
|
|
|
|
ActivityPub::DeliveryWorker.push_bulk(status_reach_finder.inboxes) do |inbox_url|
|
|
[signed_activity_json, @account.id, inbox_url]
|
|
end
|
|
end
|
|
|
|
def signed_activity_json
|
|
@signed_activity_json ||= Oj.dump(serialize_payload(@status, @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer, signer: @account))
|
|
end
|
|
|
|
def remove_reblogs
|
|
# We delete reblogs of the status before the original status,
|
|
# because once original status is gone, reblogs will disappear
|
|
# without us being able to do all the fancy stuff
|
|
|
|
@status.reblogs.includes(:account).reorder(nil).find_each do |reblog|
|
|
RemoveStatusService.new.call(reblog, original_removed: true)
|
|
end
|
|
end
|
|
|
|
def remove_from_hashtags
|
|
@account.featured_tags.where(tag_id: @status.tags.map(&:id)).each do |featured_tag|
|
|
featured_tag.decrement(@status.id)
|
|
end
|
|
|
|
return unless @status.public_visibility?
|
|
|
|
@status.tags.map(&:name).each do |hashtag|
|
|
redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}", @payload)
|
|
redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}:local", @payload) if @status.local?
|
|
end
|
|
end
|
|
|
|
def remove_from_public
|
|
return unless @status.public_visibility?
|
|
|
|
redis.publish('timeline:public', @payload)
|
|
redis.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', @payload)
|
|
end
|
|
|
|
def remove_from_media
|
|
return unless @status.public_visibility?
|
|
|
|
redis.publish('timeline:public:media', @payload)
|
|
redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', @payload)
|
|
end
|
|
|
|
def remove_from_direct
|
|
@status.active_mentions.each do |mention|
|
|
FeedManager.instance.unpush_from_direct(mention.account, @status) if mention.account.local?
|
|
end
|
|
end
|
|
|
|
def remove_media
|
|
return if @options[:redraft] || !permanently?
|
|
|
|
@status.media_attachments.destroy_all
|
|
end
|
|
|
|
def permanently?
|
|
@options[:immediate] || !(@options[:preserve] || @status.reported?)
|
|
end
|
|
|
|
def lock_options
|
|
{ redis: Redis.current, key: "distribute:#{@status.id}", autorelease: 5.minutes.seconds }
|
|
end
|
|
end
|