Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Claire
2024-11-25 11:27:58 +01:00
parent 6cbd217055
commit 6b8ff1cf6e
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

@@ -88,6 +88,9 @@ module Account::Interactions
has_many :remote_severed_relationships, foreign_key: 'remote_account_id', inverse_of: :remote_account
end
# 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 Account::Merging
Follow, FollowRequest, Block, Mute,
AccountModerationNote, AccountPin, AccountStat, ListAccount,
PollVote, Mention, AccountDeletionRequest, AccountNote, FollowRecommendationSuppression,
Appeal
Appeal, TagFollow
]
owned_classes.each do |klass|