Date_string

api/controllers/chatTribes.ts

@@ -166,7 +166,7 @@ async function replayChatHistory(chat, contact) {
 		let content = ''
 		try {content = JSON.parse(m.remoteMessageContent)} catch(e) {}
 
-		console.log(m.date, typeof m.date, m.data.toISOString())
+		console.log(m.date, typeof m.date, m.date.toISOString())
 		const dateString = m.date&&m.date.toISOString()
 		let mediaKeyMap
 		let newMediaTerms

api/controllers/chats.ts

@@ -198,7 +198,7 @@ const deleteChat = async (req, res) => {
 
 async function receiveGroupJoin(payload) {
 	console.log('=> receiveGroupJoin')
-	const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner } = await helpers.parseReceiveParams(payload)
+	const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, date_string } = await helpers.parseReceiveParams(payload)
 
 	const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
 	if (!chat) return
@@ -207,6 +207,7 @@ async function receiveGroupJoin(payload) {
 
 	var date = new Date()
 	date.setMilliseconds(0)
+	if(date_string) date=new Date(date_string)
 
 	let theSender: any = null
 	const member = chat_members[sender_pub_key]
@@ -285,7 +286,7 @@ async function receiveGroupJoin(payload) {
 
 async function receiveGroupLeave(payload) {
 	console.log('=> receiveGroupLeave')
-	const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner } = await helpers.parseReceiveParams(payload)
+	const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner, date_string } = await helpers.parseReceiveParams(payload)
 
 	const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
 	if (!chat) return
@@ -317,6 +318,7 @@ async function receiveGroupLeave(payload) {
 
 	var date = new Date();
 	date.setMilliseconds(0)
+	if(date_string) date=new Date(date_string)
 	const msg:{[k:string]:any} = {
 		chatId: chat.id,
 		type: constants.message_types.group_leave,

api/controllers/messages.ts

@@ -159,12 +159,14 @@ const receiveMessage = async (payload) => {
 	date.setMilliseconds(0)
 
 	const total_spent = 1
-	const {owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid} = await helpers.parseReceiveParams(payload)
+	const {owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string} = await helpers.parseReceiveParams(payload)
 	if(!owner || !sender || !chat) {
 		return console.log('=> no group chat!')
 	}
 	const text = content
 
+	if(date_string) date=new Date(date_string)
+
 	const msg:{[k:string]:any} = {
 		chatId: chat.id,
 		uuid: msg_uuid,

api/helpers.ts

@@ -150,6 +150,7 @@ async function parseReceiveParams(payload) {
 	const msg_uuid = dat.message.uuid||''
 	const mediaKey = dat.message.mediaKey
 	const mediaType = dat.message.mediaType
+	const date_string = dat.message.date
 	const isTribeOwner = dat.isTribeOwner?true:false
 
 	const isConversation = !chat_type || (chat_type && chat_type == constants.chat_types.conversation)
@@ -172,7 +173,7 @@ async function parseReceiveParams(payload) {
 		}
 		chat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
 	}
-	return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, originalMuid, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key, remote_content, msg_uuid }
+	return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, originalMuid, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key, remote_content, msg_uuid, date_string }
 }
 
 export {

dist/api/controllers/chatTribes.js

@@ -164,7 +164,7 @@ function replayChatHistory(chat, contact) {
                 content = JSON.parse(m.remoteMessageContent);
             }
             catch (e) { }
-            console.log(m.date, typeof m.date, m.data.toISOString());
+            console.log(m.date, typeof m.date, m.date.toISOString());
             const dateString = m.date && m.date.toISOString();
             let mediaKeyMap;
             let newMediaTerms;

dist/api/controllers/chats.js

@@ -192,13 +192,15 @@ exports.deleteChat = deleteChat;
 function receiveGroupJoin(payload) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('=> receiveGroupJoin');
-        const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner } = yield helpers.parseReceiveParams(payload);
+        const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner, date_string } = yield helpers.parseReceiveParams(payload);
         const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
         if (!chat)
             return;
         const isTribe = chat_type === constants.chat_types.tribe;
         var date = new Date();
         date.setMilliseconds(0);
+        if (date_string)
+            date = new Date(date_string);
         let theSender = null;
         const member = chat_members[sender_pub_key];
         const senderAlias = sender_alias || (member && member.alias) || 'Unknown';
@@ -276,7 +278,7 @@ exports.receiveGroupJoin = receiveGroupJoin;
 function receiveGroupLeave(payload) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('=> receiveGroupLeave');
-        const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner } = yield helpers.parseReceiveParams(payload);
+        const { sender_pub_key, chat_uuid, chat_type, sender_alias, isTribeOwner, date_string } = yield helpers.parseReceiveParams(payload);
         const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
         if (!chat)
             return;
@@ -305,6 +307,8 @@ function receiveGroupLeave(payload) {
         }
         var date = new Date();
         date.setMilliseconds(0);
+        if (date_string)
+            date = new Date(date_string);
         const msg = {
             chatId: chat.id,
             type: constants.message_types.group_leave,

dist/api/controllers/messages.js

@@ -142,11 +142,13 @@ const receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function*
     var date = new Date();
     date.setMilliseconds(0);
     const total_spent = 1;
-    const { owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid } = yield helpers.parseReceiveParams(payload);
+    const { owner, sender, chat, content, remote_content, msg_id, chat_type, sender_alias, msg_uuid, date_string } = yield helpers.parseReceiveParams(payload);
     if (!owner || !sender || !chat) {
         return console.log('=> no group chat!');
     }
     const text = content;
+    if (date_string)
+        date = new Date(date_string);
     const msg = {
         chatId: chat.id,
         uuid: msg_uuid,

dist/api/helpers.js

@@ -166,6 +166,7 @@ function parseReceiveParams(payload) {
         const msg_uuid = dat.message.uuid || '';
         const mediaKey = dat.message.mediaKey;
         const mediaType = dat.message.mediaType;
+        const date_string = dat.message.date;
         const isTribeOwner = dat.isTribeOwner ? true : false;
         const isConversation = !chat_type || (chat_type && chat_type == constants.chat_types.conversation);
         let sender;
@@ -186,7 +187,7 @@ function parseReceiveParams(payload) {
             }
             chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
         }
-        return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, originalMuid, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key, remote_content, msg_uuid };
+        return { owner, sender, chat, sender_pub_key, sender_alias, isTribeOwner, chat_uuid, amount, content, mediaToken, mediaKey, mediaType, originalMuid, chat_type, msg_id, chat_members, chat_name, chat_host, chat_key, remote_content, msg_uuid, date_string };
     });
 }
 exports.parseReceiveParams = parseReceiveParams;