Merge branch 'master' into paid-invites

api/controllers/media.ts

@@ -179,7 +179,7 @@ const purchase = async (req, res) => {
     amount, mediaToken, id:message.id,
   }
   helpers.sendMessage({
-    chat: {...chat, contactIds:[contact_id]},
+    chat: {...chat.dataValues, contactIds:[contact_id]},
     sender: owner,
     type: constants.message_types.purchase,
     message: msg,
@@ -247,7 +247,7 @@ const receivePurchase = async (payload) => {
 
   if (amount < price) { // didnt pay enough
     return helpers.sendMessage({ // "purchase_deny"
-      chat: {...chat, contactIds:[sender.id]}, // only send back to sender
+      chat: {...chat.dataValues, contactIds:[sender.id]}, // only send back to sender
       sender: owner,
       amount: amount,
       type: constants.message_types.purchase_deny,
@@ -264,7 +264,7 @@ const receivePurchase = async (payload) => {
     meta: {amt:amount},
   }
   helpers.sendMessage({
-    chat: {...chat, contactIds:[sender.id]}, // only to sender
+    chat: {...chat.dataValues, contactIds:[sender.id]}, // only to sender
     sender: owner,
     type: constants.message_types.purchase_accept,
     message: {

dist/api/controllers/media.js

@@ -158,7 +158,7 @@ const purchase = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         amount, mediaToken, id: message.id,
     };
     helpers.sendMessage({
-        chat: Object.assign(Object.assign({}, chat), { contactIds: [contact_id] }),
+        chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [contact_id] }),
         sender: owner,
         type: constants.message_types.purchase,
         message: msg,
@@ -220,7 +220,7 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
     }
     if (amount < price) { // didnt pay enough
         return helpers.sendMessage({
-            chat: Object.assign(Object.assign({}, chat), { contactIds: [sender.id] }),
+            chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }),
             sender: owner,
             amount: amount,
             type: constants.message_types.purchase_deny,
@@ -236,7 +236,7 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
         meta: { amt: amount },
     };
     helpers.sendMessage({
-        chat: Object.assign(Object.assign({}, chat), { contactIds: [sender.id] }),
+        chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }),
         sender: owner,
         type: constants.message_types.purchase_accept,
         message: {