Skip to content
Permalink
Browse files

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 23aeef52cc4540b4514e9f3b935b21f0530a3746
Showing with 69 additions and 3,568 deletions.
  1. +0 −1 app/controllers/activitypub/inboxes_controller.rb
  2. +2 −14 app/controllers/admin/accounts_controller.rb
  3. +0 −73 app/controllers/api/push_controller.rb
  4. +0 −37 app/controllers/api/salmon_controller.rb
  5. +0 −51 app/controllers/api/subscriptions_controller.rb
  6. +0 −31 app/controllers/api/v1/follows_controller.rb
  7. +0 −71 app/lib/ostatus/activity/base.rb
  8. +0 −219 app/lib/ostatus/activity/creation.rb
  9. +0 −16 app/lib/ostatus/activity/deletion.rb
  10. +0 −20 app/lib/ostatus/activity/general.rb
  11. +0 −23 app/lib/ostatus/activity/post.rb
  12. +0 −11 app/lib/ostatus/activity/remote.rb
  13. +0 −26 app/lib/ostatus/activity/share.rb
  14. +0 −2 app/lib/ostatus/atom_serializer.rb
  15. +1 −2 app/models/account.rb
  16. +0 −1 app/serializers/webfinger_serializer.rb
  17. +2 −10 app/services/authorize_follow_service.rb
  18. +1 −33 app/services/batched_remove_status_service.rb
  19. +0 −1 app/services/block_domain_service.rb
  20. +2 −10 app/services/block_service.rb
  21. +0 −23 app/services/concerns/author_extractor.rb
  22. +0 −7 app/services/concerns/stream_entry_renderer.rb
  23. +0 −6 app/services/favourite_service.rb
  24. +0 −28 app/services/fetch_remote_account_service.rb
  25. +0 −28 app/services/fetch_remote_status_service.rb
  26. +3 −21 app/services/follow_service.rb
  27. +0 −1 app/services/post_status_service.rb
  28. +0 −31 app/services/process_feed_service.rb
  29. +0 −151 app/services/process_interaction_service.rb
  30. +0 −7 app/services/process_mentions_service.rb
  31. +0 −53 app/services/pubsubhubbub/subscribe_service.rb
  32. +0 −31 app/services/pubsubhubbub/unsubscribe_service.rb
  33. +0 −4 app/services/reblog_service.rb
  34. +2 −10 app/services/reject_follow_service.rb
  35. +0 −13 app/services/remove_status_service.rb
  36. +7 −124 app/services/resolve_account_service.rb
  37. +0 −39 app/services/send_interaction_service.rb
  38. +0 −58 app/services/subscribe_service.rb
  39. +2 −10 app/services/unblock_service.rb
  40. +2 −11 app/services/unfavourite_service.rb
  41. +3 −13 app/services/unfollow_service.rb
  42. +0 −36 app/services/unsubscribe_service.rb
  43. +0 −66 app/services/update_remote_profile_service.rb
  44. +0 −26 app/services/verify_salmon_service.rb
  45. +0 −1 app/views/accounts/show.html.haml
  46. +0 −18 app/views/admin/subscriptions/_subscription.html.haml
  47. +0 −16 app/views/admin/subscriptions/index.html.haml
  48. +0 −5 app/views/well_known/webfinger/show.xml.ruby
  49. +1 −23 app/workers/after_remote_follow_request_worker.rb
  50. +1 −23 app/workers/after_remote_follow_worker.rb
  51. +1 −3 app/workers/notification_worker.rb
  52. +1 −3 app/workers/processing_worker.rb
  53. +1 −74 app/workers/pubsubhubbub/confirmation_worker.rb
  54. +1 −73 app/workers/pubsubhubbub/delivery_worker.rb
  55. +1 −24 app/workers/pubsubhubbub/distribution_worker.rb
  56. +1 −14 app/workers/pubsubhubbub/raw_distribution_worker.rb
  57. +1 −26 app/workers/pubsubhubbub/subscribe_worker.rb
  58. +1 −7 app/workers/pubsubhubbub/unsubscribe_worker.rb
  59. +1 −5 app/workers/remote_profile_update_worker.rb
  60. +1 −5 app/workers/salmon_worker.rb
  61. +1 −9 app/workers/scheduler/subscriptions_scheduler.rb
  62. +0 −7 config/locales/en.yml
  63. +0 −1 config/navigation.rb
  64. +0 −14 config/routes.rb
  65. +0 −3 config/sidekiq.yml
  66. +0 −38 spec/controllers/admin/accounts_controller_spec.rb
  67. +0 −32 spec/controllers/admin/subscriptions_controller_spec.rb
  68. +0 −59 spec/controllers/api/push_controller_spec.rb
  69. +0 −65 spec/controllers/api/salmon_controller_spec.rb
  70. +0 −68 spec/controllers/api/subscriptions_controller_spec.rb
  71. +0 −51 spec/controllers/api/v1/follows_controller_spec.rb
  72. +1 −1 spec/fixtures/requests/webfinger.txt
  73. +0 −145 spec/lib/ostatus/atom_serializer_spec.rb
  74. +0 −7 spec/services/authorize_follow_service_spec.rb
  75. +0 −13 spec/services/batched_remove_status_service_spec.rb
  76. +0 −7 spec/services/block_service_spec.rb
  77. +0 −7 spec/services/favourite_service_spec.rb
  78. +0 −40 spec/services/fetch_remote_account_service_spec.rb
  79. +0 −68 spec/services/follow_service_spec.rb
  80. +20 −10 spec/services/import_service_spec.rb
  81. +0 −2 spec/services/post_status_service_spec.rb
  82. +0 −252 spec/services/process_feed_service_spec.rb
  83. +0 −151 spec/services/process_interaction_service_spec.rb
  84. +0 −4 spec/services/process_mentions_service_spec.rb
  85. +0 −71 spec/services/pubsubhubbub/subscribe_service_spec.rb
  86. +0 −46 spec/services/pubsubhubbub/unsubscribe_service_spec.rb
  87. +0 −4 spec/services/reblog_service_spec.rb
  88. +0 −7 spec/services/reject_follow_service_spec.rb
  89. +0 −13 spec/services/remove_status_service_spec.rb
  90. +8 −80 spec/services/resolve_account_service_spec.rb
  91. +0 −7 spec/services/send_interaction_service_spec.rb
  92. +0 −43 spec/services/subscribe_service_spec.rb
  93. +0 −7 spec/services/unblock_service_spec.rb
  94. +0 −7 spec/services/unfollow_service_spec.rb
  95. +0 −37 spec/services/unsubscribe_service_spec.rb
  96. +0 −84 spec/services/update_remote_profile_service_spec.rb
  97. +0 −59 spec/workers/after_remote_follow_request_worker_spec.rb
  98. +0 −59 spec/workers/after_remote_follow_worker_spec.rb
  99. +0 −88 spec/workers/pubsubhubbub/confirmation_worker_spec.rb
  100. +0 −68 spec/workers/pubsubhubbub/delivery_worker_spec.rb
  101. +0 −46 spec/workers/pubsubhubbub/distribution_worker_spec.rb
  102. +0 −19 spec/workers/scheduler/subscriptions_scheduler_spec.rb
@@ -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

@@ -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
@@ -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!

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 23aeef5

Please sign in to comment.
You can’t perform that action at this time.