From 18e1de6a16f36c6cdcfa5e95c60c8873773529d2 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 9 Jun 2018 13:33:04 +0200 Subject: Migrate old web push subscriptions to ensure deliveries (#7764) --- .../20180609104432_migrate_web_push_subscriptions2.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 db/migrate/20180609104432_migrate_web_push_subscriptions2.rb (limited to 'db/migrate') diff --git a/db/migrate/20180609104432_migrate_web_push_subscriptions2.rb b/db/migrate/20180609104432_migrate_web_push_subscriptions2.rb new file mode 100644 index 000000000..510db64d2 --- /dev/null +++ b/db/migrate/20180609104432_migrate_web_push_subscriptions2.rb @@ -0,0 +1,17 @@ +class MigrateWebPushSubscriptions2 < ActiveRecord::Migration[5.2] + disable_ddl_transaction! + + def up + Web::PushSubscription.where(user_id: nil).select(:id).includes(:session_activation).find_each do |subscription| + if subscription.session_activation.nil? + subscription.delete + else + subscription.update_attribute(:user_id, subscription.session_activation.user_id) + end + end + end + + def down + # Nothing to do + end +end -- cgit From 6310dd233ac2581b989228a15bc3d1cd7eaafe9a Mon Sep 17 00:00:00 2001 From: nightpool Date: Sat, 9 Jun 2018 18:38:17 -0400 Subject: Migration to cleanup blocked users that are still following (#7773) * Migration to cleanup blocked users that are still following * use follow directly, commit schema --- ...0180608213548_reject_following_blocked_users.rb | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 db/migrate/20180608213548_reject_following_blocked_users.rb (limited to 'db/migrate') diff --git a/db/migrate/20180608213548_reject_following_blocked_users.rb b/db/migrate/20180608213548_reject_following_blocked_users.rb new file mode 100644 index 000000000..302db6b68 --- /dev/null +++ b/db/migrate/20180608213548_reject_following_blocked_users.rb @@ -0,0 +1,40 @@ +class RejectFollowingBlockedUsers < ActiveRecord::Migration[5.2] + disable_ddl_transaction! + + def up + blocked_follows = Follow.find_by_sql(<<-SQL) + select f.* from follows f + inner join blocks b on + f.account_id = b.target_account_id and + f.target_account_id = b.account_id + SQL + + domain_blocked_follows = Follow.find_by_sql(<<-SQL) + select f.* from follows f + inner join accounts following on f.account_id = following.id + inner join account_domain_blocks b on + lower(b.domain) = lower(following.domain) and + f.target_account_id = b.account_id + SQL + + follows = (blocked_follows + domain_blocked_follows).uniq + say "Destroying #{follows.size} blocked follow relationships..." + + follows.each do |follow| + blocked_account = follow.account + followed_acccount = follow.target_account + + next follow.destroy! if blocked_account.local? + + reject_follow_json = Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(follow, serializer: ActivityPub::RejectFollowSerializer, adapter: ActivityPub::Adapter).as_json).sign!(followed_acccount)) + + ActivityPub::DeliveryWorker.perform_async(reject_follow_json, followed_acccount, blocked_account.inbox_url) + + follow.destroy! + end + end + + def down + raise ActiveRecord::IrreversibleMigration + end +end -- cgit