matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let isStaff accept an undefined value

Browse Source
This commit is contained in:
Alex Gleason
2020-04-21 14:00:31 -05:00
parent 6ad116c0f9
commit cafa014018
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/gabsocial/utils/__tests__/accounts-test.js
View File

@@ -54,4 +54,11 @@ describe('isStaff', () => {
expect(isStaff(mod)).toBe(true); expect(isStaff(mod)).toBe(true);
}); });
}); });
describe('with undefined', () => {
const account = undefined;
it('returns false', () => {
expect(isStaff(account)).toBe(false);
});
});
}); });

4
app/gabsocial/utils/accounts.js
View File

@@ -1,3 +1,5 @@
import { Map as ImmutableMap } from 'immutable';
export const getDomain = account => { export const getDomain = account => {
let re = /https?:\/\/(.*?)\//i; let re = /https?:\/\/(.*?)\//i;
return re.exec(account.get('url'))[1]; return re.exec(account.get('url'))[1];
@@ -15,7 +17,7 @@ export const acctFull = account => {
return [user, domain].join('@'); return [user, domain].join('@');
}; };
export const isStaff = account => { export const isStaff = (account = ImmutableMap()) => {
return ['is_admin', 'is_moderator'].some(key => ( return ['is_admin', 'is_moderator'].some(key => (
account.getIn(['pleroma', key]) === true account.getIn(['pleroma', key]) === true
)); ));