Merge pull request #800 from stakwork/fix/pay-by-bot

Fix/pay by bot

src/controllers/botapi/pay.ts

@@ -6,10 +6,19 @@ import * as socket from '../../utils/socket'
 import constants from '../../constants'
 import { sphinxLogger } from '../../utils/logger'
 import { errMsgString } from '../../utils/errMsgString'
+import * as rsa from '../../crypto/rsa'
 import { Action, validateAction } from './index'
 
 export default async function pay(a: Action): Promise<void> {
-  const { amount, bot_name, msg_uuid, reply_uuid, recipient_id, parent_id } = a
+  const {
+    amount,
+    bot_name,
+    msg_uuid,
+    reply_uuid,
+    recipient_id,
+    parent_id,
+    content,
+  } = a
 
   sphinxLogger.info(`=> BOT PAY ${JSON.stringify(a, null, 2)}`)
   if (!a.recipient_id) return sphinxLogger.error(`no recipient_id`)
@@ -19,13 +28,18 @@ export default async function pay(a: Action): Promise<void> {
   const tenant: number = owner.id
   const alias = bot_name || owner.alias
   const botContactId = -1
+  const encryptedForMeText = rsa.encrypt(owner.contactKey, content || '')
+  const encryptedText = rsa.encrypt(chat.groupKey, content || '')
+  const textMap = { chat: encryptedText }
 
   const date = new Date()
   date.setMilliseconds(0)
   const msg: { [k: string]: string | number | Date } = {
     chatId: chat.id,
     uuid: msg_uuid || short.generate(),
-    type: constants.message_types.boost,
+    type: reply_uuid
+      ? constants.message_types.boost
+      : constants.message_types.direct_payment,
     sender: botContactId, // tribe owner is escrow holder
     amount: amount || 0,
     date: date,
@@ -35,12 +49,18 @@ export default async function pay(a: Action): Promise<void> {
     updatedAt: date,
     senderAlias: alias,
     tenant,
+    ...(reply_uuid
+      ? {}
+      : {
+          messageContent: encryptedForMeText,
+          remoteMessageContent: JSON.stringify(textMap),
+        }),
   }
   if (parent_id) msg.parentId = parent_id
   const message: Message = (await models.Message.create(msg)) as Message
   socket.sendJson(
     {
-      type: 'boost',
+      type: reply_uuid ? 'boost' : 'direct_payment',
       response: jsonUtils.messageToJson(message, chat, owner),
     },
     tenant
@@ -62,7 +82,10 @@ export default async function pay(a: Action): Promise<void> {
       replyUuid: message.replyUuid,
       parentId: message.parentId || 0,
     },
-    type: constants.message_types.boost,
+    amount: amount || 0,
+    type: reply_uuid
+      ? constants.message_types.boost
+      : constants.message_types.direct_payment,
     success: () => ({ success: true }),
     failure: async (e) => {
       const errorMsg = errMsgString(e)