From 1e3b4c30280743e0a4f4150cf2b39c01715bca2b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 26 Jul 2022 14:11:12 +0100 Subject: [PATCH] improve --- src/app/pages/chat/chat.page.ts | 1 - src/app/pages/chat/group-messages/group-messages.page.ts | 1 - src/app/pages/chat/messages/contacts/contacts.page.ts | 2 -- src/app/pages/chat/messages/messages.page.ts | 2 -- src/app/services/chat/room.service.ts | 8 +++----- src/app/shared/chat/messages/messages.page.html | 1 - 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index f5e5315ce..7af4f7fa5 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -357,7 +357,6 @@ export class ChatPage implements OnInit { }); } - getDirectMessagesDB() { if (this.platform.is('desktop') || this.platform.is('mobileweb')) { this.storageservice.get("rooms").then((rooms) =>{ diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 092058387..980185f06 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -150,7 +150,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }) - //this.loadFiles(); } setStatus(status: string) { diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts index 1c4bc1b2b..2e0777fdf 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.ts +++ b/src/app/pages/chat/messages/contacts/contacts.page.ts @@ -104,7 +104,6 @@ export class ContactsPage implements OnInit { this.room = res['room']; - await this.WsChatMethodsService.getAllRooms(); this.getDirectMessage(this.room._id); }); @@ -148,7 +147,6 @@ export class ContactsPage implements OnInit { /* this.getDirectMessage(this.room._id); */ - /* const modal = await this.modalController.create({ component: MessagesPage, cssClass: 'group-messages', diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 9299ace5c..febeaddaa 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -125,7 +125,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { private sqlservice: SqliteService, public wsChatMethodsService: WsChatMethodsService, private AttachmentsService: AttachmentsService, - private CameraService: CameraService, private processesService: ProcessesService, private storage: Storage, @@ -149,7 +148,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } - this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({}) this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked this.wsChatMethodsService.openRoom(this.roomId) diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 4b16880ed..1969b7d7f 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -315,19 +315,17 @@ export class RoomService { this.otherUserType = args[1] this.readAllMessage() - // - // alert(JSON.stringify(args)) + } else if(args[0]?.method == 'viewMessage' || args[1]?.method == 'viewMessage') { this.readAllMessage() } else if(args[0]?.method == 'deleteMessage' || args[1]?.method == 'deleteMessage') { - // alert('delete') - // + this.deleteMessage(args[1]?.method?._id) } else { - // alert('miss') + } diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 58b1211e1..66482dde6 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -49,7 +49,6 @@
{{msg.u.name}} {{msg.duration}} - {{msg._id}}