From f7a0b022d4167ea5c62741351a9582c0931f962d Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Fri, 29 May 2020 13:01:35 -0400
Subject: [PATCH] Update activity pub jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Update:
- activity pub jobs to retry 0 and dead: true

• Remove:
- ActivityPub DeliveryWorker on account suspension
- Inbox, outbox, collections routes
---
 app/controllers/activitypub/inboxes_controller.rb    |  6 +++---
 app/services/suspend_account_service.rb              | 12 ++++++------
 app/workers/activitypub/delivery_worker.rb           |  2 +-
 app/workers/activitypub/distribution_worker.rb       |  2 +-
 .../activitypub/low_priority_delivery_worker.rb      |  2 +-
 app/workers/activitypub/processing_worker.rb         |  2 +-
 config/routes.rb                                     |  8 ++++----
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index a0b7532c..57d04540 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -10,8 +10,8 @@ class ActivityPub::InboxesController < Api::BaseController
     if unknown_deleted_account?
       head 202
     elsif signed_request_account
-      upgrade_account
-      process_payload
+      # upgrade_account
+      # process_payload
       head 202
     else
       render plain: signature_verification_failure_reason, status: 401
@@ -49,6 +49,6 @@ class ActivityPub::InboxesController < Api::BaseController
   end
 
   def process_payload
-    ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body, @account&.id)
+    # ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body, @account&.id)
   end
 end
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 412873f8..f7a375ae 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -108,13 +108,13 @@ class SuspendAccountService < BaseService
   end
 
   def distribute_delete_actor!
-    ActivityPub::DeliveryWorker.push_bulk(delivery_inboxes) do |inbox_url|
-      [delete_actor_json, @account.id, inbox_url]
-    end
+    # ActivityPub::DeliveryWorker.push_bulk(delivery_inboxes) do |inbox_url|
+    #   [delete_actor_json, @account.id, inbox_url]
+    # end
 
-    ActivityPub::LowPriorityDeliveryWorker.push_bulk(low_priority_delivery_inboxes) do |inbox_url|
-      [delete_actor_json, @account.id, inbox_url]
-    end
+    # ActivityPub::LowPriorityDeliveryWorker.push_bulk(low_priority_delivery_inboxes) do |inbox_url|
+    #   [delete_actor_json, @account.id, inbox_url]
+    # end
   end
 
   def delete_actor_json
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 249302ec..7e7accf4 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -6,7 +6,7 @@ class ActivityPub::DeliveryWorker
   STOPLIGHT_FAILURE_THRESHOLD = 10
   STOPLIGHT_COOLDOWN = 60
 
-  sidekiq_options queue: 'push', retry: 3, dead: false
+  sidekiq_options queue: 'push', retry: 0, dead: true
 
   HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze
 
diff --git a/app/workers/activitypub/distribution_worker.rb b/app/workers/activitypub/distribution_worker.rb
index d83f0170..144817ec 100644
--- a/app/workers/activitypub/distribution_worker.rb
+++ b/app/workers/activitypub/distribution_worker.rb
@@ -3,7 +3,7 @@
 class ActivityPub::DistributionWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'push'
+  sidekiq_options queue: 'push', retry: 0, dead: true
 
   def perform(status_id)
     @status  = Status.find(status_id)
diff --git a/app/workers/activitypub/low_priority_delivery_worker.rb b/app/workers/activitypub/low_priority_delivery_worker.rb
index 27899fe7..b62b36d2 100644
--- a/app/workers/activitypub/low_priority_delivery_worker.rb
+++ b/app/workers/activitypub/low_priority_delivery_worker.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ActivityPub::LowPriorityDeliveryWorker < ActivityPub::DeliveryWorker
-  sidekiq_options queue: 'pull', retry: 3, dead: false
+  sidekiq_options queue: 'pull', retry: 0, dead: true
 end
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb
index 4dbc1277..811218cd 100644
--- a/app/workers/activitypub/processing_worker.rb
+++ b/app/workers/activitypub/processing_worker.rb
@@ -3,7 +3,7 @@
 class ActivityPub::ProcessingWorker
   include Sidekiq::Worker
 
-  sidekiq_options backtrace: true, retry: 3
+  sidekiq_options backtrace: true, retry: 0, dead: true
 
   def perform(account_id, body, delivered_to_account_id = nil)
     ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true)
diff --git a/config/routes.rb b/config/routes.rb
index 24c4d2bb..5162d13a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,12 +73,12 @@ Rails.application.routes.draw do
     resource :follow, only: [:create], controller: :account_follow
     resource :unfollow, only: [:create], controller: :account_unfollow
 
-    resource :outbox, only: [:show], module: :activitypub
-    resource :inbox, only: [:create], module: :activitypub
-    resources :collections, only: [:show], module: :activitypub
+    # resource :outbox, only: [:show], module: :activitypub
+    # resource :inbox, only: [:create], module: :activitypub
+    # resources :collections, only: [:show], module: :activitypub
   end
 
-  resource :inbox, only: [:create], module: :activitypub
+  # resource :inbox, only: [:create], module: :activitypub
 
   get  '/interact/:id', to: 'remote_interaction#new', as: :remote_interaction
   post '/interact/:id', to: 'remote_interaction#create'