Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into sw-notification-action

Browse source
This commit is contained in:
tamaina 2021-07-06 22:59:18 +09:00
commit aebdc4af47
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/server/api/stream/channels/messaging.ts
View file

@ -10,7 +10,7 @@ export default class extends Channel {
public static requireCredential = true;
private otherpartyId: string | null;
private otherparty?: User;
private otherparty: User | null;
private groupId: string | null;
private subCh: string;
private typers: Record<User['id'], Date> = {};
@ -18,9 +18,9 @@ export default class extends Channel {
@autobind
public async init(params: any) {
this.otherpartyId = params.otherparty as string;
this.otherparty = await Users.findOne({ id: this.otherpartyId });
this.groupId = params.group as string;
this.otherpartyId = params.otherparty;
this.otherparty = this.otherpartyId ? await Users.findOneOrFail({ id: this.otherpartyId }) : null;
this.groupId = params.group;
// Check joining
if (this.groupId) {