diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index b57a3b0df..938b4847a 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -52,7 +52,7 @@ export class ChatPage implements OnInit {
userChannels: any[];
userDirectMessages: any[];
result:any;
- dmUsers:any;
+ dmUsers:any[] = [];
idSelected: string;
desktopComponent: any = {
@@ -137,18 +137,19 @@ export class ChatPage implements OnInit {
/* Fim websocket functions */
this.hideRefreshButton();
+ this.getChatMembers();
}
hideRefreshButton(){
window.onresize = (event) => {
- if( window.innerWidth < 801) {
+ if( window.innerWidth < 701) {
this.hideRefreshBtn = false;
}
else{
this.hideRefreshBtn = true;
}
}
- if(window.innerWidth < 801){
+ if(window.innerWidth < 701){
console.log('YASS');
this.hideRefreshBtn = false;
}
@@ -244,7 +245,7 @@ hideRefreshButton(){
this.idSelected = rid;
console.log(rid);
- if( window.innerWidth < 801){
+ if( window.innerWidth < 701){
this.openGroupMessagesModal(rid);
}
else{
@@ -265,7 +266,7 @@ hideRefreshButton(){
}
});
this.closeAllDesktopComponents();
- if(window.innerWidth < 801){
+ if(window.innerWidth < 701){
console.log('Mobile');
}
else{
@@ -310,9 +311,18 @@ hideRefreshButton(){
onSegmentChange(){
this.load();
}
- doRefresh(){
+
+ doRefresh(event){
+ setTimeout(() => {
+ this.load();
+ event.target.complete();
+ }, 1000);
+ }
+
+ refreshing(){
this.load();
}
+
load(){
switch (this.segment)
{
@@ -346,11 +356,17 @@ hideRefreshButton(){
});
console.log(this.userDirectMessages);
this.showLoader = false;
+
});
}
- getChatMembers(){
- this.chatService.getMembers(this.userDirectMessages[0]._id).subscribe(res=> {
- this.dmUsers = res['members'].filter(data => data.username != this.loggedUserChat.me.username)
+
+ async getChatMembers(){
+ //return await this.chatService.getMembers(roomId).toPromise();
+ this.chatService.getAllUsers().subscribe(res=> {
+ console.log(res);
+
+ this.dmUsers = res['users'].filter(data => data.username != this.loggedUserChat.me.username);
+ console.log(this.dmUsers);
});
}
getGroups(){
@@ -411,7 +427,7 @@ hideRefreshButton(){
const modal = await this.modalController.create({
component: MessagesPage,
- cssClass: 'modal modal-desktop',
+ cssClass: 'modal modal-desktop messagesChatOpened',
componentProps: {
roomId: roomId,
},
@@ -426,7 +442,7 @@ hideRefreshButton(){
const modal = await this.modalController.create({
component: GroupMessagesPage,
- cssClass: 'modal modal-desktop',
+ cssClass: 'modal modal-desktop groupChatOpened',
componentProps: {
roomId: roomId,
},
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 8ab068fa2..5ff32424b 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -113,6 +113,7 @@ export class GroupMessagesPage implements OnInit, AfterViewChecked {
});
}
}
+
loadGroupMessages(room:any){
this.showLoader = true;
//If group is private call getGroupMembers
@@ -266,9 +267,12 @@ export class GroupMessagesPage implements OnInit, AfterViewChecked {
if(this.route.url != "/home/chat"){
console.log("Timer message stop")
} else {
- await new Promise(resolve => setTimeout(resolve, 1000));
- await this.serverLongPull();
- console.log('Timer message running')
+ //Check if modal is opened
+ if(document.querySelector('.groupChatOpened')){
+ await new Promise(resolve => setTimeout(resolve, 1000));
+ await this.serverLongPull();
+ console.log('Timer message running')
+ }
}
} else {
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index c08b9e153..25d59107d 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -185,9 +185,12 @@ export class MessagesPage implements OnInit, AfterViewChecked {
if(this.route.url != "/home/chat"){
console.log("Timer message stop")
} else {
- await new Promise(resolve => setTimeout(resolve, 1000));
- await this.serverLongPull();
- console.log('Timer message running')
+ //Check if modal is opened
+ if(document.querySelector('.messagesChatOpened')){
+ await new Promise(resolve => setTimeout(resolve, 1000));
+ await this.serverLongPull();
+ console.log('Timer message running')
+ }
}
} else {
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 189a37314..0107c2930 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -128,6 +128,18 @@ export class ChatService {
}
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);
+ }
+
removeChatRoom(body:any){
let opts = {
headers: this.headers,
@@ -247,9 +259,9 @@ export class ChatService {
console.log('Subcrive')
let params = new HttpParams();
params = params.set("roomId", roomId);
- let opts = {
- headers: this.headers,
- params: params
+ let opts = {
+ headers: this.headers,
+ params: params
}
this.http.get(environment.apiChatUrl+'im.messages', opts).subscribe(async res => {
@@ -275,8 +287,8 @@ export class ChatService {
}
})
-
-
+
+
}
}