summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-15 12:03:04 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-15 12:03:04 +0900
commitfee0437493a9924993b281503ab7bc62219b2ad6 (patch)
tree113085e3ab886371e8b989bda050313d5dd55362 /src/server/api/endpoints
parentFix bug (diff)
parentNew Crowdin translations (#4685) (diff)
downloadsharkey-fee0437493a9924993b281503ab7bc62219b2ad6.tar.gz
sharkey-fee0437493a9924993b281503ab7bc62219b2ad6.tar.bz2
sharkey-fee0437493a9924993b281503ab7bc62219b2ad6.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server/api/endpoints')
-rw-r--r--src/server/api/endpoints/app/create.ts6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/api/endpoints/app/create.ts b/src/server/api/endpoints/app/create.ts
index 71f21fdf47..ba366cdeb8 100644
--- a/src/server/api/endpoints/app/create.ts
+++ b/src/server/api/endpoints/app/create.ts
@@ -3,6 +3,7 @@ import $ from 'cafy';
import define from '../../define';
import { Apps } from '../../../../models';
import { genId } from '../../../../misc/gen-id';
+import { unique } from '../../../../prelude/array';
export const meta = {
tags: ['app'],
@@ -34,6 +35,9 @@ export default define(meta, async (ps, user) => {
// Generate secret
const secret = rndstr('a-zA-Z0-9', 32);
+ // for backward compatibility
+ const permission = unique(ps.permission.map(v => v.replace(/^(.+)(\/|-)(read|write)$/, '$3:$1')));
+
// Create account
const app = await Apps.save({
id: genId(),
@@ -41,7 +45,7 @@ export default define(meta, async (ps, user) => {
userId: user ? user.id : null,
name: ps.name,
description: ps.description,
- permission: ps.permission,
+ permission,
callbackUrl: ps.callbackUrl,
secret: secret
});