fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-25 15:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore previous old ones

Browse source
This commit is contained in:
Matt Jankowski 2024-11-11 11:38:39 -05:00
parent 7e68a1c8bb
commit 95cd62b8d1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/feed_manager.rb
View file

@ -196,7 +196,7 @@ class FeedManager
.where.not(account: into_account.following) .where.not(account: into_account.following)
.tagged_with_none(TagFollow.where(account: into_account).pluck(:tag_id)) .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?) remove_from_feed(:home, into_account.id, status, aggregate_reblogs: into_account.user&.aggregates_reblogs?)
end end
end end

4
db/migrate/20240731194619_create_taggings.rb
View file

@ -34,13 +34,13 @@ class CreateTaggings < ActiveRecord::Migration[7.1]
end end
def restore_join_tables 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 :status_id, null: false
t.bigint :tag_id, null: false t.bigint :tag_id, null: false
t.index :status_id t.index :status_id
end 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 :account_id, null: false
t.bigint :tag_id, null: false t.bigint :tag_id, null: false
t.index [:account_id, :tag_id] t.index [:account_id, :tag_id]