Merge pull request #80 from stakwork/rolez

Rolez

api/controllers/actions.ts

@@ -162,13 +162,14 @@ export async function finalAction(a:Action, bot_id:string){
         })
         await network.sendMessage({
             chat: theChat,
-            sender: { ...owner.dataValues, alias, id:botContactId },
+            sender: { ...owner.dataValues, alias, id:botContactId, role: constants.chat_roles.reader },
             message: { content: textMap, id: message.id, uuid: message.uuid },
             type: constants.message_types.bot_res,
             success: () => ({ success: true }),
             failure: (e) => {
                 throw e
-            }
+            },
+            isForwarded: true,
         })
 
     } else {

api/controllers/chatTribes.ts

@@ -420,6 +420,7 @@ export async function replayChatHistory(chat, contact) {
 		const sender = {
 			...owner.dataValues,
 			...m.senderAlias && {alias: m.senderAlias},
+			role: constants.chat_roles.reader,
 		}
 		let content = ''
 		try {content = JSON.parse(m.remoteMessageContent)} catch(e) {}

api/controllers/messages.ts

@@ -161,7 +161,7 @@ export const sendMessage = async (req, res) => {
 		reply_uuid,
 	} = req.body
 
-	var date = new Date();
+	var date = new Date()
 	date.setMilliseconds(0)
 
   	const owner = await models.Contact.findOne({ where: { isOwner: true }})

api/network/intercept.ts

@@ -69,7 +69,7 @@ export async function isBotMsg(msg: Msg, sentByMe: boolean): Promise<boolean> {
 }
 
 async function emitMessageToBot(msg, botInTribe): Promise<boolean> {
-  // console.log('emitMessageToBot',msg)
+  console.log('=> emitMessageToBot',JSON.stringify(msg,null,2))
   switch (botInTribe.botType) {
     case constants.bot_types.builtin:
       builtinBotEmit(msg)

api/network/modify.ts

@@ -84,13 +84,15 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
       chat: {...chat.dataValues, contactIds:[ogmsg.sender]},
       sender: {
         ...owner.dataValues,
-        ...purchaser&&purchaser.alias && {alias:purchaser.alias}
+        ...purchaser&&purchaser.alias && {alias:purchaser.alias},
+        role: constants.chat_roles.reader,
       },
       type: constants.message_types.purchase,
       message: msg,
       amount: amount,
       success: ()=>{},
-      failure: ()=>{}
+      failure: ()=>{},
+      isForwarded: true,
     })
   }
 }
@@ -131,7 +133,8 @@ export async function sendFinalMemeIfFirstPurchaser(payload, chat, sender){
   sendMessage({
 		sender: {
 			...owner.dataValues,
-			...sender&&sender.alias && {alias:sender.alias}
+      ...sender&&sender.alias && {alias:sender.alias},
+      role: constants.chat_roles.reader,
 		},
     chat:{
       ...chat.dataValues,
@@ -144,7 +147,8 @@ export async function sendFinalMemeIfFirstPurchaser(payload, chat, sender){
       originalMuid:muid,
     },
 		success: ()=>{},
-		receive: ()=>{}
+    receive: ()=>{},
+    isForwarded: true,
 	})
 }
 

api/network/receive.ts

@@ -193,7 +193,8 @@ async function forwardMessageToTribe(ogpayload, sender){
 		chat: chat,
 		skipPubKey: payload.sender.pub_key, 
 		success: ()=>{},
-		receive: ()=>{}
+		receive: ()=>{},
+		isForwarded: true,
 	})
 }
 

api/network/send.ts

