Skip to content

Commit 7bc9033

Browse files
Gargronhiyuki2578
authored andcommitted
Remove Salmon and PubSubHubbub (mastodon#11205)
* Remove Salmon and PubSubHubbub endpoints * Add error when trying to follow OStatus accounts * Fix new accounts not being created in ResolveAccountService
1 parent 51ca0b4 commit 7bc9033

102 files changed

Lines changed: 69 additions & 3568 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/controllers/activitypub/inboxes_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ def upgrade_account
4444
ResolveAccountWorker.perform_async(signed_request_account.acct)
4545
end
4646

47-
Pubsubhubbub::UnsubscribeWorker.perform_async(signed_request_account.id) if signed_request_account.subscribed?
4847
DeliveryFailureTracker.track_inverse_success!(signed_request_account)
4948
end
5049

app/controllers/admin/accounts_controller.rb

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
module Admin
44
class AccountsController < BaseController
5-
before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :remove_header, :enable, :unsilence, :unsuspend, :memorialize, :approve, :reject]
6-
before_action :require_remote_account!, only: [:subscribe, :unsubscribe, :redownload]
5+
before_action :set_account, only: [:show, :redownload, :remove_avatar, :remove_header, :enable, :unsilence, :unsuspend, :memorialize, :approve, :reject]
6+
before_action :require_remote_account!, only: [:redownload]
77
before_action :require_local_account!, only: [:enable, :memorialize, :approve, :reject]
88

99
def index
@@ -19,18 +19,6 @@ def show
1919
@warnings = @account.targeted_account_warnings.latest.custom
2020
end
2121

22-
def subscribe
23-
authorize @account, :subscribe?
24-
Pubsubhubbub::SubscribeWorker.perform_async(@account.id)
25-
redirect_to admin_account_path(@account.id)
26-
end
27-
28-
def unsubscribe
29-
authorize @account, :unsubscribe?
30-
Pubsubhubbub::UnsubscribeWorker.perform_async(@account.id)
31-
redirect_to admin_account_path(@account.id)
32-
end
33-
3422
def memorialize
3523
authorize @account, :memorialize?
3624
@account.memorialize!

app/controllers/api/push_controller.rb

Lines changed: 0 additions & 73 deletions
This file was deleted.

app/controllers/api/salmon_controller.rb

Lines changed: 0 additions & 37 deletions
This file was deleted.

app/controllers/api/subscriptions_controller.rb

Lines changed: 0 additions & 51 deletions
This file was deleted.

app/controllers/api/v1/follows_controller.rb

Lines changed: 0 additions & 31 deletions
This file was deleted.

app/lib/ostatus/activity/base.rb

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)