From b5046123deb03a09d356ae8cb55bbe47b19d3682 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 10 Jan 2022 11:28:50 +0100 Subject: [PATCH] add subscribe --- src/app/services/socket/rocket-chat-client.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/services/socket/rocket-chat-client.service.ts b/src/app/services/socket/rocket-chat-client.service.ts index 92dc7f48a..49d15ba59 100644 --- a/src/app/services/socket/rocket-chat-client.service.ts +++ b/src/app/services/socket/rocket-chat-client.service.ts @@ -62,7 +62,7 @@ class _RocketChatClientService { return new Promise((resolve, reject) => { this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{ // console.log(message.result.id, requestId) - if(message.id == requestId) { // same request send + if(message.id == requestId || message.result.id == requestId) { // same request send if(message.result) { if(message.result.token) { this.isLogin = true @@ -120,7 +120,7 @@ class _RocketChatClientService { return new Promise((resolve, reject) => { this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{ - if(message.result.id == requestId) { // same request send + if(message.id == requestId || message.result.id == requestId) { // same request send resolve(message) } }}) @@ -141,7 +141,7 @@ class _RocketChatClientService { } this.ws.send(subscribeRequest); - + return new Promise((resolve, reject) => { this.ws.registerCallback({type:'Onmessage', requestId, runOnces: true, funx:(message)=>{ if(message.result.id == requestId) { // same request send