add toggle fix and possible log out issue
This commit is contained in:
@@ -10,6 +10,23 @@ import {
|
||||
} from '@shared/timezone';
|
||||
import { computeBonusProgress } from '@shared/bonus-progress';
|
||||
import { famMeta } from './fam';
|
||||
import { pbAdmin } from '$lib/server/pocketbase';
|
||||
|
||||
// `fams` reads via superuser: the acting token may predate RULE_OWN_FAM
|
||||
// (migrate only bootstraps fresh stores), which otherwise logs a 404 and
|
||||
// aborts evaluation. Fam-scoped by record id.
|
||||
async function famMetaSU(famId: string) {
|
||||
try {
|
||||
const fam: any = await pbAdmin.getOne('fams', famId);
|
||||
return {
|
||||
payday: fam.payday !== undefined && fam.payday !== null ? Number(fam.payday) : 1,
|
||||
paydayTime: fam.paydayTime || '18:00',
|
||||
tz: resolveTz(fam.timezone || 'auto')
|
||||
};
|
||||
} catch {
|
||||
return { payday: 1, paydayTime: '18:00', tz: resolveTz('auto') };
|
||||
}
|
||||
}
|
||||
|
||||
function resolveServerTz(tz?: string): string {
|
||||
return resolveTz(tz || 'auto');
|
||||
@@ -64,7 +81,7 @@ export async function evaluateFam(pb: any, famId: string) {
|
||||
try {
|
||||
allRewards = await pb.collection('rewards').getFullList({ filter: `famId = '${famId}'` });
|
||||
} catch {}
|
||||
const { payday: paydayEval, tz: tzEval } = await famMeta(pb, famId);
|
||||
const { payday: paydayEval, tz: tzEval } = await famMetaSU(famId);
|
||||
|
||||
// Chores "due" this week per member (daily = 7, otherwise 1). Used by the
|
||||
// `percent` threshold type to compute % of chores completed.
|
||||
|
||||
Reference in New Issue
Block a user