From 7e14da358d1d744ca6891bae958295821c06742a Mon Sep 17 00:00:00 2001 From: sadaf Date: Mon, 25 Sep 2023 01:00:20 +0530 Subject: [PATCH 1/4] feat(UrlParser): - using UrlParser for parsing permit URL --- src/handlers/payout/action.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/handlers/payout/action.ts b/src/handlers/payout/action.ts index 0afe9c424..76e4e1b48 100644 --- a/src/handlers/payout/action.ts +++ b/src/handlers/payout/action.ts @@ -422,9 +422,12 @@ export const handleIssueClosed = async ( assigneeComment = `#### ${title} Reward \n### [ **[ CLAIM ${priceInEth} ${tokenSymbol.toUpperCase()} ]** ](${payoutUrl})\n` + "```" + shortenRecipient + "```"; const permitComments = incentivesCalculation.comments.filter((content) => { - const permitUrlMatches = content.body.match(incentivesCalculation.claimUrlRegex); - if (!permitUrlMatches || permitUrlMatches.length < 2) return false; - else return true; + if (content.body.includes("https://pay.ubq.fi") && content.user.type == UserType.Bot) { + const url = new URL(content.body); + // Check if the URL contains the specific query parameter + return url.searchParams.has("claim"); + } + return false; }); if (permitComments.length > 0) { From 77f99b198c5c5e948bbdea287b5deeeb6a3d4d59 Mon Sep 17 00:00:00 2001 From: sadaf Date: Tue, 26 Sep 2023 14:52:31 +0530 Subject: [PATCH 2/4] fix(url): - extracting url from content before parsing --- src/handlers/payout/action.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/handlers/payout/action.ts b/src/handlers/payout/action.ts index 76e4e1b48..f2200634a 100644 --- a/src/handlers/payout/action.ts +++ b/src/handlers/payout/action.ts @@ -423,9 +423,15 @@ export const handleIssueClosed = async ( `#### ${title} Reward \n### [ **[ CLAIM ${priceInEth} ${tokenSymbol.toUpperCase()} ]** ](${payoutUrl})\n` + "```" + shortenRecipient + "```"; const permitComments = incentivesCalculation.comments.filter((content) => { if (content.body.includes("https://pay.ubq.fi") && content.user.type == UserType.Bot) { - const url = new URL(content.body); + const urlPattern = /(https?|ftp):\/\/[^\s/$.?#].[^\s]*\b/g; + const extractedUrls = content.body.match(urlPattern); + if(extractedUrls) { + for(const extractedUrl of extractedUrls) { + const url = new URL(extractedUrl); + return url.searchParams.has("claim"); + } + } // Check if the URL contains the specific query parameter - return url.searchParams.has("claim"); } return false; }); From 7b9a8519ae7f91d147dbe64fa847b10a49bf8a0f Mon Sep 17 00:00:00 2001 From: sadaf Date: Thu, 28 Sep 2023 08:22:39 +0530 Subject: [PATCH 3/4] fix(configure): changing app id --- .github/workflows/bot.yml | 52 +++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index fa5fedab5..814d9899d 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -38,37 +38,37 @@ jobs: uses: tibdex/github-app-token@v1.7.0 id: get_installation_token with: - app_id: 346074 + app_id: 396874 # https://github.com/organizations/ubiquibot/settings/apps/ubiquibot-qa/installations # https://github.com/apps/ubiquibot-qa/installations/new/permissions?target_id=4975670 # https://github.com/settings/installations/38790399 private_key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- - name: Invoke the UbiquiBot From 288be5029a8ff3ba75dffdd5f44e1f918c440869 Mon Sep 17 00:00:00 2001 From: sadaf Date: Thu, 28 Sep 2023 08:24:58 +0530 Subject: [PATCH 4/4] Revert "fix(configure): changing app id" This reverts commit 7b9a8519ae7f91d147dbe64fa847b10a49bf8a0f. --- .github/workflows/bot.yml | 52 +++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 814d9899d..fa5fedab5 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -38,37 +38,37 @@ jobs: uses: tibdex/github-app-token@v1.7.0 id: get_installation_token with: - app_id: 396874 + app_id: 346074 # https://github.com/organizations/ubiquibot/settings/apps/ubiquibot-qa/installations # https://github.com/apps/ubiquibot-qa/installations/new/permissions?target_id=4975670 # https://github.com/settings/installations/38790399 private_key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- - name: Invoke the UbiquiBot