peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
Peter Maquiran
2022-09-30 13:24:19 +01:00
parent 08b9d5e5df
commit 6df9e1f30a
3 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/group-messages/group-messages.page.ts
+17 -15
View File
@@ -424,23 +424,25 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
getGroupContacts(room: any) {
this.showLoader = true;
//If group is private call getGroupMembers
if (this.room.t === 'p') {
this.chatService.getGroupMembers(this.roomId).subscribe(res => {
// this.showLoader = true;
// //If group is private call getGroupMembers
// if (this.room.t === 'p') {
// this.chatService.getGroupMembers(this.roomId).subscribe(res => {
this.members = res['members'];
this.showLoader = false;
});
}
//Otherwise call getChannelMembers for públic groups
else {
this.chatService.getChannelMembers(this.roomId).subscribe(res => {
// this.members = res['members'];
// this.showLoader = false;
// });
// }
// //Otherwise call getChannelMembers for públic groups
// else {
// this.chatService.getChannelMembers(this.roomId).subscribe(res => {
this.members = res['members'];
this.showLoader = false;
});
}
// this.members = res['members'];
// this.showLoader = false;
// });
// }
this.members = this.wsChatMethodsService.getGroupRoom(this.roomId).members
}
src/app/services/chat/room.service.ts
+3 -2
View File
@@ -180,7 +180,7 @@ export class RoomService {
}
}
setData({members, u, customFields = {}, id, name, t, lastMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService), _updatedAt }) {
setData({membersExcludeMe, members, u, customFields = {}, id, name, t, lastMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService), _updatedAt }) {
this.customFields = customFields
this.id = id
this.name = name
@@ -188,7 +188,8 @@ export class RoomService {
this.lastMessage = lastMessage
this._updatedAt = _updatedAt
this.u = u
this.membersExcludeMe = members
this.members = members
this.membersExcludeMe = membersExcludeMe
this.calDateDuration()
this.restoreMessageFromDB()
src/app/shared/chat/group-messages/group-messages.page.ts
+17 -17
View File
@@ -430,25 +430,25 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
}
getGroupContacts(room: any) {
this.showLoader = true;
//If group is private call getGroupMembers
if (room.t === 'p') {
this.chatService.getGroupMembers(this.roomId).subscribe(res => {
//
this.members = res['members'];
this.showLoader = false;
});
}
//Otherwise call getChannelMembers for públic groups
else {
this.chatService.getChannelMembers(this.roomId).subscribe(res => {
// this.showLoader = true;
// //If group is private call getGroupMembers
// if (room.t === 'p') {
// this.chatService.getGroupMembers(this.roomId).subscribe(res => {
// //
// this.members = res['members'];
// this.showLoader = false;
// });
// }
// //Otherwise call getChannelMembers for públic groups
// else {
// this.chatService.getChannelMembers(this.roomId).subscribe(res => {
this.members = res['members'];
this.showLoader = false;
});
}
// this.members = res['members'];
// this.showLoader = false;
// });
// }
this.members = this.wsChatMethodsService.getGroupRoom(this.roomId).members
}
sendMessage() {