flip contact to from_group=false if private msg reveived

api/helpers.ts

@@ -158,6 +158,9 @@ async function parseReceiveParams(payload) {
 		chat = await findOrCreateChatByUUID(
 			chat_uuid, [parseInt(owner.id), parseInt(sender.id)]
 		)
+		if(sender.fromGroup===true) { // if a private msg received, update the contact
+			await sender.update({fromGroup:false})
+		}
 	} else { // group
 		sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } })
 		// inject a "sender" with an alias

api/network/receive.ts

@@ -30,7 +30,7 @@ async function onReceive(payload){
 	if(isTribe && typesToForward.includes(payload.type)){
 		const needsPricePerJoin = typesThatNeedPricePerMessage.includes(payload.type)
 		const chat = await models.Chat.findOne({where:{uuid:payload.chat.uuid}})
-		const tribeOwnerPubKey = chat.ownerPubkey
+		const tribeOwnerPubKey = chat && chat.ownerPubkey
 		const owner = await models.Contact.findOne({where: {isOwner:true}})
 		if(owner.publicKey===tribeOwnerPubKey){
 			toAddIn.isTribeOwner = true

dist/api/helpers.js

@@ -171,6 +171,9 @@ function parseReceiveParams(payload) {
         if (isConversation) {
             sender = yield findOrCreateContactByPubkey(sender_pub_key);
             chat = yield findOrCreateChatByUUID(chat_uuid, [parseInt(owner.id), parseInt(sender.id)]);
+            if (sender.fromGroup === true) { // if a private msg received, update the contact
+                yield sender.update({ fromGroup: false });
+            }
         }
         else { // group
             sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } });

dist/api/network/receive.js

@@ -40,7 +40,7 @@ function onReceive(payload) {
         if (isTribe && typesToForward.includes(payload.type)) {
             const needsPricePerJoin = typesThatNeedPricePerMessage.includes(payload.type);
             const chat = yield models_1.models.Chat.findOne({ where: { uuid: payload.chat.uuid } });
-            const tribeOwnerPubKey = chat.ownerPubkey;
+            const tribeOwnerPubKey = chat && chat.ownerPubkey;
             const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
             if (owner.publicKey === tribeOwnerPubKey) {
                 toAddIn.isTribeOwner = true;