2 files changed, 8 insertions, 2 deletions
diff --git a/app/services/activitypub/fetch_featured_collection_service.rb b/app/services/activitypub/fetch_featured_collection_service.rb
index a77c03bed..0a20f5edc 100644
--- a/app/services/activitypub/fetch_featured_collection_service.rb
+++ b/app/services/activitypub/fetch_featured_collection_service.rb
@@ -44,7 +44,7 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
     StatusPin.where(account: @account, status_id: to_remove).delete_all unless to_remove.empty?
 
     to_add.each do |status_id|
-      StatusPin.create!(account: @account, status_id: status_id)
+      StatusPin.create(account: @account, status_id: status_id)
     end
   end
 
diff --git a/app/services/activitypub/process_collection_items_service.rb b/app/services/activitypub/process_collection_items_service.rb
index 936593166..9c30d81e9 100644
--- a/app/services/activitypub/process_collection_items_service.rb
+++ b/app/services/activitypub/process_collection_items_service.rb
@@ -5,12 +5,18 @@ class ActivityPub::ProcessCollectionItemsService < BaseService
     RedisLock.acquire(lock_options(account_id)) do |lock|
       if lock.acquired?
         CollectionItem.unprocessed.where(account_id: account_id).find_each do |item|
+          # Avoid failing servers holding up the rest of the queue.
+          next if item.retries.positive? && rand(3).positive?
+
           begin
             FetchRemoteStatusService.new.call(item.uri, nil, on_behalf_of)
           rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotFound
             nil
+          rescue HTTP::TimeoutError
+            item.increment!(:retries)
           end
-          item.update!(processed: true)
+
+          item.update!(processed: true) if item.retries.zero? || item.retries > 4
         end
       end
     end