diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 23:10:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 23:10:31 +0200 |
| commit | ab1488a6ad93f572e1d184cb9653f76fd408474f (patch) | |
| tree | f1dd126f4745eb99243f390169fb957a72f5acc6 /app/services/notify_service.rb | |
| parent | 325ebb76b19bd20e1b76d8bc26c11cab02f6571c (diff) | |
| parent | 6c0d73a675d62f676b005c06593fd69e9a7bc0e5 (diff) | |
Merge pull request #1804 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/notify_service.rb')
| -rw-r--r-- | app/services/notify_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index d30b33876..c7454fc60 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -76,7 +76,7 @@ class NotifyService < BaseService end def from_staff? - @notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user.staff? + @notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user_role&.overrides?(@recipient.user_role) end def optional_non_following_and_direct? |