Merge with websocket branch

src/app/shared/chat/group-messages/group-messages.page.html

@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="header-top">
         <div class="middle">
-          <ion-label class="title">{{roomName}}</ion-label>
+          <ion-label class="title">{{wsChatMethodsService.getGroupRoom(roomId).name}}</ion-label>
         </div>
         <div class="right">
           <button class="btn-no-color" (click)="openGroupMessagesOptions()">
@@ -23,10 +23,10 @@
           </ion-label>
         </div>
       </div>
-      <div *ngIf="room.customFields.countDownDate" class="d-flex align-items-center yellow-orange pl-10">
+      <!-- <div *ngIf="room.customFields.countDownDate" class="d-flex align-items-center yellow-orange pl-10">
         <i class="far fa-clock font-15" ></i>
         <ion-label class="font-15 pl-10" color="warning">{{countDownDate()}}</ion-label>
-      </div>
+      </div> -->
     </div>
   </ion-toolbar>
 </ion-header>
@@ -44,8 +44,8 @@
       <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
 
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last">
-      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.msg !=''" >
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of wsChatMethodsService.getGroupRoom(roomId).massages; let last = last">
+      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.msg !=''" >
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
           <mat-menu #beforeMenu="matMenu" xPosition="before">
@@ -93,7 +93,7 @@
       </div>
 
 
-      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.alias =='documento'" >
+      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.alias =='documento'" >
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
           <mat-menu #beforeMenu="matMenu" xPosition="before">
@@ -191,6 +191,14 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
+      <div *ngIf="msg.t == 'au'" class="info-text-leave">
+        <div *ngFor="let user of allUsers">
+          <div *ngIf="msg.msg == user.username">
+            <ion-label>Adicionou {{user.name}}</ion-label><br />
+          </div>
+        </div>
+        {{last ? scrollToBottom() : ''}}
+      </div>
       <div *ngIf="msg.file" >
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -24,6 +24,7 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 import { HttpEventType } from '@angular/common/http';
 import { Storage } from '@ionic/storage';
+import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
 
 /*
 import * as pdfjsLib from 'pdfjs-dist';
@@ -94,7 +95,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     private fileService: FileService,
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
-    private storage: Storage
+    private storage: Storage,
+    public wsChatMethodsService: WsChatMethodsService
   ) {
     this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = true;
@@ -105,12 +107,22 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   ngOnChanges(changes: SimpleChanges): void {
     this.getRoomInfo();
     //this.scrollToBottom();
+    this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
+    console.log('MESSAGES'+this.wsChatMethodsService.getGroupRoom(this.roomId).massages);
+    this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked
+
+    setTimeout(()=>{
+      this.scrollToBottomClicked()
+    }, 50)
+
   }
 
   ngOnInit() {
     this.loggedUser = this.loggedUserChat;
+    //console.log(this.wsChatMethodsService.getRoom(this.roomId).massages);
+
+    this.loggedUser=this.loggedUserChat;
     this.getRoomInfo();
-    this.serverLongPull();
     this.setStatus('online');
     this.getChatMembers();
     //this.getMessageDB();
@@ -144,7 +156,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     } catch (err) { }
   }
 
-  scrollToBottomClicked(): void {
+  scrollToBottomClicked = () => {
     try {
       this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
     } catch (err) { }
@@ -384,27 +396,7 @@ 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;
-    });
+    this.wsChatMethodsService.getDmRoom(this.roomId).send(this.message)
     this.message = "";
   }
 
@@ -841,47 +833,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     });
   }
 
-  async serverLongPull() {
-
-    if (this.route.url != "/home/chat" && document.querySelector('app-group-messages')) {
-      console.log("Timer message stop")
-    }
-    else {
-
-      this.chatService.getPrivateGroupMessages(this.roomId).subscribe(async res => {
-        if (res['success'] == true) {
-          // Show Error
-          //showMessage(response.statusText);
-          //this.loadMessages()
-          let msgOnly = res['messages'].filter(data => data.t != 'au');
-          //this.messages = msgOnly.reverse();
-          console.log('GROUP MSG FROM ROCKET',msgOnly.reverse());
-          this.transformData(msgOnly.reverse());
-          this.getMessageDB();
-          // Reconnect in one second
-
-          if (document.querySelector('app-group-messages')) {
-            await new Promise(resolve => setTimeout(resolve, 5000));
-            this.getGroups.emit();
-            console.log('Timer message running')
-            await this.serverLongPull();
-          }
-
-        }
-        else {
-          alert('HEY2')
-          // Got message
-          //let message = await response.text();
-          //this.loadMessages()
-          await this.serverLongPull();
-        }
-      }, (error) => {
-        console.log(error);
-        this.serverLongPull();
-      });
-    }
-  }
-
 
   sliderOpts = {
     zoom: false,