@@ -15,8 +15,17 @@ type NetworkType = undefined | 'mqtt' | 'lightning'
 const MIN_SATS = 3;
 
 export async function sendMessage(params) {
-	const { type, chat, message, sender, amount, success, failure, skipPubKey } = params
+	const { type, chat, message, sender, amount, success, failure, skipPubKey, isForwarded } = params
-	let msg = newmsg(type, chat, sender, message)
+	if(!chat || !sender) return
+
+	const isTribe = chat.type===constants.chat_types.tribe
+	let isTribeOwner = isTribe && sender.publicKey===chat.ownerPubkey
+	
+	let theSender = (sender.dataValues||sender)
+	if(isTribeOwner && !isForwarded) {
+		theSender = {...(sender.dataValues||sender), role:constants.chat_roles.owner}
+	}
+	let msg = newmsg(type, chat, theSender, message)
 
 	// console.log("=> MSG TO SEND",msg)
 
@@ -35,12 +44,8 @@ export async function sendMessage(params) {
 	}
 
 	let networkType:NetworkType = undefined
-	const isTribe = chat.type===constants.chat_types.tribe
-	let isTribeOwner = false
 	const chatUUID = chat.uuid
 	if(isTribe) {
-		const tribeOwnerPubKey = chat.ownerPubkey
-		isTribeOwner = sender.publicKey===tribeOwnerPubKey
 		if(type===constants.message_types.confirmation) {
 			// if u are owner, go ahead!
 			if(!isTribeOwner) return // dont send confs for tribe if not owner
@@ -58,7 +63,7 @@ export async function sendMessage(params) {
 			tribes.putActivity(chat.uuid, chat.host)
 		} else {
 			// if tribe, send to owner only
-			const tribeOwner = await models.Contact.findOne({where: {publicKey:tribeOwnerPubKey}})
+			const tribeOwner = await models.Contact.findOne({where: {publicKey:chat.ownerPubkey}})
 			contactIds = tribeOwner ? [tribeOwner.id] : []
 		}
 	}

dist/api/controllers/actions.js

@@ -168,13 +168,14 @@ function finalAction(a, bot_id) {
             });
             yield network.sendMessage({
                 chat: theChat,
-                sender: Object.assign(Object.assign({}, owner.dataValues), { alias, id: botContactId }),
+                sender: Object.assign(Object.assign({}, owner.dataValues), { alias, id: botContactId, role: constants.chat_roles.reader }),
                 message: { content: textMap, id: message.id, uuid: message.uuid },
                 type: constants.message_types.bot_res,
                 success: () => ({ success: true }),
                 failure: (e) => {
                     throw e;
-                }
+                },
+                isForwarded: true,
             });
         }
         else {

dist/api/controllers/chatTribes.js

@@ -416,7 +416,7 @@ function replayChatHistory(chat, contact) {
         asyncForEach(msgs, (m) => __awaiter(this, void 0, void 0, function* () {
             if (!network.typesToReplay.includes(m.type))
                 return; // only for message for now
-            const sender = Object.assign(Object.assign({}, owner.dataValues), m.senderAlias && { alias: m.senderAlias });
+            const sender = Object.assign(Object.assign(Object.assign({}, owner.dataValues), m.senderAlias && { alias: m.senderAlias }), { role: constants.chat_roles.reader });
             let content = '';
             try {
                 content = JSON.parse(m.remoteMessageContent);

dist/api/network/intercept.js

@@ -77,7 +77,7 @@ function isBotMsg(msg, sentByMe) {
 exports.isBotMsg = isBotMsg;
 function emitMessageToBot(msg, botInTribe) {
     return __awaiter(this, void 0, void 0, function* () {
-        // console.log('emitMessageToBot',msg)
+        console.log('=> emitMessageToBot', JSON.stringify(msg, null, 2));
         switch (botInTribe.botType) {
             case constants.bot_types.builtin:
                 builtin_1.builtinBotEmit(msg);

dist/api/network/intercept.js.map

@@ -1 +1 @@
-{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../api/network/intercept.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../api/network/intercept.ts"],"names":[],"mappings":"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"}

dist/api/network/modify.js

@@ -96,12 +96,13 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
             const msg = { mediaToken: mt, purchaser: purchaser.id };
             send_1.sendMessage({
                 chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [ogmsg.sender] }),
-                sender: Object.assign(Object.assign({}, owner.dataValues), purchaser && purchaser.alias && { alias: purchaser.alias }),
+                sender: Object.assign(Object.assign(Object.assign({}, owner.dataValues), purchaser && purchaser.alias && { alias: purchaser.alias }), { role: constants.chat_roles.reader }),
                 type: constants.message_types.purchase,
                 message: msg,
                 amount: amount,
                 success: () => { },
-                failure: () => { }
+                failure: () => { },
+                isForwarded: true,
             });
         }
     });
@@ -138,12 +139,13 @@ function sendFinalMemeIfFirstPurchaser(payload, chat, sender) {
         // send it to the purchaser
         const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
         send_1.sendMessage({
-            sender: Object.assign(Object.assign({}, owner.dataValues), sender && sender.alias && { alias: sender.alias }),
+            sender: Object.assign(Object.assign(Object.assign({}, owner.dataValues), sender && sender.alias && { alias: sender.alias }), { role: constants.chat_roles.reader }),
             chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [ogPurchaser.id] }),
             type: msgtypes.purchase_accept,
             message: Object.assign(Object.assign({}, termsAndKey), { mediaType: typ, originalMuid: muid }),
             success: () => { },
-            receive: () => { }
+            receive: () => { },
+            isForwarded: true,
         });
     });
 }

dist/api/network/receive.js

@@ -209,7 +209,8 @@ function forwardMessageToTribe(ogpayload, sender) {
             chat: chat,
             skipPubKey: payload.sender.pub_key,
             success: () => { },
-            receive: () => { }
+            receive: () => { },
+            isForwarded: true,
         });
     });
 }

dist/api/network/send.js

@@ -22,8 +22,16 @@ const constants = require(path.join(__dirname, '../../config/constants.json'));
 const MIN_SATS = 3;
 function sendMessage(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { type, chat, message, sender, amount, success, failure, skipPubKey } = params;
+        const { type, chat, message, sender, amount, success, failure, skipPubKey, isForwarded } = params;
-        let msg = newmsg(type, chat, sender, message);
+        if (!chat || !sender)
+            return;
+        const isTribe = chat.type === constants.chat_types.tribe;
+        let isTribeOwner = isTribe && sender.publicKey === chat.ownerPubkey;
+        let theSender = (sender.dataValues || sender);
+        if (isTribeOwner && !isForwarded) {
+            theSender = Object.assign(Object.assign({}, (sender.dataValues || sender)), { role: constants.chat_roles.owner });
+        }
+        let msg = newmsg(type, chat, theSender, message);
         // console.log("=> MSG TO SEND",msg)
         // console.log(type,message)
         if (!(sender && sender.publicKey)) {
@@ -39,12 +47,8 @@ function sendMessage(params) {
             }
         }
         let networkType = undefined;
-        const isTribe = chat.type === constants.chat_types.tribe;
-        let isTribeOwner = false;
         const chatUUID = chat.uuid;
         if (isTribe) {
-            const tribeOwnerPubKey = chat.ownerPubkey;
-            isTribeOwner = sender.publicKey === tribeOwnerPubKey;
             if (type === constants.message_types.confirmation) {
                 // if u are owner, go ahead!
                 if (!isTribeOwner)
@@ -64,7 +68,7 @@ function sendMessage(params) {
             }
             else {
                 // if tribe, send to owner only
-                const tribeOwner = yield models_1.models.Contact.findOne({ where: { publicKey: tribeOwnerPubKey } });
+                const tribeOwner = yield models_1.models.Contact.findOne({ where: { publicKey: chat.ownerPubkey } });
                 contactIds = tribeOwner ? [tribeOwner.id] : [];
             }
         }