fix approve or deny result

api/controllers/chatTribes.ts

@@ -114,13 +114,14 @@ export async function joinTribe(req, res){
 }
 
 export async function receiveMemberRequest(payload) {
+	console.log('=> receiveMemberRequest')
 	const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner } = await helpers.parseReceiveParams(payload)
 
 	const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
-	if (!chat) return
+	if (!chat) return console.log('no chat')
 
 	const isTribe = chat_type===constants.chat_types.tribe
-	if(!isTribe || !isTribeOwner) return
+	if(!isTribe || !isTribeOwner) return console.log('not a tribe')
 
 	var date = new Date()
 	date.setMilliseconds(0)
@@ -273,29 +274,30 @@ export async function approveOrRejectMember(req,res) {
 	const msg:{[k:string]:any} = {
 		chatId: chat.id,
 		type: constants.message_types[msgType],
-		sender: (member && member.contactId) || 0,
+		sender: member.contactId,
 		messageContent:'', remoteMessageContent:'',
 		status: constants.statuses.confirmed,
 		date: date, createdAt: date, updatedAt: date
 	}
-	const message = await models.Message.create(msg)
+	await models.Message.create(msg)
 
-	const theChat = await addPendingContactIdsToChat(chat)
+	const owner = await models.Contact.findOne({ where: { isOwner: true } })
-	const cont = await models.Contact.findOne({where:{id:contactId}})
+	network.sendMessage({ // send to the requester
-	socket.sendJson({
+		chat: { ...chat, contactIds: [member.contactId], },
-		type: msgType,
+		amount: 0,
-		response: {
+		sender: owner,
-			contact: jsonUtils.contactToJson(cont||{}),
+		message: {},
-			chat: jsonUtils.chatToJson(theChat),
+		type: constants.message_types[msgType],
-			message: jsonUtils.messageToJson(message, null)
-		}
 	})
+
+	const theChat = await addPendingContactIdsToChat(chat)
+	success(res, jsonUtils.chatToJson(theChat))
 }
 
 export async function receiveMemberApprove(payload) {
 	console.log('=> receiveMemberApprove')
 	const { owner, chat, chat_name, sender } = await helpers.parseReceiveParams(payload)
-	if(!chat) return
+	if(!chat) return console.log('no chat')
 	await chat.update({status: constants.chat_statuses.approved})
 
 	let date = new Date()

dist/api/controllers/chatTribes.js

@@ -118,13 +118,14 @@ function joinTribe(req, res) {
 exports.joinTribe = joinTribe;
 function receiveMemberRequest(payload) {
     return __awaiter(this, void 0, void 0, function* () {
+        console.log('=> receiveMemberRequest');
         const { sender_pub_key, sender_alias, chat_uuid, chat_members, chat_type, isTribeOwner } = yield helpers.parseReceiveParams(payload);
         const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
         if (!chat)
-            return;
+            return console.log('no chat');
         const isTribe = chat_type === constants.chat_types.tribe;
         if (!isTribe || !isTribeOwner)
-            return;
+            return console.log('not a tribe');
         var date = new Date();
         date.setMilliseconds(0);
         let theSender = null;
@@ -263,22 +264,22 @@ function approveOrRejectMember(req, res) {
         const msg = {
             chatId: chat.id,
             type: constants.message_types[msgType],
-            sender: (member && member.contactId) || 0,
+            sender: member.contactId,
             messageContent: '', remoteMessageContent: '',
             status: constants.statuses.confirmed,
             date: date, createdAt: date, updatedAt: date
         };
-        const message = yield models_1.models.Message.create(msg);
+        yield models_1.models.Message.create(msg);
-        const theChat = yield addPendingContactIdsToChat(chat);
+        const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
-        const cont = yield models_1.models.Contact.findOne({ where: { id: contactId } });
+        network.sendMessage({
-        socket.sendJson({
+            chat: Object.assign(Object.assign({}, chat), { contactIds: [member.contactId] }),
-            type: msgType,
+            amount: 0,
-            response: {
+            sender: owner,
-                contact: jsonUtils.contactToJson(cont || {}),
+            message: {},
-                chat: jsonUtils.chatToJson(theChat),
+            type: constants.message_types[msgType],
-                message: jsonUtils.messageToJson(message, null)
-            }
         });
+        const theChat = yield addPendingContactIdsToChat(chat);
+        res_1.success(res, jsonUtils.chatToJson(theChat));
     });
 }
 exports.approveOrRejectMember = approveOrRejectMember;
@@ -287,7 +288,7 @@ function receiveMemberApprove(payload) {
         console.log('=> receiveMemberApprove');
         const { owner, chat, chat_name, sender } = yield helpers.parseReceiveParams(payload);
         if (!chat)
-            return;
+            return console.log('no chat');
         yield chat.update({ status: constants.chat_statuses.approved });
         let date = new Date();
         date.setMilliseconds(0);