bgme/mastodon
1
0
Fork 0
mirror of https://github.com/yingziwu/mastodon.git synced 2026-02-23 18:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix TagFollow records not being correctly handled in account operations (#33063)

Browse source
This commit is contained in:
Claire 2024-11-28 15:32:27 +01:00
parent e26bb6f827
commit fd431c0afb
4 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/concerns/account_interactions.rb
View file

@ -83,6 +83,9 @@ module AccountInteractions
has_many :following, -> { order('follows.id desc') }, through: :active_relationships, source: :target_account
has_many :followers, -> { order('follows.id desc') }, through: :passive_relationships, source: :account
# Hashtag follows
has_many :tag_follows, inverse_of: :account, dependent: :destroy
# Account notes
has_many :account_notes, dependent: :destroy

2
app/models/concerns/account_merging.rb
View file

@ -16,7 +16,7 @@ module AccountMerging
Follow, FollowRequest, Block, Mute,
AccountModerationNote, AccountPin, AccountStat, ListAccount,
PollVote, Mention, AccountDeletionRequest, AccountNote, FollowRecommendationSuppression,
Appeal
Appeal, TagFollow
]
owned_classes.each do |klass|