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 6233650f7..f345dfa9d 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -307,18 +307,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { - sendMessage(){ - let body = { - "message": { "rid": this.roomId, "msg": this.message } - } - - this.chatService.sendMessage(body).subscribe(res=> { - this.getRoomInfo(); - this.scrollingOnce = true; - - },(error) => { - - }); + sendMessage() { + this.wsChatMethodsService.getDmRoom(this.roomId).send(this.message) this.message = ""; } diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 804fc5b1b..e97e83779 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -47,7 +47,7 @@ export class RoomService { (ChatMessage) => { ChatMessage = ChatMessage.fields.args[0] ChatMessage = this.fix_updatedAt(ChatMessage) - + this.ToastService.presentToast('nova mensagem') const message = new MessageService() message.setData(ChatMessage) diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 8bf024574..1da3d421f 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -297,31 +297,12 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } */ } - sendMessage(){ - let body = { - "message": - { - "rid": this.roomId, - "msg": this.message, - /* "attachments": [{ - "color": "#ff0000", - "text": "Yay for gruggy!", - "title": "Attachment Example", - "title_link": "https://youtube.com", - "title_link_download": false, - "image_url": "https://upload.wikimedia.org/wikipedia/commons/e/ee/Chain_link_icon.png", - }] */ - } - } - - this.chatService.sendMessage(body).subscribe(res=> { - /* this.loadGroupMessages(); */ - //this.getRoomInfo(); - this.scrollingOnce = true; - }); + sendMessage() { + this.wsChatMethodsService.getDmRoom(this.roomId).send(this.message) this.message = ""; } + deleteMessage(msgId:string){ let body = { "roomId": this.roomId, diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 053c88603..34574e784 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -2,9 +2,9 @@
-
- {{ wsChatMethodsService.getRoom(roomId).name }} - +
+ {{ wsChatMethodsService.getDmRoom(roomId).name }} +