diff --git a/packages/ditto/app.ts b/packages/ditto/app.ts index 0d2b515c..85a26944 100644 --- a/packages/ditto/app.ts +++ b/packages/ditto/app.ts @@ -151,7 +151,11 @@ import dittoNamesRoute from '@/routes/dittoNamesRoute.ts'; import pleromaAdminPermissionGroupsRoute from '@/routes/pleromaAdminPermissionGroupsRoute.ts'; import pleromaStatusesRoute from '@/routes/pleromaStatusesRoute.ts'; import { DittoRelayStore } from '@/storages/DittoRelayStore.ts'; -import { adminCurrentPolicyController, adminListPoliciesController, adminUpdatePolicyController } from '@/controllers/api/policies.ts'; +import { + adminCurrentPolicyController, + adminListPoliciesController, + adminUpdatePolicyController, +} from '@/controllers/api/policies.ts'; import { createPolicyEvent, DEFAULT_POLICY_SPEC } from '@/utils/policies.ts'; export interface AppEnv extends DittoEnv { diff --git a/packages/ditto/controllers/api/policies.ts b/packages/ditto/controllers/api/policies.ts index e1c83861..afde7d7b 100644 --- a/packages/ditto/controllers/api/policies.ts +++ b/packages/ditto/controllers/api/policies.ts @@ -32,21 +32,22 @@ export const adminCurrentPolicyController: AppController = async (c) => { const PolicySpecSchema = z.object({ policies: z.array(z.object({ name: z.string(), - params: z.record(z.any()) - })) -}) + params: z.record(z.any()), + })), +}); export const adminUpdatePolicyController: AppController = async (c) => { const { relay, conf } = c.var; if (conf.policyMode === 'script') { return c.json({ - error: "The Ditto policy mode is set to 'script'. You will not be able to use the Policy UI until you change it to 'event'." - }) + error: + "The Ditto policy mode is set to 'script'. You will not be able to use the Policy UI until you change it to 'event'.", + }); } const req = await c.req.json(); const parsed = PolicySpecSchema.parse(req); await relay.event(await createPolicyEvent(conf, parsed)); return c.json({ - message: "Settings saved successfully." - }) -} \ No newline at end of file + message: 'Settings saved successfully.', + }); +}; diff --git a/packages/ditto/workers/policy.worker.ts b/packages/ditto/workers/policy.worker.ts index 72590205..a2bcadbe 100644 --- a/packages/ditto/workers/policy.worker.ts +++ b/packages/ditto/workers/policy.worker.ts @@ -78,13 +78,12 @@ export class CustomPolicy implements NPolicy { if (!policy) continue; try { policies.push(policy.instantiate(item.params || {})); - } - catch (e) { + } catch (e) { logi({ level: 'error', ns: 'ditto.system.policy.worker', - msg: `Error instantiating policy ${item.name} with params \`${JSON.stringify(item.params)}\`: ${e}` - }) + msg: `Error instantiating policy ${item.name} with params \`${JSON.stringify(item.params)}\`: ${e}`, + }); } }