techhub/mastodon
2
0
Fork 0
Code Activity

Fix moderator account being exposed in account moderation notification (#30082)

Browse Source
This commit is contained in:
Claire
2024-04-26 14:42:06 +02:00
committed by GitHub
parent 5201882a23
commit e845594878
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/notification.rb
View File

@@ -184,13 +184,13 @@ class Notification < ApplicationRecord
return unless new_record?
case activity_type
when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report', 'AccountWarning'
when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report'
self.from_account_id = activity&.account_id
when 'Mention'
self.from_account_id = activity&.status&.account_id
when 'Account'
self.from_account_id = activity&.id
when 'AccountRelationshipSeveranceEvent'
when 'AccountRelationshipSeveranceEvent', 'AccountWarning'
# These do not really have an originating account, but this is mandatory
# in the data model, and the recipient's account will by definition
# always exist