diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-03-29 17:46:31 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-03-29 17:46:31 +0900 |
| commit | cc66a1f9c7733f0ff3c23b60a8578cdb1235a3f2 (patch) | |
| tree | e7e7697fcfc2ec63c642e5496030bdd46f87601b /src/server/api/endpoints | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.28.0 (diff) | |
| download | misskey-cc66a1f9c7733f0ff3c23b60a8578cdb1235a3f2.tar.gz misskey-cc66a1f9c7733f0ff3c23b60a8578cdb1235a3f2.tar.bz2 misskey-cc66a1f9c7733f0ff3c23b60a8578cdb1235a3f2.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/server/api/endpoints')
| -rw-r--r-- | src/server/api/endpoints/i/apps.ts | 1 | ||||
| -rw-r--r-- | src/server/api/endpoints/meta.ts | 1 | ||||
| -rw-r--r-- | src/server/api/endpoints/notifications/create.ts | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/server/api/endpoints/i/apps.ts b/src/server/api/endpoints/i/apps.ts index dc74123ce3..3b5cd21a79 100644 --- a/src/server/api/endpoints/i/apps.ts +++ b/src/server/api/endpoints/i/apps.ts @@ -38,5 +38,6 @@ export default define(meta, async (ps, user) => { name: token.name, createdAt: token.createdAt, lastUsedAt: token.lastUsedAt, + permission: token.permission, }))); }); diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 8eaa65a2c6..41adc855d2 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -159,6 +159,7 @@ export default define(meta, async (ps, me) => { github: instance.enableGithubIntegration, discord: instance.enableDiscordIntegration, serviceWorker: instance.enableServiceWorker, + miauth: true, }; } diff --git a/src/server/api/endpoints/notifications/create.ts b/src/server/api/endpoints/notifications/create.ts index fed422b645..6267699e90 100644 --- a/src/server/api/endpoints/notifications/create.ts +++ b/src/server/api/endpoints/notifications/create.ts @@ -29,7 +29,7 @@ export const meta = { export default define(meta, async (ps, user, token) => { createNotification(user.id, 'app', { - appAccessTokenId: token.id, + appAccessTokenId: token ? token.id : null, customBody: ps.body, customHeader: ps.header, customIcon: ps.icon, |