Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove Salmon and PubSubHubbub (#11205)
* Remove Salmon and PubSubHubbub endpoints

* Add error when trying to follow OStatus accounts

* Fix new accounts not being created in ResolveAccountService
  • Loading branch information
Gargron committed Jul 6, 2019
1 parent c07cca4 commit 23aeef5
Show file tree
Hide file tree
Showing 102 changed files with 69 additions and 3,568 deletions.
1 change: 0 additions & 1 deletion app/controllers/activitypub/inboxes_controller.rb
Expand Up @@ -44,7 +44,6 @@ def upgrade_account
ResolveAccountWorker.perform_async(signed_request_account.acct)
end

Pubsubhubbub::UnsubscribeWorker.perform_async(signed_request_account.id) if signed_request_account.subscribed?
DeliveryFailureTracker.track_inverse_success!(signed_request_account)
end

Expand Down
16 changes: 2 additions & 14 deletions app/controllers/admin/accounts_controller.rb
Expand Up @@ -2,8 +2,8 @@

module Admin
class AccountsController < BaseController
before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :remove_header, :enable, :unsilence, :unsuspend, :memorialize, :approve, :reject]
before_action :require_remote_account!, only: [:subscribe, :unsubscribe, :redownload]
before_action :set_account, only: [:show, :redownload, :remove_avatar, :remove_header, :enable, :unsilence, :unsuspend, :memorialize, :approve, :reject]
before_action :require_remote_account!, only: [:redownload]
before_action :require_local_account!, only: [:enable, :memorialize, :approve, :reject]

def index
Expand All @@ -19,18 +19,6 @@ def show
@warnings = @account.targeted_account_warnings.latest.custom
end

def subscribe
authorize @account, :subscribe?
Pubsubhubbub::SubscribeWorker.perform_async(@account.id)
redirect_to admin_account_path(@account.id)
end

def unsubscribe
authorize @account, :unsubscribe?
Pubsubhubbub::UnsubscribeWorker.perform_async(@account.id)
redirect_to admin_account_path(@account.id)
end

def memorialize
authorize @account, :memorialize?
@account.memorialize!
Expand Down
73 changes: 0 additions & 73 deletions app/controllers/api/push_controller.rb

This file was deleted.

37 changes: 0 additions & 37 deletions app/controllers/api/salmon_controller.rb

This file was deleted.

51 changes: 0 additions & 51 deletions app/controllers/api/subscriptions_controller.rb

This file was deleted.

31 changes: 0 additions & 31 deletions app/controllers/api/v1/follows_controller.rb

This file was deleted.

71 changes: 0 additions & 71 deletions app/lib/ostatus/activity/base.rb

This file was deleted.

0 comments on commit 23aeef5

Please sign in to comment.