better conf

dist/src/controllers/invoices.js

@@ -242,8 +242,7 @@ exports.receiveInvoice = (payload) => __awaiter(void 0, void 0, void 0, function
         response: jsonUtils.messageToJson(message, chat, sender)
     });
     hub_1.sendNotification(chat, msg.senderAlias || sender.alias, 'message');
-    const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] });
+    confirmations_1.sendConfirmation({ chat, sender: owner, msg_id, receiver: sender });
-    confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id, receiver: sender });
 });
 // lnd invoice stuff
 function decodePaymentRequest(paymentRequest) {

dist/src/controllers/media.js

@@ -428,8 +428,7 @@ exports.receiveAttachment = (payload) => __awaiter(void 0, void 0, void 0, funct
         response: jsonUtils.messageToJson(message, chat, sender)
     });
     hub_1.sendNotification(chat, msg.senderAlias || sender.alias, 'message');
-    const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] });
+    confirmations_1.sendConfirmation({ chat, sender: owner, msg_id, receiver: sender });
-    confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id, receiver: sender });
 });
 function signer(req, res) {
     return __awaiter(this, void 0, void 0, function* () {

dist/src/controllers/messages.js

@@ -260,8 +260,7 @@ exports.receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function
         response: jsonUtils.messageToJson(message, chat, sender)
     });
     hub_1.sendNotification(chat, msg.senderAlias || sender.alias, 'message');
-    const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] });
+    confirmations_1.sendConfirmation({ chat, sender: owner, msg_id, receiver: sender });
-    confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id, receiver: sender });
 });
 exports.receiveBoost = (payload) => __awaiter(void 0, void 0, void 0, function* () {
     const { owner, sender, chat, content, remote_content, chat_type, sender_alias, msg_uuid, date_string, reply_uuid, amount, network_type, sender_photo_url, msg_id } = yield helpers.parseReceiveParams(payload);
@@ -301,8 +300,7 @@ exports.receiveBoost = (payload) => __awaiter(void 0, void 0, void 0, function*
         type: 'boost',
         response: jsonUtils.messageToJson(message, chat, sender)
     });
-    const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] });
+    confirmations_1.sendConfirmation({ chat, sender: owner, msg_id, receiver: sender });
-    confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id, receiver: sender });
     if (msg.replyUuid) {
         const ogMsg = yield models_1.models.Message.findOne({
             where: { uuid: msg.replyUuid }

dist/src/helpers.js

@@ -56,7 +56,7 @@ exports.sendContactKeys = ({ type, contactIds, sender, success, failure, dontAct
             return;
         destination_key = contact.publicKey;
         console.log("=> KEY EXCHANGE", msg);
-        exports.performKeysendMessage({
+        yield exports.performKeysendMessage({
             sender,
             destination_key,
             amount: 3,
@@ -68,6 +68,7 @@ exports.sendContactKeys = ({ type, contactIds, sender, success, failure, dontAct
                 no = error;
             }
         });
+        yield sleep(1000);
     }));
     if (no && failure) {
         failure(no);

src/controllers/invoices.ts

@@ -265,8 +265,7 @@ export const receiveInvoice = async (payload) => {
 
   sendNotification(chat, msg.senderAlias || sender.alias, 'message')
 
-  const theChat = { ...chat.dataValues, contactIds: [sender.id] }
+  sendConfirmation({ chat, sender: owner, msg_id, receiver: sender })
-  sendConfirmation({ chat: theChat, sender: owner, msg_id, receiver: sender })
 }
 
 // lnd invoice stuff

src/controllers/media.ts

@@ -467,8 +467,7 @@ export const receiveAttachment = async (payload) => {
 
   sendNotification(chat, msg.senderAlias || sender.alias, 'message')
 
-  const theChat = { ...chat.dataValues, contactIds: [sender.id] }
+  sendConfirmation({ chat, sender: owner, msg_id, receiver: sender })
-  sendConfirmation({ chat: theChat, sender: owner, msg_id, receiver: sender })
 }
 
 export async function signer(req, res) {

src/controllers/messages.ts

@@ -289,8 +289,7 @@ export const receiveMessage = async (payload) => {
 
 	sendNotification(chat, msg.senderAlias || sender.alias, 'message')
 
-	const theChat = { ...chat.dataValues, contactIds: [sender.id] }
+	sendConfirmation({ chat, sender: owner, msg_id, receiver: sender })
-	sendConfirmation({ chat: theChat, sender: owner, msg_id, receiver: sender })
 }
 
 export const receiveBoost = async (payload) => {
@@ -332,8 +331,7 @@ export const receiveBoost = async (payload) => {
 		response: jsonUtils.messageToJson(message, chat, sender)
 	})
 
-	const theChat = { ...chat.dataValues, contactIds: [sender.id] }
+	sendConfirmation({ chat, sender: owner, msg_id, receiver: sender })
-	sendConfirmation({ chat: theChat, sender: owner, msg_id, receiver: sender })
 
 	if (msg.replyUuid) {
 		const ogMsg = await models.Message.findOne({

src/helpers.ts

@@ -51,7 +51,7 @@ export const sendContactKeys = async ({ type, contactIds, sender, success, failu
 		destination_key = contact.publicKey
 
 		console.log("=> KEY EXCHANGE", msg)
-		performKeysendMessage({
+		await performKeysendMessage({
 			sender,
 			destination_key,
 			amount: 3,
@@ -63,6 +63,7 @@ export const sendContactKeys = async ({ type, contactIds, sender, success, failu
 				no = error
 			}
 		})
+		await sleep(1000)
 	})
 	if (no && failure) {
 		failure(no)