tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add customizable user roles (#18641)

Browse Source 
* Add customizable user roles

* Various fixes and improvements

* Add migration for old settings and fix tootctl role management
This commit is contained in:
Eugen Rochko
2022-07-05 02:41:40 +02:00
committed by GitHub
parent 1b4054256f
commit 44b2ee3485
187 changed files with 1945 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/notify_service.rb
View File

@ -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?