From e19f57f7f95952ec81bbe9de77a4198d86a085d5 Mon Sep 17 00:00:00 2001 From: PhilReact Date: Sat, 11 Jan 2025 18:29:23 +0200 Subject: [PATCH] update send chat message qortalRequest --- src/components/Apps/AppViewer.tsx | 2 +- src/qortalRequests.ts | 4 +- src/qortalRequests/get.ts | 158 ++++++++++++++++++++++++------ 3 files changed, 133 insertions(+), 31 deletions(-) diff --git a/src/components/Apps/AppViewer.tsx b/src/components/Apps/AppViewer.tsx index 583a017..cb2e64f 100644 --- a/src/components/Apps/AppViewer.tsx +++ b/src/components/Apps/AppViewer.tsx @@ -162,7 +162,7 @@ export const AppViewer = React.forwardRef(({ app , hide}, iframeRef) => { height: !isMobile ? '100vh' : `calc(${rootHeight} - 60px - 45px )`, border: 'none', width: '100%' - }} id="browser-iframe" src={defaultUrl} sandbox="allow-scripts allow-same-origin allow-forms allow-modals" allow="fullscreen"> + }} id="browser-iframe" src={defaultUrl} sandbox="allow-scripts allow-same-origin allow-forms allow-modals" allow="fullscreen; clipboard-read; clipboard-write"> diff --git a/src/qortalRequests.ts b/src/qortalRequests.ts index 723b20e..75426b0 100644 --- a/src/qortalRequests.ts +++ b/src/qortalRequests.ts @@ -339,7 +339,7 @@ export const isRunningGateway = async ()=> { case "GET_USER_WALLET": { try { - const res = await getUserWallet(request.payload, isFromExtension); + const res = await getUserWallet(request.payload, isFromExtension, appInfo); event.source.postMessage({ requestId: request.requestId, action: request.action, @@ -379,7 +379,7 @@ export const isRunningGateway = async ()=> { case "GET_USER_WALLET_INFO": { try { - const res = await getUserWalletInfo(request.payload, isFromExtension); + const res = await getUserWalletInfo(request.payload, isFromExtension, appInfo); event.source.postMessage({ requestId: request.requestId, action: request.action, diff --git a/src/qortalRequests/get.ts b/src/qortalRequests/get.ts index ec09876..45908c7 100644 --- a/src/qortalRequests/get.ts +++ b/src/qortalRequests/get.ts @@ -1306,13 +1306,39 @@ export const createPoll = async (data, isFromExtension) => { } }; +function isBase64(str) { + const base64Regex = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/; + return base64Regex.test(str) && str.length % 4 === 0; +} + +function checkValue(value) { + if (typeof value === "string") { + if (isBase64(value)) { + return 'string' + } else { + return 'string' + } + } else if (typeof value === "object" && value !== null) { + return 'object' + } else { + throw new Error('Field fullContent is in an invalid format. Either use a string, base64 or an object.') + } +} + export const sendChatMessage = async (data, isFromExtension, appInfo) => { const message = data?.message; - const fullMessageObject = data?.fullMessageObject - const recipient = data.destinationAddress; + const fullMessageObject = data?.fullMessageObject || data?.fullContent + const recipient = data?.destinationAddress || data.recipient; const groupId = data.groupId; - const isRecipient = !groupId; - + const isRecipient = groupId === undefined; + const chatReference = data?.chatReference + if(groupId === undefined && recipient === undefined){ + throw new Error('Please provide a recipient or groupId') + } + let fullMessageObjectType + if(fullMessageObject){ + fullMessageObjectType = checkValue(fullMessageObject) + } const value = (await getPermission(`qAPPSendChatMessage-${appInfo?.name}`)) || false; let skip = false; @@ -1326,7 +1352,7 @@ if (!skip) { text1: "Do you give this application permission to send this chat message?", text2: `To: ${isRecipient ? recipient : `group ${groupId}`}`, - text3: `${message?.slice(0, 25)}${message?.length > 25 ? "..." : ""}`, + text3: fullMessageObject ? fullMessageObjectType === 'string' ? `${fullMessageObject?.slice(0, 25)}${fullMessageObject?.length > 25 ? "..." : ""}` : `${JSON.stringify(fullMessageObject)?.slice(0, 25)}${JSON.stringify(fullMessageObject)?.length > 25 ? "..." : ""}` : `${message?.slice(0, 25)}${message?.length > 25 ? "..." : ""}`, checkbox1: { value: false, label: "Always allow chat messages from this app", @@ -1361,7 +1387,11 @@ if (!skip) { version: 3, }; - const stringifyMessageObject = JSON.stringify(messageObject); + let stringifyMessageObject = JSON.stringify(messageObject); + if(fullMessageObjectType === 'string'){ + stringifyMessageObject = messageObject + } + const balance = await getBalanceInfo(); const hasEnoughBalance = +balance < 4 ? false : true; @@ -1417,16 +1447,22 @@ if (!skip) { publicKey: uint8PublicKey, }; + let handleDynamicValues = {} + if(chatReference){ + handleDynamicValues['chatReference'] = chatReference + } + const tx = await createTransaction(18, keyPair, { timestamp: sendTimestamp, recipient: recipient, recipientPublicKey: key, - hasChatReference: 0, + hasChatReference: chatReference ? 1 : 0, message: stringifyMessageObject, lastReference: reference, proofOfWorkNonce: 0, isEncrypted: 1, isText: 1, + ...handleDynamicValues }); const chatBytes = tx.chatBytes; @@ -1455,16 +1491,22 @@ if (!skip) { publicKey: uint8PublicKey, }; + let handleDynamicValues = {} + if(chatReference){ + handleDynamicValues['chatReference'] = chatReference + } + const txBody = { timestamp: Date.now(), groupID: Number(groupId), hasReceipient: 0, - hasChatReference: 0, + hasChatReference: chatReference ? 1 : 0, message: stringifyMessageObject, lastReference: reference, proofOfWorkNonce: 0, isEncrypted: 0, // Set default to not encrypted for groups isText: 1, + ...handleDynamicValues }; const tx = await createTransaction(181, keyPair, txBody); @@ -1652,7 +1694,7 @@ export const deployAt = async (data, isFromExtension) => { } }; -export const getUserWallet = async (data, isFromExtension) => { +export const getUserWallet = async (data, isFromExtension, appInfo) => { const requiredFields = ["coin"]; const missingFields: string[] = []; requiredFields.forEach((field) => { @@ -1671,14 +1713,39 @@ export const getUserWallet = async (data, isFromExtension) => { throw new Error( "Cannot view ARRR wallet info through the gateway. Please use your local node." ); - const resPermission = await getUserPermission({ + const value = + (await getPermission( + `qAPPAutoGetUserWallet-${appInfo?.name}-${data.coin}` + )) || false; + let skip = false; + if (value) { + skip = true; + } + + let resPermission; + + if (!skip) { + resPermission = await getUserPermission({ text1: "Do you give this application permission to get your wallet information?", - highlightedText: `coin: ${data.coin}` + highlightedText: `coin: ${data.coin}`, + checkbox1: { + value: true, + label: "Always allow wallet to be retrieved automatically", + }, }, isFromExtension); - const { accepted } = resPermission; +} - if (accepted) { +const { accepted = false, checkbox1 = false } = resPermission || {}; + +if (resPermission) { + setPermission( + `qAPPAutoGetUserWallet-${appInfo?.name}-${data.coin}`, + checkbox1 + ); +} + + if (accepted || skip) { let coin = data.coin; let userWallet = {}; let arrrAddress = ""; @@ -1950,7 +2017,7 @@ export const getUserWalletFunc = async (coin) => { return userWallet; }; -export const getUserWalletInfo = async (data, isFromExtension) => { +export const getUserWalletInfo = async (data, isFromExtension, appInfo) => { const requiredFields = ["coin"]; const missingFields: string[] = []; requiredFields.forEach((field) => { @@ -1969,13 +2036,37 @@ export const getUserWalletInfo = async (data, isFromExtension) => { "ARRR is not supported for this call." ); } - const resPermission = await getUserPermission({ - text1: "Do you give this application permission to retrieve your wallet information", - highlightedText: `coin: ${data.coin}` - }, isFromExtension); - const { accepted } = resPermission; + const value = + (await getPermission( + `getUserWalletInfo-${appInfo?.name}-${data.coin}` + )) || false; +let skip = false; +if (value) { + skip = true; +} + let resPermission; - if (accepted) { + if (!skip) { + + resPermission = await getUserPermission({ + text1: "Do you give this application permission to retrieve your wallet information", + highlightedText: `coin: ${data.coin}`, + checkbox1: { + value: true, + label: "Always allow wallet info to be retrieved automatically", + }, + }, isFromExtension); +} +const { accepted = false, checkbox1 = false } = resPermission || {}; + +if (resPermission) { + setPermission( + `getUserWalletInfo-${appInfo?.name}-${data.coin}`, + checkbox1 + ); +} + + if (accepted || skip) { let coin = data.coin; let walletKeys = await getUserWalletFunc(coin); const _url = await createEndpoint( @@ -2440,7 +2531,7 @@ export const getTxActivitySummary = async (data) => { }; export const sendCoin = async (data, isFromExtension) => { - const requiredFields = ['coin', 'destinationAddress', 'amount'] + const requiredFields = ['coin', 'amount'] const missingFields: string[] = [] requiredFields.forEach((field) => { if (!data[field]) { @@ -2452,6 +2543,10 @@ export const sendCoin = async (data, isFromExtension) => { const errorMsg = `Missing fields: ${missingFieldsString}` throw new Error(errorMsg) } + if(!data?.destinationAddress && !data?.recipient){ + throw new Error('Missing fields: recipient') + } + let checkCoin = data.coin const wallet = await getSaveWallet(); const address = wallet.address0; @@ -2466,7 +2561,8 @@ export const sendCoin = async (data, isFromExtension) => { // then set the response string from the core to the `response` variable (defined above) // If they decline, send back JSON that includes an `error` key, such as `{"error": "User declined request"}` const amount = Number(data.amount) - const recipient = data.destinationAddress + const recipient = data?.recipient || data.destinationAddress; + const url = await createEndpoint(`/addresses/balance/${address}`); const response = await fetch(url); @@ -2516,7 +2612,8 @@ export const sendCoin = async (data, isFromExtension) => { } else if (checkCoin === "BTC") { const amount = Number(data.amount) - const recipient = data.destinationAddress + const recipient = data?.recipient || data.destinationAddress; + const xprv58 = parsedData.btcPrivateKey const feePerByte = data.fee ? data.fee : btcFeePerByte @@ -2573,7 +2670,8 @@ export const sendCoin = async (data, isFromExtension) => { } else if (checkCoin === "LTC") { const amount = Number(data.amount) - const recipient = data.destinationAddress + const recipient = data?.recipient || data.destinationAddress; + const xprv58 = parsedData.ltcPrivateKey const feePerByte = data.fee ? data.fee : ltcFeePerByte const ltcWalletBalance = await getWalletBalance({coin: checkCoin}, true) @@ -2627,7 +2725,8 @@ export const sendCoin = async (data, isFromExtension) => { } else if (checkCoin === "DOGE") { const amount = Number(data.amount) - const recipient = data.destinationAddress + const recipient = data?.recipient || data.destinationAddress; + const coin = data.coin const xprv58 = parsedData.dogePrivateKey const feePerByte = data.fee ? data.fee : dogeFeePerByte @@ -2683,7 +2782,8 @@ export const sendCoin = async (data, isFromExtension) => { } else if (checkCoin === "DGB") { const amount = Number(data.amount) - const recipient = data.destinationAddress + const recipient = data?.recipient || data.destinationAddress; + const xprv58 = parsedData.dbgPrivateKey const feePerByte = data.fee ? data.fee : dgbFeePerByte const dgbWalletBalance = await getWalletBalance({coin: checkCoin}, true) @@ -2738,7 +2838,8 @@ export const sendCoin = async (data, isFromExtension) => { } else if (checkCoin === "RVN") { const amount = Number(data.amount) - const recipient = data.destinationAddress + const recipient = data?.recipient || data.destinationAddress; + const coin = data.coin const xprv58 = parsedData.rvnPrivateKey const feePerByte = data.fee ? data.fee : rvnFeePerByte @@ -2794,7 +2895,8 @@ export const sendCoin = async (data, isFromExtension) => { } } else if (checkCoin === "ARRR") { const amount = Number(data.amount) - const recipient = data.destinationAddress + const recipient = data?.recipient || data.destinationAddress; + const memo = data?.memo const arrrWalletBalance = await getWalletBalance({coin: checkCoin}, true)