feat: support null for Mk:api() token argument

misskey-dev · Sep 22, 2023 · 8a3a421 · 8a3a421
1 parent f748c91
commit 8a3a421
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/packages/frontend/src/scripts/aiscript/api.ts b/packages/frontend/src/scripts/aiscript/api.ts
@@ -35,11 +35,13 @@ export function createAiScriptEnv(opts) {
 		}),
 		'Mk:api': values.FN_NATIVE(async ([ep, param, token]) => {
 			if (token) {
-				utils.assertString(token);
-				// バグがあればundefinedもあり得るため念のため
-				if (typeof token.value !== 'string') throw new Error('invalid token');
+				if (token.type !== 'null') {
+					utils.assertString(token);
+					// バグがあればundefinedもあり得るため念のため
+					if (typeof token.value !== 'string') throw new Error('invalid token');
+				}
 			}
-			return os.api(ep.value, utils.valToJs(param), token ? token.value : (opts.token ?? null)).then(res => {
+			return os.api(ep.value, utils.valToJs(param), (token ? token.value : opts.token) ?? null).then(res => {
 				return utils.jsToVal(res);
 			}, err => {
 				return values.ERROR('request_failed', utils.jsToVal(err));