From 95cd62b8d1a01e76f9d5f477c2730eb3919a6904 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 11 Nov 2024 11:38:39 -0500 Subject: [PATCH] Ignore previous old ones --- app/lib/feed_manager.rb | 2 +- db/migrate/20240731194619_create_taggings.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index e315166aa6..edd1162f4f 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -196,7 +196,7 @@ class FeedManager .where.not(account: into_account.following) .tagged_with_none(TagFollow.where(account: into_account).pluck(:tag_id)) - scope.select(:id, :reblog_of_id).reorder(nil).find_each do |status| + scope.select(:id, :reblog_of_id).reorder(nil).find_each do |status| remove_from_feed(:home, into_account.id, status, aggregate_reblogs: into_account.user&.aggregates_reblogs?) end end diff --git a/db/migrate/20240731194619_create_taggings.rb b/db/migrate/20240731194619_create_taggings.rb index c7b8b73712..1557ea1d31 100644 --- a/db/migrate/20240731194619_create_taggings.rb +++ b/db/migrate/20240731194619_create_taggings.rb @@ -34,13 +34,13 @@ class CreateTaggings < ActiveRecord::Migration[7.1] end def restore_join_tables - create_table :statuses_tags, primary_key: [:tag_id, :status_id], force: :cascade do |t| + create_table :statuses_tags, primary_key: [:tag_id, :status_id], force: :cascade do |t| # rubocop:disable Rails/CreateTableWithTimestamps t.bigint :status_id, null: false t.bigint :tag_id, null: false t.index :status_id end - create_table :accounts_tags, primary_key: [:tag_id, :account_id], force: :cascade do |t| + create_table :accounts_tags, primary_key: [:tag_id, :account_id], force: :cascade do |t| # rubocop:disable Rails/CreateTableWithTimestamps t.bigint :account_id, null: false t.bigint :tag_id, null: false t.index [:account_id, :tag_id]