Skip to content
Snippets Groups Projects
Unverified Commit 778562c2 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Ensure SynchronizeFeaturedCollectionWorker is unique and clean up (#7043)

* Ensure SynchronizeFeaturedCollectionWorker is unique and clean up

Fix #7041

* Fix code style issue
parent 9e45b051
No related branches found
No related tags found
No related merge requests found
......@@ -22,13 +22,15 @@ class ActivityPub::ProcessAccountService < BaseService
create_account if @account.nil?
update_account
process_tags(@account)
process_tags
end
end
return if @account.nil?
after_protocol_change! if protocol_changed?
after_key_change! if key_changed?
check_featured_collection! if @account&.featured_collection_url&.present?
check_featured_collection! if @account.featured_collection_url.present?
@account
rescue Oj::ParseError
......@@ -189,17 +191,18 @@ class ActivityPub::ProcessAccountService < BaseService
{ redis: Redis.current, key: "process_account:#{@uri}" }
end
def process_tags(account)
def process_tags
return if @json['tag'].blank?
as_array(@json['tag']).each do |tag|
case tag['type']
when 'Emoji'
process_emoji tag, account
process_emoji tag
end
end
end
def process_emoji(tag, _account)
def process_emoji(tag)
return if skip_download?
return if tag['name'].blank? || tag['icon'].blank? || tag['icon']['url'].blank?
......
......@@ -3,7 +3,7 @@
class ActivityPub::SynchronizeFeaturedCollectionWorker
include Sidekiq::Worker
sidekiq_options queue: 'pull'
sidekiq_options queue: 'pull', unique: :until_executed
def perform(account_id)
ActivityPub::FetchFeaturedCollectionService.new.call(Account.find(account_id))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment