Skip to content

Commit 5a781ee

Browse files
Gargronhiyuki2578
authored andcommitted
Remove WebSub subscriptions (mastodon#11303)
1 parent fbe23b9 commit 5a781ee

14 files changed

Lines changed: 14 additions & 203 deletions

app/models/concerns/account_associations.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ module AccountAssociations
3030
has_many :media_attachments, dependent: :destroy
3131
has_many :polls, dependent: :destroy
3232

33-
# PuSH subscriptions
34-
has_many :subscriptions, dependent: :destroy
35-
3633
# Report relationships
3734
has_many :reports, dependent: :destroy, inverse_of: :account
3835
has_many :targeted_reports, class_name: 'Report', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account

app/models/subscription.rb

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

app/policies/subscription_policy.rb

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

app/services/suspend_account_service.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class SuspendAccountService < BaseService
2424
report_notes
2525
scheduled_statuses
2626
status_pins
27-
subscriptions
2827
).freeze
2928

3029
ASSOCIATIONS_ON_DESTROY = %w(

app/workers/scheduler/subscriptions_cleanup_scheduler.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ class Scheduler::SubscriptionsCleanupScheduler
55

66
sidekiq_options unique: :until_executed, retry: 0
77

8-
def perform
9-
Subscription.expired.in_batches.delete_all
10-
end
8+
def perform; end
119
end

config/sidekiq.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
user_cleanup_scheduler:
2222
cron: '<%= Random.rand(0..59) %> <%= Random.rand(4..6) %> * * *'
2323
class: Scheduler::UserCleanupScheduler
24-
subscriptions_cleanup_scheduler:
25-
cron: '<%= Random.rand(0..59) %> <%= Random.rand(1..3) %> * * 0'
26-
class: Scheduler::SubscriptionsCleanupScheduler
2724
ip_cleanup_scheduler:
2825
cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
2926
class: Scheduler::IpCleanupScheduler
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# frozen_string_literal: true
2+
3+
class DropSubscriptions < ActiveRecord::Migration[5.2]
4+
def up
5+
drop_table :subscriptions
6+
end
7+
8+
def down
9+
raise ActiveRecord::IrreversibleMigration
10+
end
11+
end

db/schema.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -649,19 +649,6 @@
649649
t.index ["tag_id", "status_id"], name: "index_statuses_tags_on_tag_id_and_status_id", unique: true
650650
end
651651

652-
create_table "subscriptions", force: :cascade do |t|
653-
t.string "callback_url", default: "", null: false
654-
t.string "secret"
655-
t.datetime "expires_at"
656-
t.boolean "confirmed", default: false, null: false
657-
t.datetime "created_at", null: false
658-
t.datetime "updated_at", null: false
659-
t.datetime "last_successful_delivery_at"
660-
t.string "domain"
661-
t.bigint "account_id", null: false
662-
t.index ["account_id", "callback_url"], name: "index_subscriptions_on_account_id_and_callback_url", unique: true
663-
end
664-
665652
create_table "tags", force: :cascade do |t|
666653
t.string "name", default: "", null: false
667654
t.datetime "created_at", null: false
@@ -822,7 +809,6 @@
822809
add_foreign_key "statuses", "statuses", column: "reblog_of_id", on_delete: :cascade
823810
add_foreign_key "statuses_tags", "statuses", on_delete: :cascade
824811
add_foreign_key "statuses_tags", "tags", name: "fk_3081861e21", on_delete: :cascade
825-
add_foreign_key "subscriptions", "accounts", name: "fk_9847d1cbb5", on_delete: :cascade
826812
add_foreign_key "tombstones", "accounts", on_delete: :cascade
827813
add_foreign_key "user_invite_requests", "users", on_delete: :cascade
828814
add_foreign_key "users", "accounts", name: "fk_50500f500d", on_delete: :cascade

spec/fabricators/subscription_fabricator.rb

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

spec/models/subscription_spec.rb

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

0 commit comments

Comments
 (0)