Merge branch 'master' into next/landscape

This commit is contained in:
Hunter Miller 2022-05-11 11:42:58 -05:00
commit 71aa1da3e0
2 changed files with 13 additions and 1 deletions

View File

@ -198,7 +198,7 @@ export const isWriter = (group: Group, resource: string, ship: string) => {
if (typeof writers === 'undefined') {
return true;
} else {
return writers.includes(ship) || admins.includes(ship);
return [...writers].includes(ship) || admins.includes(ship);
}
};

View File

@ -141,6 +141,18 @@ export function dateToDa(d: Date, mil: boolean = false): string {
);
}
export function preSig(ship: string): string {
if (!ship) {
return '';
}
if (ship.trim().startsWith('~')) {
return ship.trim();
}
return '~'.concat(ship.trim());
}
export function deSig(ship: string): string | null {
if (!ship) {
return null;