summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/app
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-03-24 11:34:29 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-03-24 11:34:29 +0900
commit3e11011229ef8459747acdf6d3008dc145280fec (patch)
tree8ebc85727c4d295f6583b63d9397651151d4394a /src/server/api/endpoints/app
parentMerge branch 'develop' (diff)
parent12.75.1 (diff)
downloadmisskey-3e11011229ef8459747acdf6d3008dc145280fec.tar.gz
misskey-3e11011229ef8459747acdf6d3008dc145280fec.tar.bz2
misskey-3e11011229ef8459747acdf6d3008dc145280fec.zip
Merge branch 'develop'
Diffstat (limited to 'src/server/api/endpoints/app')
-rw-r--r--src/server/api/endpoints/app/create.ts4
-rw-r--r--src/server/api/endpoints/app/show.ts4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/api/endpoints/app/create.ts b/src/server/api/endpoints/app/create.ts
index 776865ffb6..db72bd1c42 100644
--- a/src/server/api/endpoints/app/create.ts
+++ b/src/server/api/endpoints/app/create.ts
@@ -1,9 +1,9 @@
import $ from 'cafy';
import define from '../../define';
import { Apps } from '../../../../models';
-import { genId } from '../../../../misc/gen-id';
+import { genId } from '@/misc/gen-id';
import { unique } from '../../../../prelude/array';
-import { secureRndstr } from '../../../../misc/secure-rndstr';
+import { secureRndstr } from '@/misc/secure-rndstr';
export const meta = {
tags: ['app'],
diff --git a/src/server/api/endpoints/app/show.ts b/src/server/api/endpoints/app/show.ts
index 254ae30884..65f8c77981 100644
--- a/src/server/api/endpoints/app/show.ts
+++ b/src/server/api/endpoints/app/show.ts
@@ -1,5 +1,5 @@
import $ from 'cafy';
-import { ID } from '../../../../misc/cafy-id';
+import { ID } from '@/misc/cafy-id';
import define from '../../define';
import { ApiError } from '../../error';
import { Apps } from '../../../../models';
@@ -46,6 +46,6 @@ export default define(meta, async (ps, user, token) => {
return await Apps.pack(ap, user, {
detail: true,
- includeSecret: isSecure && (ap.userId === user.id)
+ includeSecret: isSecure && (ap.userId === user!.id)
});
});