summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-03-29 10:49:43 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-03-29 10:49:43 +0900
commitbb835a6e8ac36d4055b9da3b37f27e8b0d5bea37 (patch)
treed55e3d1d3821eb20eb3a02f93c7d77855367191f /src/server
parentRefactor: Use === (diff)
downloadsharkey-bb835a6e8ac36d4055b9da3b37f27e8b0d5bea37.tar.gz
sharkey-bb835a6e8ac36d4055b9da3b37f27e8b0d5bea37.tar.bz2
sharkey-bb835a6e8ac36d4055b9da3b37f27e8b0d5bea37.zip
Fix bug
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/define.ts6
-rw-r--r--src/server/api/endpoints/notifications/create.ts2
-rw-r--r--src/server/api/stream/index.ts2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/api/define.ts b/src/server/api/define.ts
index 2ee0ba4868..1c7ee26479 100644
--- a/src/server/api/define.ts
+++ b/src/server/api/define.ts
@@ -15,12 +15,12 @@ type Params<T extends IEndpointMeta> = {
export type Response = Record<string, any> | void;
type executor<T extends IEndpointMeta> =
- (params: Params<T>, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, token: AccessToken, file?: any, cleanup?: Function) =>
+ (params: Params<T>, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, token: AccessToken | null, file?: any, cleanup?: Function) =>
Promise<T['res'] extends undefined ? Response : SchemaType<NonNullable<T['res']>>>;
export default function <T extends IEndpointMeta>(meta: T, cb: executor<T>)
- : (params: any, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, token: AccessToken, file?: any) => Promise<any> {
- return (params: any, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, token: AccessToken, file?: any) => {
+ : (params: any, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, token: AccessToken | null, file?: any) => Promise<any> {
+ return (params: any, user: T['requireCredential'] extends true ? ILocalUser : ILocalUser | null, token: AccessToken | null, file?: any) => {
function cleanup() {
fs.unlink(file.path, () => {});
}
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,
diff --git a/src/server/api/stream/index.ts b/src/server/api/stream/index.ts
index 9a6c247463..a5ff56f51d 100644
--- a/src/server/api/stream/index.ts
+++ b/src/server/api/stream/index.ts
@@ -18,7 +18,7 @@ export default class Connection {
public user?: User;
public following: User['id'][] = [];
public muting: User['id'][] = [];
- public token: AccessToken;
+ public token: AccessToken | null | undefined;
private wsConnection: websocket.connection;
public subscriber: EventEmitter;
private channels: Channel[] = [];