+
@@ -98,14 +98,14 @@
{{file.title}}
-
+
{{file.description}}
•
- {{msg.displayType}}
+ {{msg.displayType}}
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index d127c1a1d..217ccbc57 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -243,7 +243,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
if (result.value && result.value.recordDataBase64) {
const recordData = result.value.recordDataBase64;
//console.log(recordData);
- const fileName = new Date().getTime() + ".wav";
+ const fileName = new Date().getTime() + ".mp3";
//Save file
this.storage.set('fileName',fileName);
this.storage.set('recordData',result).then(() => {
@@ -388,7 +388,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.wsChatMethodsService.getDmRoom(roomId).send({
file: {
- "type": "aplication/audio",
+ "type": "application/audio",
/* "guid": '', */
},
attachments: [{
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index eab8daecd..789d0a453 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -210,6 +210,7 @@ export class WsChatMethodsService {
* @description sort room list by last message date
*/
sortRoomList =() => {
+
this._dm = this.sortService.sortDate(this._dm,'_updatedAt').reverse()
this._group = this.sortService.sortDate(this._group,'_updatedAt').reverse()
}
@@ -265,6 +266,16 @@ export class WsChatMethodsService {
})
}
+ private fix_updatedAt(message) {
+ if (message.result) {
+ message.result._updatedAt = message.result._updatedAt['$date']
+ } else if(message._updatedAt) {
+ if(message._updatedAt.hasOwnProperty('$date')) {
+ message._updatedAt = message._updatedAt['$date']
+ }
+ }
+ return message
+ }
/**
* @description create a representation of an room in these instance this.dm, this.group ...
@@ -276,13 +287,16 @@ export class WsChatMethodsService {
/**
* @description data used to define or create room
*/
+
+
+ roomData = this.fix_updatedAt(roomData)
const setData = {
customFields: roomData.customFields,
id: this.getRoomId(roomData),
name: this.getRoomName(roomData),
t: roomData.t,
lastMessage: this.getRoomLastMessage(roomData),
- _updatedAt: new Date(roomData._updatedAt['$date']),
+ _updatedAt: new Date( roomData._updatedAt || roomData._updatedAt['$date']),
u : roomData.u || {},
members: roomData.members
}
@@ -297,7 +311,7 @@ export class WsChatMethodsService {
room.getAllUsers = this.getUsers
room.receiveMessageDelete();
room.sortRoomList = this.sortRoomList
-
+
// create individual room
if(this.isIndividual(roomData)) {
@@ -412,9 +426,9 @@ export class WsChatMethodsService {
}
hidingRoom(id?) {
-
+
return this.WsChatService.hidingRoom(id).then(()=>{
- // this.hideRoom(id)
+ // this.hideRoom(id)
})
}
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index bdaa63c9b..3972a4591 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -83,7 +83,7 @@
-
+
@@ -94,14 +94,14 @@
{{file.title}}
-
+
{{file.description}}
•
- {{msg.displayType}}
+ {{msg.displayType}}
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index a50f31fac..245533836 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -315,7 +315,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
if (result.value && result.value.recordDataBase64) {
const recordData = result.value.recordDataBase64;
//console.log(recordData);
- const fileName = new Date().getTime() + ".wav";
+ const fileName = new Date().getTime() + ".mp3";
//Save file
this.storage.set('fileName',fileName);
this.storage.set('recordData',result).then(() => {
@@ -439,7 +439,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
this.wsChatMethodsService.getGroupRoom(roomId).send({
file: {
- "type": "aplication/audio",
+ "type": "application/audio",
/* "guid": '', */
},
attachments: [{
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 1315f0bd3..532881b59 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -96,7 +96,7 @@
-
+
@@ -113,14 +113,14 @@
{{file.title}}
-
+
{{file.description}}
•
- {{msg.displayType}}
+ {{msg.displayType}}
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 8919529a0..320a7ff46 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -291,7 +291,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
if (result.value && result.value.recordDataBase64) {
const recordData = result.value.recordDataBase64;
//console.log(recordData);
- const fileName = new Date().getTime() + ".wav";
+ const fileName = new Date().getTime() + ".mp3";
//Save file
this.storage.set('fileName',fileName);
this.storage.set('recordData',result).then(() => {
@@ -357,8 +357,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
async sendAudio(fileName) {
const roomId = this.roomId
+ let audioFile;
this.storage.get('recordData').then((recordData) => {
console.log(recordData);
+ audioFile = recordData;
if(recordData.value.recordDataBase64.includes('data:audio')){
this.audioRecorded = recordData.value.recordDataBase64;
}
@@ -376,14 +378,16 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.wsChatMethodsService.getDmRoom(roomId).send({
file: {
- "type": "aplication/audio",
+ "type": "application/audio",
/* "guid": '', */
+ "msDuration":audioFile.value.msDuration,
+ "mimeType":audioFile.value.mimeType,
},
attachments: [{
"title": fileName ,
"title_link": this.audioRecorded,
"title_link_download": true,
- "type": "file"
+ "type": "audio"
}],
temporaryData: formData
})
diff --git a/src/assets/icon/theme/gov/icons-chat-mic-white.svg b/src/assets/icon/theme/gov/icons-chat-mic-white.svg
new file mode 100644
index 000000000..20365f766
--- /dev/null
+++ b/src/assets/icon/theme/gov/icons-chat-mic-white.svg
@@ -0,0 +1,7 @@
+