summaryrefslogtreecommitdiff
path: root/packages/backend/src/server
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-03-12 19:35:17 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-03-12 19:35:17 +0900
commit2cd2d6522e096bfbca244010e30241828d13a3cb (patch)
treecf1ba72fdf0bce3ee1b2753c90c9705e36ab3cc6 /packages/backend/src/server
parentMerge branch 'develop' (diff)
parent12.108.1 (diff)
downloadmisskey-2cd2d6522e096bfbca244010e30241828d13a3cb.tar.gz
misskey-2cd2d6522e096bfbca244010e30241828d13a3cb.tar.bz2
misskey-2cd2d6522e096bfbca244010e30241828d13a3cb.zip
Merge branch 'develop'
Diffstat (limited to 'packages/backend/src/server')
-rw-r--r--packages/backend/src/server/api/define.ts2
-rw-r--r--packages/backend/src/server/file/send-drive-file.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/define.ts b/packages/backend/src/server/api/define.ts
index 9094fcffc6..4e6d041a29 100644
--- a/packages/backend/src/server/api/define.ts
+++ b/packages/backend/src/server/api/define.ts
@@ -31,7 +31,7 @@ const ajv = new Ajv({
useDefaults: true,
});
-ajv.addFormat('misskey:id', /^[a-z0-9]+$/);
+ajv.addFormat('misskey:id', /^[a-zA-Z0-9]+$/);
export default function <T extends IEndpointMeta, Ps extends Schema>(meta: T, paramDef: Ps, cb: executor<T, Ps>)
: (params: any, user: T['requireCredential'] extends true ? SimpleUserInfo : SimpleUserInfo | null, token: AccessToken | null, file?: any) => Promise<any> {
diff --git a/packages/backend/src/server/file/send-drive-file.ts b/packages/backend/src/server/file/send-drive-file.ts
index 4e2bba0e20..6bc220b362 100644
--- a/packages/backend/src/server/file/send-drive-file.ts
+++ b/packages/backend/src/server/file/send-drive-file.ts
@@ -2,7 +2,7 @@ import * as fs from 'node:fs';
import { fileURLToPath } from 'node:url';
import { dirname } from 'node:path';
import Koa from 'koa';
-import * as send from 'koa-send';
+import send from 'koa-send';
import rename from 'rename';
import * as tmp from 'tmp';
import { serverLogger } from '../index.js';