diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-20 22:41:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 22:41:20 +0100 |
| commit | 45087c1092143e95dfcc85b6c9abc5c6c0a0a5c2 (patch) | |
| tree | e4be53cb0b2e7f876bea6c61d4fe64d7586ae63d /app/models/concerns/account_interactions.rb | |
| parent | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (diff) | |
| parent | dc0cc5a57d224b4c53bc58dad919b727055bd9a3 (diff) | |
Merge pull request #2117 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns/account_interactions.rb')
| -rw-r--r-- | app/models/concerns/account_interactions.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb index de8bf338f..325619774 100644 --- a/app/models/concerns/account_interactions.rb +++ b/app/models/concerns/account_interactions.rb @@ -151,9 +151,7 @@ module AccountInteractions remove_potential_friendship(other_account) # When toggling a mute between hiding and allowing notifications, the mute will already exist, so the find_or_create_by! call will return the existing Mute without updating the hide_notifications attribute. Therefore, we check that hide_notifications? is what we want and set it if it isn't. - if mute.hide_notifications? != notifications - mute.update!(hide_notifications: notifications) - end + mute.update!(hide_notifications: notifications) if mute.hide_notifications? != notifications mute end |