This commit is contained in:
Peter Maquiran
2022-04-18 15:12:27 +01:00
parent 8c704ca898
commit 7de80902cf
14 changed files with 41 additions and 24 deletions
+3 -1
View File
@@ -61,7 +61,9 @@ export class AuthService {
}
if (localStorage.getItem("userChat") != null) {
this.ValidatedUserChat = JSON.parse(localStorage.getItem('userChat'));
this.ValidatedUserChat = {
data: JSON.parse(localStorage.getItem('userChat'))
};
}
}
@@ -41,9 +41,10 @@ export class WsChatMethodsService {
currentRoom: RoomService = null
users: chatUser[] = []
sessionStore = SessionStore
loggedUser: any;
constructor(
private WsChatService: WsChatService,
private storage: Storage,
@@ -183,7 +184,7 @@ export class WsChatMethodsService {
const res = await this.chatService.getMembers(roomId).toPromise();
const members = res['members'];
const users = members.filter(data => data.username != this.loggedUser.me.username);
const users = members.filter(data => data.username != this.sessionStore.user.RochetChatUser);
rooms.result.update[index]['members'] = users
await this.prepareRoom(roomData);
@@ -191,7 +192,7 @@ export class WsChatMethodsService {
if (roomData.t === 'p') {
const res = await this.chatService.getGroupMembers(roomId).toPromise()
const members = res['members'];
const users = members.filter(data => data.username != this.loggedUser.me.username);
const users = members.filter(data => data.username != this.sessionStore.user.RochetChatUser);
rooms.result.update[index]['members'] = users
@@ -199,7 +200,7 @@ export class WsChatMethodsService {
else {
const res = await this.chatService.getChannelMembers(roomId).toPromise()
const members = res['members'];
const users = members.filter(data => data.username != this.loggedUser.me.username);
const users = members.filter(data => data.username != this.sessionStore.user.RochetChatUser);
rooms.result.update[index]['members'] = users
+1 -1
View File
@@ -674,7 +674,7 @@ export class WsChatService {
registerCallback:(params: wsCallbacksParams) => {
let id = params.requestId || params.key || uuidv4()
console.log('register id', params)
// console.log('register id', params)
this.wsCallbacks[id] = params
this.n++
return id