From 532e5c99ab780f2eb878dc0a28607795612931f7 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Mon, 10 Apr 2023 03:48:38 +0000 Subject: [PATCH] fix: esm changes --- server/core/scheduler.mjs | 4 ++-- server/graph/resolvers/system.mjs | 2 +- server/graph/resolvers/user.mjs | 1 + server/models/users.mjs | 2 +- server/modules/extensions/sharp/ext.mjs | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/core/scheduler.mjs b/server/core/scheduler.mjs index 8d2caf0a..7936a79b 100644 --- a/server/core/scheduler.mjs +++ b/server/core/scheduler.mjs @@ -6,7 +6,7 @@ import cronparser from 'cron-parser' import { DateTime } from 'luxon' import { v4 as uuid } from 'uuid' import { createDeferred } from '../helpers/common.mjs' -import { find, remove } from 'lodash-es' +import { camelCase, find, remove } from 'lodash-es' export default { workerPool: null, @@ -27,7 +27,7 @@ export default { }) this.tasks = {} for (const f of (await fs.readdir(path.join(WIKI.SERVERPATH, 'tasks/simple')))) { - const taskName = f.replace('.mjs', '') + const taskName = camelCase(f.replace('.mjs', '')) this.tasks[taskName] = (await import(path.join(WIKI.SERVERPATH, 'tasks/simple', f))).task } return this diff --git a/server/graph/resolvers/system.mjs b/server/graph/resolvers/system.mjs index c6175440..b4e2de4d 100644 --- a/server/graph/resolvers/system.mjs +++ b/server/graph/resolvers/system.mjs @@ -2,7 +2,7 @@ import _ from 'lodash-es' import util from 'node:util' import getosSync from 'getos' import os from 'node:os' -import filesize from 'filesize' +import { filesize } from 'filesize' import path from 'node:path' import fs from 'fs-extra' import { DateTime } from 'luxon' diff --git a/server/graph/resolvers/user.mjs b/server/graph/resolvers/user.mjs index c066062d..d0947f3d 100644 --- a/server/graph/resolvers/user.mjs +++ b/server/graph/resolvers/user.mjs @@ -122,6 +122,7 @@ export default { }, async updateUser (obj, args) { try { + console.info(args.id) await WIKI.db.users.updateUser(args.id, args.patch) return { diff --git a/server/models/users.mjs b/server/models/users.mjs index 5a405f4a..27c6b0e7 100644 --- a/server/models/users.mjs +++ b/server/models/users.mjs @@ -642,7 +642,7 @@ export class User extends Model { * * @param {Object} param0 User ID and fields to update */ - static async updateUser ({ id, email, name, newPassword, groups, location, jobTitle, timezone, dateFormat, appearance }) { + static async updateUser (id, { email, name, newPassword, groups, location, jobTitle, timezone, dateFormat, appearance }) { const usr = await WIKI.db.users.query().findById(id) if (usr) { let usrData = {} diff --git a/server/modules/extensions/sharp/ext.mjs b/server/modules/extensions/sharp/ext.mjs index d184cfe9..d576760f 100644 --- a/server/modules/extensions/sharp/ext.mjs +++ b/server/modules/extensions/sharp/ext.mjs @@ -56,7 +56,7 @@ export default { background = { r: 0, g: 0, b: 0, alpha: 0 }, kernel = 'lanczos3' }) { - this.load() + await this.load() if (inputPath) { inputStream = fse.createReadStream(inputPath)