yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: getPreference fallback

Browse Source
This commit is contained in:
Tom Moor
2022-11-08 21:30:14 -05:00
parent 369ac487b1
commit e7af0ce6de
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/models/Team.ts
View File

@@ -195,12 +195,11 @@ class Team extends ParanoidModel {
* Returns the passed preference value * Returns the passed preference value
* *
* @param preference The user preference to retrieve * @param preference The user preference to retrieve
* @param fallback An optional fallback value, defaults to false.
* @returns The preference value if set, else undefined * @returns The preference value if set, else undefined
*/ */
public getPreference = (preference: TeamPreference) => { public getPreference = (preference: TeamPreference, fallback = false) => {
return !!this.preferences && this.preferences[preference] return this.preferences?.[preference] ?? fallback;
? this.preferences[preference]
: undefined;
}; };
provisionFirstCollection = async (userId: string) => { provisionFirstCollection = async (userId: string) => {

7
server/models/User.ts
View File

@@ -324,12 +324,11 @@ class User extends ParanoidModel {
* Returns the passed preference value * Returns the passed preference value
* *
* @param preference The user preference to retrieve * @param preference The user preference to retrieve
* @param fallback An optional fallback value, defaults to false.
* @returns The preference value if set, else undefined * @returns The preference value if set, else undefined
*/ */
public getPreference = (preference: UserPreference) => { public getPreference = (preference: UserPreference, fallback = false) => {
return !!this.preferences && this.preferences[preference] return this.preferences?.[preference] ?? fallback;
? this.preferences[preference]
: undefined;
}; };
collectionIds = async (options = {}) => { collectionIds = async (options = {}) => {