Merge pull request #111 from stakwork/fixboost

Fixboost
stakwork · Nov 25, 2020 · b13aec5 · b13aec5
2 parents 45820a3 + c01033f
commit b13aec5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/dist/src/controllers/messages.js b/dist/src/controllers/messages.js
diff --git a/dist/src/controllers/messages.js.map b/dist/src/controllers/messages.js.map
diff --git a/dist/src/network/receive.js b/dist/src/network/receive.js
diff --git a/dist/src/network/receive.js.map b/dist/src/network/receive.js.map
diff --git a/src/controllers/messages.ts b/src/controllers/messages.ts
@@ -158,6 +158,7 @@ export const sendMessage = async (req, res) => {
 		amount,
 		reply_uuid,
 		boost,
+		message_price,
 	} = req.body
 
 	let msgtype = constants.message_types.message
@@ -182,19 +183,23 @@ export const sendMessage = async (req, res) => {
 		}})
 		if(ogMsg && ogMsg.sender) {
 			realSatsContactId = ogMsg.sender
-		}	
+		}
 	}
 
 	const hasRealAmount = amount && amount>constants.min_sat_amount
 
 	const remoteMessageContent = remote_text_map?JSON.stringify(remote_text_map) : remote_text
 	const uuid = short.generate()
+	let amtToStore = amount || 0
+	if(boost && message_price && typeof message_price==='number' && amount && message_price<amount) {
+		amtToStore = amount - message_price
+	}
 	const msg:{[k:string]:any}={
 		chatId: chat.id,
 		uuid: uuid,
 		type: msgtype,
 		sender: owner.id,
-		amount: amount||0,
+		amount: amtToStore,
 		date: date,
 		messageContent: text,
 		remoteMessageContent,

diff --git a/src/network/receive.ts b/src/network/receive.ts
@@ -130,11 +130,14 @@ async function onReceive(payload){
 			const ogMsg = await models.Message.findOne({where:{
 				uuid: payload.message.replyUuid,
 			}})
-			if(ogMsg && ogMsg.sender && ogMsg.sender!==1) {
+			if(ogMsg && ogMsg.sender) { // even include "me"
 				const theAmtToForward = payload.message.amount - (chat.pricePerMessage||0) - (chat.escrowAmount||0)
 				if(theAmtToForward>0) {
 					realSatsContactId = ogMsg.sender
 					amtToForward = theAmtToForward
+					if(amtToForward && payload.message && payload.message.amount) { 
+						payload.message.amount = amtToForward // mutate the payload amount
+					}
 				}
 			}
 		}