krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into sabrecat/teams-rebase

Browse Source
This commit is contained in:
SabreCat
2022-05-03 15:53:11 -05:00
parent 588e5dd487 1477326351
commit 565d33f6a7
100 changed files with 2492 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/server/models/user/methods.js
View File

@@ -522,7 +522,11 @@ schema.methods.isAdmin = function isAdmin () {
};
schema.methods.isNewsPoster = function isNewsPoster () {
return Boolean(this.contributor && this.contributor.newsPoster);
return this.hasPermission('news');
};
schema.methods.hasPermission = function hasPermission (permission) {
return Boolean(this.permissions && (this.permissions[permission] || this.permissions.fullAccess));
};
// When converting to json add inbox messages from the Inbox collection