Conflict solved merging developer

src/app/services/alert.service.ts

@@ -58,7 +58,7 @@ export class AlertService {
           handler: () => {
             //const loader = this.toastService.loading();
 
-            this.wsChatMethodsService.deleteMessage(msgId).then(()=>{
+            this.wsChatMethodsService.deleteMessage(msgId).then(() => {
               room.deleteMessage(msgId)
             })
             //this.wsChatMethodsService.subscribeToRoomUpdate(room._id, room);

src/app/services/chat.service.ts

@@ -14,26 +14,338 @@ import { SessionStore } from '../store/session.service';
 })
 export class ChatService {
   headers: HttpHeaders;
-  options:any;
-  options1:any;
-  X_User_Id:any;
-  X_Auth_Token:any;
-  loggedUserChat:any;
+  options: any;
+  options1: any;
+  X_User_Id: any;
+  X_Auth_Token: any;
+  loggedUserChat: any;
   bindOnMessage: any;
 
   constructor(
-    private http:HttpClient,
+    private http: HttpClient,
     private httpService: HttpService,
     private authService: AuthService,
     private storage: Storage,
-    private storageService:StorageService,
+    private storageService: StorageService,
     public p: PermissionService) {
 
-      if(this.p.userPermission(this.p.permissionList.Chat.access)) {
-        this.loggedUserChat = authService.ValidatedUserChat;
-        this.headers = new HttpHeaders();
+    this.setheader()
 
-        if(this.p.userPermission(this.p.permissionList.Chat.access)) {
+  }
+
+  getDocumentDetails(url: string) {
+    let headersc = new HttpHeaders();
+    headersc = headersc.set('X-User-Id', this.loggedUserChat['data'].userId);
+    headersc = headersc.set('X-Auth-Token', this.loggedUserChat['data'].authToken);
+    headersc = headersc.set('Sec-Fetch-Dest', 'attachment');
+    headersc = headersc.set('Sec-Fetch-Mode', 'navigate');
+    headersc = headersc.set('Cookie', 'rc_uid=fsMwcNdufWvdnChj7');
+    headersc = headersc.set('Cookie', 'rc_token=MLbhikLQI4xo9_vL43HqheKPPbxjag7hKfwxe9AjcvY');
+    // headersc = headersc.set("Host", "www.tabularium.pt");
+    // headersc = headersc.set("Origin", "http://localhost:8100");
+    headersc = headersc.set('Referer', 'http://localhost:8100/');
+    let optionsc = {
+      headers: headersc,
+      withCredentials: true
+    };
+    // let fullUrl = "https://www.tabularium.pt/" + url;
+    return this.http.get(url, optionsc).subscribe(() => {
+      // this.fileService.viewDocumentByUrl(url)
+    });
+  }
+
+  getAllChannels() {
+    return this.http.get(environment.apiChatUrl + 'channels.list', this.options);
+  }
+
+  getAllUserChannels() {
+    return this.http.get(environment.apiChatUrl + 'channels.list.joined', this.options);
+  }
+
+  getAllRooms() {
+    return this.http.get(environment.apiChatUrl + 'rooms.get', this.options);
+  }
+
+  getRoomInfo(roomId: any) {
+    let params = new HttpParams();
+    params = params.set("roomId", roomId);
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(environment.apiChatUrl + 'rooms.info', opts);
+  }
+
+  customsRooms(params: any) {
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(environment.apiChatUrl + 'rooms.get', opts);
+  }
+  getAllPrivateGroups() {
+    return this.http.get(environment.apiChatUrl + 'groups.list', this.options);
+  }
+
+  getAllUsers() {
+    console.log(this.options)
+    return this.http.get(environment.apiChatUrl + 'users.list', this.options);
+  }
+  getAllConnectedUsers() {
+    return this.http.get(environment.apiChatUrl + 'users.presence', this.options);
+  }
+
+  //Load messages from roomId
+  getAllDirectMessages() {
+    return this.http.get(environment.apiChatUrl + 'im.list', this.options);
+  }
+  //Load messages from roomId
+  getRoomMessages(roomId: any) {
+
+    let params = new HttpParams();
+    params = params.set("roomId", roomId);
+
+    let opts = {
+      headers: this.headers,
+      params: params,
+    }
+    return this.http.get(environment.apiChatUrl + 'im.history', opts);
+  }
+
+  sendMessage(body: any) {
+    let opts = {
+      headers: this.headers,
+    }
+    return this.http.post(environment.apiChatUrl + 'chat.sendMessage', body, opts);
+  }
+
+  uploadFile(formData: any, rid: string) {
+    let url = environment.apiChatUrl + 'rooms.upload/' + rid;
+    let opts = {
+      headers: this.headers,
+    }
+    return this.http.post(url, formData, opts);
+  }
+
+  deleteMessage(body: any) {
+    let opts = {
+      headers: this.headers,
+    }
+    return this.http.post(environment.apiChatUrl + 'chat.delete', body, opts);
+  }
+
+  leaveRoom(body: any) {
+    let opts = {
+      headers: this.headers,
+    }
+    return this.http.post(environment.apiChatUrl + 'rooms.leave', body, opts);
+  }
+  //Load members from a chat
+  getMembers(roomId: any) {
+
+    let params = new HttpParams();
+    params = params.set("roomId", roomId);
+
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(environment.apiChatUrl + 'im.members', opts);
+  }
+
+  getMemberInfo(userId: string) {
+    let params = new HttpParams();
+    params = params.set("userId", userId);
+
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(environment.apiChatUrl + 'users.info', opts);
+  }
+
+  setUserStatus(body: any) {
+    let opts = {
+      headers: this.headers,
+    }
+    return this.http.post(environment.apiChatUrl + 'users.setStatus', body, this.options);
+  }
+
+  removeChatRoom(body: any) {
+    let opts = {
+      headers: this.headers,
+    }
+    return this.http.post(environment.apiChatUrl + 'im.delete', body, this.options);
+  }
+
+  createRoom(body: any) {
+    return this.http.post(environment.apiChatUrl + 'im.create', body, this.options);
+  }
+  getDirectMessage(roomId: string) {
+    let params = new HttpParams();
+    params = params.set("roomId", roomId);
+
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(environment.apiChatUrl + 'im.messages', opts);
+  }
+
+  /* GROUPS */
+  addGroup(body: any) {
+
+    return this.http.post(environment.apiChatUrl + 'groups.create', body, this.options);
+  }
+  setGroupCustomFields(body: any) {
+    return this.http.post(environment.apiChatUrl + 'groups.setCustomFields', body, this.options);
+  }
+
+  getGroupMembers(roomId: string) {
+    let params = new HttpParams();
+    let url = environment.apiChatUrl + 'groups.members';
+    params = params.set("roomId", roomId);
+
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(url, opts);
+  }
+
+  getChannelMembers(roomId: string) {
+    let params = new HttpParams();
+    let url = environment.apiChatUrl + 'channels.members';
+    params = params.set("roomId", roomId);
+
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(url, opts);
+  }
+  /* GROUP MESSAGES */
+  getPrivateGroupMessages(roomId: any) {
+
+    let params = new HttpParams();
+    params = params.set("roomId", roomId);
+
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(environment.apiChatUrl + 'groups.history', opts);
+  }
+  getPublicGroupMessages(roomId: any) {
+    let params = new HttpParams();
+    params = params.set("roomId", roomId);
+
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(environment.apiChatUrl + 'channels.history', opts);
+  }
+  closeGroup(body: any) {
+    return this.http.post(environment.apiChatUrl + 'groups.close', body, this.options);
+  }
+  closeChannel(body: any) {
+    return this.http.post(environment.apiChatUrl + 'channels.close', body, this.options);
+  }
+  leaveGroup(body: any) {
+    return this.http.post(environment.apiChatUrl + 'groups.leave', body, this.options);
+  }
+  leaveChannel(body: any) {
+    return this.http.post(environment.apiChatUrl + 'channels.leave', body, this.options);
+  }
+  removeChannelMember(body: any) {
+    let opts = {
+      headers: this.headers,
+    }
+    return this.http.post(environment.apiChatUrl + 'channels.kick', body, opts);
+  }
+
+  addChannelOwner(body: any) {
+    return this.http.post(environment.apiChatUrl + 'channels.addOwner', body, this.options);
+  }
+
+  addGroupOwner(body: any) {
+    return this.http.post(environment.apiChatUrl + 'groups.addOwner', body, this.options);
+  }
+
+  deleteGroup(body: any) {
+    return this.http.post(environment.apiChatUrl + 'groups.delete', body, this.options);
+  }
+
+  deleteChannel(body: any) {
+    return this.http.post(environment.apiChatUrl + 'channels.delete', body, this.options);
+  }
+  addUserToGroup(body: any) {
+    return this.http.post(environment.apiChatUrl + 'groups.invite', body, this.options);
+  }
+  getGroupInfo(roomId: any) {
+    let params = new HttpParams();
+    params = params.set("roomId", roomId);
+
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+    return this.http.get(environment.apiChatUrl + 'groups.info', opts);
+  }
+  renameGroup(body: any) {
+    return this.http.post(environment.apiChatUrl + 'groups.rename', body, this.options);
+  }
+  removeGroupMember(body: any) {
+    let opts = {
+      headers: this.headers,
+    }
+    return this.http.post(environment.apiChatUrl + 'groups.kick', body, opts);
+  }
+
+  async subscribe(roomId: any) {
+
+    let params = new HttpParams();
+    params = params.set("roomId", roomId);
+    let opts = {
+      headers: this.headers,
+      params: params
+    }
+
+    this.http.get(environment.apiChatUrl + 'im.messages', opts).subscribe(async res => {
+
+
+      if (res == 502) {
+        // Connection timeout
+        // happens when the connection was pending for too long
+        // let's reconnect
+        await this.subscribe(roomId);
+      } else if (res != 200) {
+        // Show Error
+        //showMessage(response.statusText);
+        this.getRoomMessages(roomId)
+        // Reconnect in one second
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        await this.subscribe(roomId);
+      } else {
+        // Got message
+        //let message = await response.text();
+        this.getRoomMessages(roomId)
+        await this.subscribe(roomId);
+      }
+
+    })
+
+
+  }
+
+  setheader() {
+    try {
+      if (this.p.userPermission(this.p.permissionList.Chat.access)) {
+        this.loggedUserChat = this.authService.ValidatedUserChat;
+        this.headers = new HttpHeaders();
+  
+        if (this.p.userPermission(this.p.permissionList.Chat.access)) {
           // 
           this.headers = this.headers.set('X-User-Id', SessionStore.user.ChatData.data.userId);
           this.headers = this.headers.set('X-Auth-Token', SessionStore.user.ChatData.data.authToken);
@@ -41,313 +353,31 @@ export class ChatService {
             headers: this.headers,
           };
         }
+      }
+    } catch (error) {
+      console.log(error)
     }
-
   }
 
-    getDocumentDetails(url:string) {
-      let headersc = new HttpHeaders();
-      headersc = headersc.set('X-User-Id', this.loggedUserChat['data'].userId);
-      headersc = headersc.set('X-Auth-Token', this.loggedUserChat['data'].authToken);
-      headersc = headersc.set('Sec-Fetch-Dest', 'attachment');
-      headersc = headersc.set('Sec-Fetch-Mode', 'navigate');
-      headersc = headersc.set('Cookie', 'rc_uid=fsMwcNdufWvdnChj7');
-      headersc = headersc.set('Cookie', 'rc_token=MLbhikLQI4xo9_vL43HqheKPPbxjag7hKfwxe9AjcvY');
-      // headersc = headersc.set("Host", "www.tabularium.pt");
-      // headersc = headersc.set("Origin", "http://localhost:8100");
-      headersc = headersc.set('Referer', 'http://localhost:8100/');
-      let optionsc = {
-        headers: headersc,
-        withCredentials: true
-      };
-      // let fullUrl = "https://www.tabularium.pt/" + url;
-      return this.http.get(url, optionsc).subscribe(()=>{
-        // this.fileService.viewDocumentByUrl(url)
-      });
-    }
-
-    getAllChannels() {
-      return this.http.get(environment.apiChatUrl+'channels.list', this.options);
-    }
-
-    getAllUserChannels() {
-      return this.http.get(environment.apiChatUrl+'channels.list.joined', this.options);
-    }
-
-    getAllRooms() {
-      return this.http.get(environment.apiChatUrl+'rooms.get', this.options);
-    }
-
-    getRoomInfo(roomId:any) {
-      let params = new HttpParams();
-      params = params.set("roomId", roomId);
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(environment.apiChatUrl+'rooms.info', opts);
-    }
-
-    customsRooms(params:any){
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(environment.apiChatUrl+'rooms.get', opts);
-    }
-    getAllPrivateGroups(){
-      return this.http.get(environment.apiChatUrl+'groups.list', this.options);
-    }
-
-    getAllUsers(){
-      return this.http.get(environment.apiChatUrl+'users.list', this.options);
-    }
-    getAllConnectedUsers(){
-      return this.http.get(environment.apiChatUrl+'users.presence', this.options);
-    }
-
-    //Load messages from roomId
-    getAllDirectMessages(){
-      return this.http.get(environment.apiChatUrl+'im.list', this.options);
-    }
-    //Load messages from roomId
-    getRoomMessages(roomId:any){
-
-      let params = new HttpParams();
-      params = params.set("roomId", roomId);
-
-      let opts = {
-        headers: this.headers,
-        params: params,
-      }
-      return this.http.get(environment.apiChatUrl+'im.history', opts);
-    }
-
-    sendMessage(body:any) {
-      let opts = {
-        headers: this.headers,
-      }
-      return this.http.post(environment.apiChatUrl+'chat.sendMessage', body, opts);
-    }
-
-    uploadFile(formData:any, rid:string){
-      let url = environment.apiChatUrl+'rooms.upload/'+rid;
-      let opts = {
-        headers: this.headers,
-      }
-      return this.http.post(url, formData, opts);
-    }
-
-    deleteMessage(body:any){
-      let opts = {
-        headers: this.headers,
-      }
-      return this.http.post(environment.apiChatUrl+'chat.delete', body, opts);
-    }
-
-    leaveRoom(body:any){
-      let opts = {
-        headers: this.headers,
-      }
-      return this.http.post(environment.apiChatUrl+'rooms.leave', body, opts);
-    }
-    //Load members from a chat
-    getMembers(roomId:any){
-
-      let params = new HttpParams();
-      params = params.set("roomId", roomId);
-
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(environment.apiChatUrl+'im.members', opts);
-    }
-
-    getMemberInfo(userId:string){
-      let params = new HttpParams();
-      params = params.set("userId", userId);
-
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(environment.apiChatUrl+'users.info', opts);
-    }
-
-    setUserStatus(body:any){
-      let opts = {
-        headers: this.headers,
-      }
-      return this.http.post(environment.apiChatUrl+'users.setStatus', body, this.options);
-    }
-
-    removeChatRoom(body:any){
-      let opts = {
-        headers: this.headers,
-      }
-      return this.http.post(environment.apiChatUrl+'im.delete', body, this.options);
-    }
-
-    createRoom(body:any){
-      return this.http.post(environment.apiChatUrl+'im.create', body, this.options);
-    }
-    getDirectMessage(roomId:string){
-      let params = new HttpParams();
-      params = params.set("roomId", roomId);
-
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(environment.apiChatUrl+'im.messages', opts);
-    }
-
-    /* GROUPS */
-    addGroup(body:any){
-      
-      return this.http.post(environment.apiChatUrl+'groups.create', body, this.options);
-    }
-    setGroupCustomFields(body:any){
-      return this.http.post(environment.apiChatUrl+'groups.setCustomFields', body, this.options);
-    }
-
-    getGroupMembers(roomId:string){
-      let params = new HttpParams();
-      let url=environment.apiChatUrl+'groups.members';
-      params = params.set("roomId", roomId);
-
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(url, opts);
-    }
-
-    getChannelMembers(roomId:string){
-      let params = new HttpParams();
-      let url=environment.apiChatUrl+'channels.members';
-      params = params.set("roomId", roomId);
-
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(url, opts);
-    }
-    /* GROUP MESSAGES */
-    getPrivateGroupMessages(roomId:any){
-
-      let params = new HttpParams();
-      params = params.set("roomId", roomId);
-
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(environment.apiChatUrl+'groups.history', opts);
-    }
-    getPublicGroupMessages(roomId:any){
-      let params = new HttpParams();
-      params = params.set("roomId", roomId);
-
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(environment.apiChatUrl+'channels.history', opts);
-    }
-    closeGroup(body:any){
-      return this.http.post(environment.apiChatUrl+'groups.close', body, this.options);
-    }
-    closeChannel(body:any){
-      return this.http.post(environment.apiChatUrl+'channels.close', body, this.options);
-    }
-    leaveGroup(body:any){
-      return this.http.post(environment.apiChatUrl+'groups.leave', body, this.options);
-    }
-    leaveChannel(body:any){
-      return this.http.post(environment.apiChatUrl+'channels.leave', body, this.options);
-    }
-    removeChannelMember(body:any){
-      let opts = {
-        headers: this.headers,
-      }
-      return this.http.post(environment.apiChatUrl+'channels.kick', body, opts);
-    }
-
-    addChannelOwner(body:any){
-      return this.http.post(environment.apiChatUrl+'channels.addOwner', body, this.options);
-    }
-
-    addGroupOwner(body:any){
-      return this.http.post(environment.apiChatUrl+'groups.addOwner', body, this.options);
-    }
-
-    deleteGroup(body:any){
-      return this.http.post(environment.apiChatUrl+'groups.delete', body, this.options);
-    }
-
-    deleteChannel(body:any){
-      return this.http.post(environment.apiChatUrl+'channels.delete', body, this.options);
-    }
-    addUserToGroup(body:any){
-      return this.http.post(environment.apiChatUrl+'groups.invite', body, this.options);
-    }
-    getGroupInfo(roomId:any){
-      let params = new HttpParams();
-      params = params.set("roomId", roomId);
-
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-      return this.http.get(environment.apiChatUrl+'groups.info', opts);
-    }
-    renameGroup(body:any){
-      return this.http.post(environment.apiChatUrl+'groups.rename', body, this.options);
-    }
-    removeGroupMember(body:any){
-      let opts = {
-        headers: this.headers,
-      }
-      return this.http.post(environment.apiChatUrl+'groups.kick', body, opts);
-    }
-
-    async subscribe(roomId:any) {
-      
-      let params = new HttpParams();
-      params = params.set("roomId", roomId);
-      let opts = {
-        headers: this.headers,
-        params: params
-      }
-
-      this.http.get(environment.apiChatUrl+'im.messages', opts).subscribe(async res => {
-        
-
-        if (res == 502) {
-          // Connection timeout
-          // happens when the connection was pending for too long
-          // let's reconnect
-          await this.subscribe(roomId);
-        } else if (res != 200) {
-          // Show Error
-          //showMessage(response.statusText);
-          this.getRoomMessages(roomId)
-          // Reconnect in one second
-          await new Promise(resolve => setTimeout(resolve, 1000));
-          await this.subscribe(roomId);
-        } else {
-          // Got message
-          //let message = await response.text();
-          this.getRoomMessages(roomId)
-          await this.subscribe(roomId);
+  refreshtoken() {
+    this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey);
+    let options = {
+      headers: this.headers
+    };
+    return this.http.get(environment.apiURL + 'UserAuthentication/RegenereChatToken', options).subscribe(async res => {
+      let data = {
+        status: res['status'],
+        data: {
+          userId: res['data'].userId,
+          authToken: res['data'].authToken
         }
-
-      })
-
-
-    }
+      }
+      SessionStore.user.ChatData = data
+      SessionStore.save()
+      this.setheader()
+      console.log(res)
+      console.log(SessionStore.user.ChatData)
+    });
+  }
 
 }

src/app/services/chat/room.service.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { MessageService } from 'src/app/services/chat/message.service';
 import { showDateDuration } from 'src/plugin/showDateDuration';
-import { ToastsService } from '../toast.service';
 import { chatHistory } from 'src/app/models/chatMethod';
 import { Storage } from '@ionic/storage';
 import { Platform } from '@ionic/angular';
@@ -16,13 +15,14 @@ import { environment } from 'src/environments/environment';
 import { ChatService } from 'src/app/services/chat.service';
 import { NfService } from 'src/app/services/chat/nf.service';
 import { v4 as uuidv4 } from 'uuid'
-import { ChatStorageService } from './chat-storage.service'
-import { ChatMethodsService } from './chat-methods.service'
-import { DeleteMessageModel, MessageModel } from '../../models/beast-orm'
-import { AESEncrypt } from '../aesencrypt.service'
+import { ChatStorageService } from './chat-storage.service';
+import { ChatMethodsService } from './chat-methods.service';
+import { DeleteMessageModel, MessageModel } from '../../models/beast-orm';
+import { AESEncrypt } from '../aesencrypt.service';
 import { IncomingChatMessage, ChatMessageInterface, falseTypingMethod } from 'src/app/models/message.model';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ConnectionStatus, NetworkServiceService} from 'src/app/services/network-service.service';
+import { WsChatMethodsService } from './ws-chat-methods.service';
 
 @Injectable({
   providedIn: 'root'
@@ -52,6 +52,7 @@ export class RoomService {
   members = []
   u
   sessionStore = SessionStore
+  countDownTime = ''
 
   scrollDown = () => { }
 
@@ -80,7 +81,8 @@ export class RoomService {
     private ChatMethodsService: ChatMethodsService,
     private AESEncrypt: AESEncrypt,
     private AttachmentsService: AttachmentsService,
-    private NetworkServiceService: NetworkServiceService
+    private NetworkServiceService: NetworkServiceService,
+    private wsChatMethodsService: WsChatMethodsService
   ) {
     this.NativeNotificationService.askForPermission()
 
@@ -157,6 +159,58 @@ export class RoomService {
 
     this.calDateDuration()
     this.restoreMessageFromDB()
+
+    if(this.customFields?.countDownDate) {
+      this.countDownDate(this.customFields.countDownDate);
+    }
+
+  }
+
+  countDownDate(date) {
+    let difference = new Date(date).getTime() - new Date().getTime();
+    let c_day = Math.floor(difference/(1000*60*60*24));
+    let c_hours = Math.floor((difference % (1000*60*60*24)) / (1000*60*60));
+    let c_minutes = Math.floor((difference % (1000*60*60)) / (1000*60));
+    let c_seconds = Math.floor((difference % (1000*60)) / 1000);
+
+    this.countDownTime = this.addZero(c_day) + " : " + this.addZero(c_hours) + " : " + this.addZero(c_minutes) + " : " + this.addZero(c_seconds) ;
+
+    if(difference < 0) {
+
+      this.deleteRoom()
+
+    } else {
+      setTimeout(() => {
+        this.countDownDate(date)
+      }, 1000)
+    }
+  }
+
+  addZero(i) {
+    if (i < 10) {
+      i = "0" + i;
+    }
+    return i;
+  }
+
+  deleteRoom() {
+    this.countDownTime = "Expired";
+    let body = { "roomId": this.id }
+
+    this.chatService.getRoomInfo(this.id).subscribe(room=>{
+
+
+      if(this.t === 'p') {
+        this.chatService.deleteGroup(body).subscribe(res=>{
+          this.wsChatMethodsService.deleteRoom(this.id)
+        });
+      }
+      else {
+        this.chatService.deleteChannel(body).subscribe(res=>{ 
+          this.wsChatMethodsService.deleteRoom(this.id)
+        });
+      }
+    });
   }
 
 

src/app/services/chat/ws-chat-methods.service.ts

@@ -60,7 +60,7 @@ export class WsChatMethodsService {
     private ChatMethodsService:ChatMethodsService,
     private AESEncrypt: AESEncrypt,
     private AttachmentsService:AttachmentsService,
-    private NetworkServiceService: NetworkServiceService
+    private NetworkServiceService: NetworkServiceService,
   ) {
 
     this.loggedUser = authService.ValidatedUserChat['data'];
@@ -106,14 +106,14 @@ export class WsChatMethodsService {
   }
 
   async ReLoadChat() {
-    await this.restoreRooms()
+    await this.restoreRooms();
     await this.getAllRooms();
-    this.subscribeToRoom()
+    this.subscribeToRoom();
 
 
     //
-    await this.getUser()
-    this.getUserStatus()
+    await this.getUser();
+    this.getUserStatus();
   }
 
   clearChat() {
@@ -321,11 +321,11 @@ export class WsChatMethodsService {
       members: roomData.members
     }
 
-    let roomId = this.getRoomId(roomData)
+    let roomId = this.getRoomId(roomData);
 
     // create room
     if(!this.roomExist(roomId)) {
-      let room:RoomService = new RoomService(this.WsChatService, new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService, this.ChatService, this.NfService , this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService)
+      let room:RoomService = new RoomService(this.WsChatService, new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService, this.ChatService, this.NfService , this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService, this)
       room.setData(setData)
       room.receiveMessage()
       room.getAllUsers = this.getUsers
@@ -365,10 +365,7 @@ export class WsChatMethodsService {
 
   deleteRoom(roomId) {
     delete this.group[roomId];
-
-    const index = this._group.findIndex((e)=> e.id == roomId);
-
-    this._group = this._group.splice(index, 1);
+    this._group = this._group.filter((e)=> e.id != roomId);  
   }
 
   roomExist(roomId) {
@@ -463,7 +460,7 @@ export class WsChatMethodsService {
 
   }
 
-  addRoomOwner(roomid, userId){
+  addRoomOwner(roomid, userId) {
     return this.WsChatService.addRoomOwner(roomid, userId);
   }
 

src/app/services/functions/time.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ChatService } from '../chat.service';
+import { WsChatMethodsService } from '../chat/ws-chat-methods.service';
 
 @Injectable({
   providedIn: 'root'
@@ -8,14 +9,13 @@ export class TimeService {
   countDownTime: any;
   room: any;
 
-  constructor(private chatService: ChatService) { }
+  constructor(private chatService: ChatService,
+    public wsChatMethodsService: WsChatMethodsService,) { }
 
-  showDateDuration(start:any){
+  showDateDuration(start:any) {
     let end;
     end = new Date();
     start = new Date(start);
-    let customizedDate;
-
 
     const totalSeconds     = Math.floor((end - (start))/1000);;
     const totalMinutes     = Math.floor(totalSeconds/60);
@@ -26,51 +26,51 @@ export class TimeService {
     const minutes = totalMinutes - ( totalDays * 24 * 60 ) - ( hours * 60 );
     const seconds = totalSeconds - ( totalDays * 24 * 60 * 60 ) - ( hours * 60 * 60 ) - ( minutes * 60 );
 
-    if(totalDays == 0){
-      if(start.getDate() == new Date().getDate()){
+    if(totalDays == 0) {
+      if(start.getDate() == new Date().getDate()) {
         let time = start.getHours() + ":" + this.addZero(start.getUTCMinutes());
         return time;
       }
-      else{
+      else {
         return 'Ontem';
       }
     }
-    else{
+    else {
       let date = this.addZero(start.getDate()) + "/" + this.addZero(start.getMonth()+1) + "/" + start.getFullYear();
       return date;
     }
   }
 
   countDownDate(date:any, roomId:string){
-    /* let timer = setInterval(() =>{ */
-      let difference = new Date(date).getTime() - new Date().getTime();
-      let c_day = Math.floor(difference/(1000*60*60*24));
-      let c_hours = Math.floor((difference % (1000*60*60*24)) / (1000*60*60));
-      let c_minutes = Math.floor((difference % (1000*60*60)) / (1000*60));
-      let c_seconds = Math.floor((difference % (1000*60)) / 1000);
+    
+    let difference = new Date(date).getTime() - new Date().getTime();
+    let c_day = Math.floor(difference/(1000*60*60*24));
+    let c_hours = Math.floor((difference % (1000*60*60*24)) / (1000*60*60));
+    let c_minutes = Math.floor((difference % (1000*60*60)) / (1000*60));
+    let c_seconds = Math.floor((difference % (1000*60)) / 1000);
 
-      this.countDownTime = this.addZero(c_day) + " : " + this.addZero(c_hours) + " : " + this.addZero(c_minutes) + " : " + this.addZero(c_seconds) ;
+    this.countDownTime = this.addZero(c_day) + " : " + this.addZero(c_hours) + " : " + this.addZero(c_minutes) + " : " + this.addZero(c_seconds) ;
 
-      if(difference < 0){
-        //clearInterval(timer);
-        this.countDownTime = "Expired";
-        let body = { "roomId":roomId, }
-        this.chatService.getRoomInfo(roomId).subscribe(room=>{
-          this.room = room['room'];
+    if(difference < 0){
 
-          if(this.room.t === 'p'){
-            this.chatService.deleteGroup(body).subscribe(res=>{
-              
-            });
-          }
-          else{
-            this.chatService.deleteChannel(body).subscribe(res=>{
-              
-            });
-          }
-        });
-      }
-    //})
+      this.countDownTime = "Expired";
+      let body = { "roomId":roomId, }
+      this.chatService.getRoomInfo(roomId).subscribe(room=>{
+        this.room = room['room'];
+
+        if(this.room.t === 'p'){
+          this.chatService.deleteGroup(body).subscribe(res=>{
+            
+          });
+        }
+        else{
+          this.chatService.deleteChannel(body).subscribe(res=>{
+            
+          });
+        }
+      });
+    }
+    
     return this.countDownTime;
   }
 
@@ -84,7 +84,7 @@ export class TimeService {
 
       this.countDownTime = this.addZero(c_day) + " : " + this.addZero(c_hours) + " : " + this.addZero(c_minutes) + " : " + this.addZero(c_seconds) ;
 
-      if(difference < 0){
+      if(difference < 0) {
         clearInterval(timer);
         this.countDownTime = "Expired";
         let body = { "roomId":roomId, }
@@ -93,12 +93,13 @@ export class TimeService {
 
           if(this.room.t === 'p'){
             this.chatService.deleteGroup(body).subscribe(res=>{
-              
+              this.wsChatMethodsService.deleteRoom(roomId)
             });
           }
           else{
+            
             this.chatService.deleteChannel(body).subscribe(res=>{
-              
+              this.wsChatMethodsService.deleteRoom(roomId)
             });
           }
         });