fix undefined date at response from websocket api

This commit is contained in:
tiago.kayaya
2022-02-02 10:01:37 +01:00
parent 964a4201c9
commit aad07d8349
3 changed files with 14 additions and 11 deletions
+10 -9
View File
@@ -84,20 +84,21 @@ export class RoomService {
ChatMessage = this.fix_updatedAt(ChatMessage)
console.log('recivemessage', ChatMessage)
const message = this.prepareMessage(ChatMessage)
if(message._updatedAt == undefined){
message._updatedAt = new Date().getTime();
}
this.lastMessage = message
if (message.t == 'r') { this.name = message.msg }
this.calDateDuration(ChatMessage._updatedAt)
this.calDateDuration(message._updatedAt)
this.messages.push(message)
setTimeout(() => {
this.scrollDown()
}, 100)
//this.sortService.sortDate(this.messages, '')
if(SessionStore.user.RochetChatUser != ChatMessage.u.username) {
this.NativeNotificationService.sendNotificationChat({
message: message.msg,
@@ -182,7 +183,7 @@ export class RoomService {
if(message._id == id) {
messages.splice(index, 1)
}
})
this.storage.set('chatmsg' + this.id, messages).then((value) => {
@@ -250,12 +251,12 @@ export class RoomService {
open() {
// this.typing(this.message)
}
leave(rid?) {
this.WsChatService.leaveRoom(this.id)
}
isJson(str) {
try {
JSON.parse(str);
@@ -341,10 +342,10 @@ export class RoomService {
private fix_updatedAt(message) {
if (message.result) {
console.log('FIX UPDATE ', message.result)
//console.log('FIX UPDATE ', message.result)
message.result._updatedAt = message.result._updatedAt['$date']
} else {
// console.log('FIX UPDATE 11', message)
//console.log('FIX UPDATE 11', message)
message._updatedAt = message._updatedAt['$date']
}
return message
@@ -68,7 +68,7 @@
</div>
<div class="title">
<ion-label>{{msg.u.name}}</ion-label>
<span class="time">{{showDateDuration(msg._updatedAt)}}</span>
<span class="time">{{showDateDuration(msg.duration)}}</span>
</div>
<div>
<div *ngIf="msg.attachments" class="message-attachments">
@@ -66,7 +66,9 @@ export class ChatPopoverPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then((res)=>{
this.leaveGroup();
if(res.data == 'success'){
this.leaveGroup();
}
});
}