improve chat remove loop

This commit is contained in:
Peter Maquiran
2022-01-11 15:43:09 +01:00
parent a8a1307bec
commit dcee5aa2f4
9 changed files with 96 additions and 84 deletions
+10 -45
View File
@@ -19,6 +19,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
import { ChatService as ChatServiceGPR} from 'src/app/services/chat/chat.service'
@Component({
selector: 'app-messages',
@@ -77,27 +78,17 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
public ThemeService: ThemeService,
private changeDetectorRef: ChangeDetectorRef,
private router: Router,
public ChatServiceGPR: ChatServiceGPR
) {
this.loggedUser = authService.ValidatedUserChat['data'];
/* this.dm = this.navParams.get('dm'); */
}
ngOnChanges(changes: SimpleChanges): void {
this.load();
//throw new Error('Method not implemented.');
this.ChatServiceGPR.getRoom(this.roomId).loadHistory()
}
ngOnInit() {
this.scrollToBottom();
/* setInterval(()=>{ */
this.load();
/* }, 9000); */
console.log(this.roomId);
console.log("Chat route", this.route.url)
this.setStatus('online');
}
@@ -223,19 +214,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}
sendMessage() {
let body = {
"message":
{
"rid": this.roomId, "msg": this.message,
}
}
this.chatService.sendMessage(body).subscribe(res=> {
this.scrollingOnce = true;
});
this.ChatServiceGPR.getRoom(this.roomId).send(this.message)
this.message = "";
}
deleteMessage(msgId:string){
deleteMessage(msgId:string) {
let body = {
"roomId": this.roomId,
"msgId": msgId,
@@ -247,23 +230,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}); */
}
loadMessages(){
//this.showLoader = true;
const roomId = this.roomId
this.chatService.getRoomMessages(this.roomId).subscribe(res => {
console.log(res);
this.messages = res['messages'].reverse();
this.chatMessageStore.add(roomId, this.messages)
console.log(this.messages);
//this.serverLongPull(res)
/* this.chatService.subscribe(this.roomId).then(res => {
console.log("Real fake msg", res)
}); */
//this.showLoader = false;
})
}
async viewDocument(msg:any, url?:string){
if(msg.file.type == "application/img"){
let response:any = await this.fileService.getFile(msg.file.guid).toPromise();
@@ -539,7 +505,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.showLoader = false;
//this.addDocGestaoDocumental();
}
this.loadMessages();
});
}
@@ -555,7 +520,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
if (res['success'] == true) {
// Show Error
//showMessage(response.statusText);
this.loadMessages()
this.messages = res['messages'].reverse();
this.chatMessageStore.add(roomId, this.messages)
@@ -567,7 +531,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
else{
if(document.querySelector('app-messages')){
await new Promise(resolve => setTimeout(resolve, 5000));
await this.serverLongPull();
// await this.serverLongPull();
this.getDirectMessages.emit();
console.log('Timer message running')
}
@@ -580,10 +544,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} */
}, (error)=>{
console.log(error);
this.serverLongPull();
// this.serverLongPull();
});
}sliderOpts = {
}
sliderOpts = {
zoom: false,
slidesPerView: 1.5,
spaceBetween: 20,