From 115c76f1ff1ef285cf451b4a36599ac004772a14 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 10 Feb 2022 16:14:25 +0100
Subject: [PATCH] improve

---
 src/app/pages/chat/group-messages/group-messages.page.html  | 2 +-
 src/app/pages/chat/group-messages/group-messages.page.ts    | 4 ----
 src/app/pages/chat/messages/messages.page.html              | 2 +-
 src/app/pages/chat/messages/messages.page.ts                | 6 ------
 src/app/services/chat/room.service.ts                       | 5 +++--
 src/app/shared/chat/group-messages/group-messages.page.html | 2 +-
 src/app/shared/chat/group-messages/group-messages.page.ts   | 3 ---
 src/app/shared/chat/messages/messages.page.html             | 2 +-
 src/app/shared/chat/messages/messages.page.ts               | 3 ---
 9 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index dc522f73c..0554dbe80 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -196,7 +196,7 @@
     </div>
     <div class="message-box width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
-        <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getGroupRoom(roomId).message" (ionChange)="changeInput()"></ion-textarea>
+        <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getGroupRoom(roomId).message" (ionChange)="wsChatMethodsService.getGroupRoom(roomId).sendTyping()"></ion-textarea>
         <button hidden class="btn-no-color">
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
         </button>
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 15212fee8..2fbcdb08d 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -198,10 +198,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
 
-  changeInput() {
-    this.wsChatMethodsService.getGroupRoom(this.roomId).typing()
-  }
-
   async goToEvent(eventId: any) {
     let classs;
     if (window.innerWidth < 701) {
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index cf8e17568..ae936265a 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -186,7 +186,7 @@
     </div>
     <div class="width-70">
       <ion-item class="ion-no-padding ion-no-margin type-message" lines="none">
-        <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" *ngIf="!recording" clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message" (ionChange)="changeInput()"></ion-textarea>
+        <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" *ngIf="!recording" clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message" (ionChange)="wsChatMethodsService.getDmRoom(roomId).sendTyping()"></ion-textarea>
         <ion-textarea autocomplete="on" spellcheck="true" *ngIf="recording" clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="durationDisplay"></ion-textarea>
         <button hidden #recordbtn class="btn-no-color" (click)="notImplemented()">
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 4879f1454..bc63ba7b4 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -348,16 +348,10 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     window.removeEventListener('scroll', this.scrollChangeCallback, true);
   }
 
-  changeInput() {
-    this.wsChatMethodsService.getDmRoom(this.roomId).typing()
-  }
-  
   sendMessage() {
     this.wsChatMethodsService.getDmRoom(this.roomId).send({})
   }
 
-
-
   viewDocument(file: any, url?: string) {
 
     if (file.type == "application/webtrix") {
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 1904eb13c..4ac75432f 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -129,6 +129,7 @@ export class RoomService {
       if(message.fields.eventName == this.id+'/'+'typing') {
 
         this.userThatIsTyping = this.usernameToDisplayName(message.fields.args[0])
+        console.log(this.userThatIsTyping, 'this.userThatIsTyping')
         this.isTyping =  message.fields.args[1]
         this.otherUserType = message.fields.args[1]
 
@@ -311,7 +312,7 @@ export class RoomService {
   }
 
 
-  typing(text:string = this.message) {
+  sendTyping(text:string = this.message) {
 
     if(this.lastMessageTxt == text) { return false }
     this.lastTimeType = new Date().getTime()
@@ -351,7 +352,7 @@ export class RoomService {
   }
 
   private setTypingOff() {
-    this.typing('')
+    this.sendTyping('')
   }
 
   roomLeave() {
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 0f6dcd373..147a166c0 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -234,7 +234,7 @@
 
     <div class="width-100">
       <ion-item class="ion-no-padding type-message" lines="none">
-        <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" (keyup.enter)="sendMessage()" clearOnEdit="true" placeholder="Escrever uma mensagem" class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getGroupRoom(roomId).message" (ionChange)="changeInput()"></ion-textarea>
+        <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" (keyup.enter)="sendMessage()" clearOnEdit="true" placeholder="Escrever uma mensagem" class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getGroupRoom(roomId).message" (ionChange)="wsChatMethodsService.getGroupRoom(roomId).sendTyping()"></ion-textarea>
         <button hidden class="btn-no-color">
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
         </button>
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 3f059690e..2c1083e5b 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -230,9 +230,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
 
-  changeInput() {
-    this.wsChatMethodsService.getDmRoom(this.roomId).typing()
-  }
 
   async getChatMembers() {
     //return await this.chatService.getMembers(roomId).toPromise();
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index c906fbd12..d106d725f 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -215,7 +215,7 @@
     <div class="width-100">
       <ion-item class="ion-no-padding type-message" lines="none">
         <ion-textarea (keyup.enter)="sendMessage()" clearOnEdit="true" placeholder="Escrever uma mensagem"
-          class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message" (ionChange)="changeInput()"></ion-textarea>
+          class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message" (ionChange)="wsChatMethodsService.getDmRoom(roomId).sendTyping()"></ion-textarea>
         <button hidden class="btn-no-color" (click)="notImplemented()">
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
         </button>
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 49d05b16f..c4e648c4a 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -276,9 +276,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     }
   }
 
-  changeInput() {
-    this.wsChatMethodsService.getDmRoom(this.roomId).typing()
-  }
 
   async openViewDocumentModal(file: any) {
     let task = {