Fix/database functions #849

0x4007 · 2023-10-04T21:04:54Z

Still hacking away at this. Overtaking #644

Just rebuild this due to merge conflicts.

ref: ubiquity#697 (comment)

0x4007 · 2023-10-07T21:26:15Z

Database backup and schema backup: Archive.zip

Will do some due diligence and verify the code to be mostly functional before pushing this through.

0x4007 · 2023-10-07T21:27:55Z

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
    env:
      SUPABASE_ACCESS_TOKEN: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_SUPABASE_ACCESS_TOKEN || secrets.STAGING_SUPABASE_ACCESS_TOKEN }}
      SUPABASE_DB_PASSWORD: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_SUPABASE_DB_PASSWORD || secrets.STAGING_SUPABASE_DB_PASSWORD }}
-      PROJECT_ID: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_SUPABASE_PROJECT_ID || secrets.STAGING_SUPABASE_PROJECT_ID }}
+      SUPABASE_PROJECT_ID: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_SUPABASE_PROJECT_ID || secrets.STAGING_SUPABASE_PROJECT_ID }}


Update secret

0x4007 · 2023-10-07T21:28:37Z

.github/workflows/e2e-test.yml

+          LOG_ENVIRONMENT: "production"
+          SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
+          SUPABASE_KEY: ${{ secrets.SUPABASE_KEY }}
+          X25519_PRIVATE_KEY: "QCDb30UHUkwJAGhLWC-R2N0PiEbd4vQY6qH2Wloybyo"
+          APP_ID: ${{ secrets.APP_ID }}
+          PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          WEBHOOK_PROXY_URL: ${{ secrets.WEBHOOK_PROXY_URL }}
+          WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
+          TEST_ORGANIZATION_NAME: ${{ secrets.TEST_ORGANIZATION_NAME }}
+          TEST_REPOSITORY_NAME: ${{ secrets.TEST_REPOSITORY_NAME }}
+          TEST_ADMIN_PAT: ${{ secrets.TEST_ADMIN_PAT }}
+          TEST_OUTSIDE_COLLABORATOR_PAT: ${{ secrets.TEST_OUTSIDE_COLLABORATOR_PAT }}


These will probably need to be updated as I think I'll use a new database instance to drop all the old unused triggers/functions/enums etc from the old database.

0x4007 · 2023-10-07T21:29:50Z

src/adapters/index.ts

+      access: new Access(client),
+      wallet: new Wallet(client),
+      user: new User(client),
+      debit: new Settlement(client),
+      settlement: new Settlement(client),
+      label: new Label(client),
+      super: new Super(client),


Pretty major refactoring where I tried to associate an object to handle every interaction with a table of its namesake.

0x4007 · 2023-10-07T21:32:57Z

src/bindings/event.ts

+  info: (msg: string, options?: JSON) => string;
+  debug: (msg: string, options?: JSON) => string;
+  warn: (msg: string, options?: JSON) => string;
+  error: (msg: string, options?: JSON) => string;


Now we can throw and return logger.xxx() without being redundant and copying the string twice.

0x4007 · 2023-10-07T21:33:44Z

src/configs/strings.ts

@@ -1,5 +1,5 @@
 export const GLOBAL_STRINGS = {
-  unassignComment: "Releasing the bounty back to dev pool because the allocated duration already ended!",
+  unassignComment: "Releasing the task due to lack of updates.",


I removed 'bounty' from the terminology everywhere to make this more widely appealing.

0x4007 · 2023-10-07T21:34:13Z

src/handlers/access/labels-access.ts

  const sender = payload.sender.login;
  const repo = payload.repository;
-  const permissionLevel = await getUserPermission(sender, context);
+  const userCan = await isUserAdminOrBillingManager(sender, context);


isUserAdminOrBillingManager was incorrectly implemented. I fixed it.

0x4007 · 2023-10-07T21:35:26Z

src/handlers/comment/handlers/allow.ts

 import { Payload } from "../../../types";

-export const setAccess = async (body: string) => {
+export async function setAccess(body: string): Promise<string> {


Traditional function declarations are superior for general use. The only time arrow functions should be used are for tiny functions that are inlined.

0x4007 · 2023-10-07T21:37:52Z

src/handlers/comment/handlers/payout.ts

+// export async function payout(body: string) {
+//   const { payload: _payload } = getBotContext();
+//   const logger = getLogger();
+//   if (body != IssueCommentCommands.PAYOUT && body.replace(/`/g, "") != IssueCommentCommands.PAYOUT) {
+//     logger.info(`Skipping to payout. body: ${body}`);
+//     return;
+//   }

-  const payload = _payload as Payload;
-  logger.info(`Received '/payout' command from user: ${payload.sender.login}`);
-  const issue = (_payload as Payload).issue;
-  if (!issue) {
-    logger.info(`Skipping '/payout' because of no issue instance`);
-    return;
-  }
+//   const payload = _payload as Payload;
+//   logger.info(`Received '/payout' command from user: ${payload.sender.login}`);
+//   const issue = (_payload as Payload).issue;
+//   if (!issue) {
+//     logger.info(`Skipping '/payout' because of no issue instance`);
+//     return;
+//   }

-  const _labels = payload.issue?.labels;
-  if (_labels?.some((e) => e.name.toLowerCase() === "Permitted".toLowerCase())) {
-    logger.info(`Permit already generated for ${payload.issue?.number}`);
-    return;
-  }
+//   const _labels = payload.issue?.labels;
+//   if (_labels?.some((e) => e.name.toLowerCase() === "Permitted".toLowerCase())) {
+//     logger.info(`Permit already generated for ${payload.issue?.number}`);
+//     return;
+//   }

-  const IssueComments = await getAllIssueComments(issue.number);
-  if (IssueComments.length === 0) {
-    return `Permit generation failed due to internal GitHub Error`;
-  }
+//   const IssueComments = await getAllIssueComments(issue.number);
+//   if (IssueComments.length === 0) {
+//     return `Permit generation failed due to internal GitHub Error`;
+//   }

-  const hasPosted = IssueComments.find((e) => e.user.type === "Bot" && e.body.includes("https://pay.ubq.fi?claim"));
-  if (hasPosted) {
-    logger.info(`Permit already generated for ${payload.issue?.number}`);
-    return;
-  }
+//   const hasPosted = IssueComments.find((e) => e.user.type === "Bot" && e.body.includes("https://pay.ubq.fi?claim"));
+//   if (hasPosted) {
+//     logger.info(`Permit already generated for ${payload.issue?.number}`);
+//     return;
+//   }

-  // assign function incentivesCalculation to a variable
-  const calculateIncentives = await incentivesCalculation();
+//   // assign function incentivesCalculation to a variable
+//   const calculateIncentives = await incentivesCalculation();

-  const creatorReward = await calculateIssueCreatorReward(calculateIncentives);
-  const assigneeReward = await calculateIssueAssigneeReward(calculateIncentives);
-  const conversationRewards = await calculateIssueConversationReward(calculateIncentives);
-  const pullRequestReviewersReward = await calculatePullRequestReviewsReward(calculateIncentives);
+//   const creatorReward = await calculateIssueCreatorReward(calculateIncentives);
+//   const assigneeReward = await calculateIssueAssigneeReward(calculateIncentives);
+//   const conversationRewards = await calculateIssueConversationReward(calculateIncentives);
+//   const pullRequestReviewersReward = await calculateReviewContributorRewards(calculateIncentives);

-  return await handleIssueClosed(creatorReward, assigneeReward, conversationRewards, pullRequestReviewersReward, calculateIncentives);
-};
+//   return await handleIssueClosed(creatorReward, assigneeReward, conversationRewards, pullRequestReviewersReward, calculateIncentives);
+// }


I'm unsure why I left this commented out. I have yet to see this used in production. Perhaps this was implemented incorrectly? Or else I'll need to review later.

This was never called anywhere.

0x4007 · 2023-10-07T21:38:37Z

src/handlers/comment/handlers/query.ts

+      resultMessage += `@${user}'s access levels are set as follows:\n
+  Multiplier: ${multiplier}\n
+  Reason: ${multiplier_reason}\n
+  Labels: ${JSON.stringify(labels)}\n


Labels are now dynamic. I just listed the array here.

0x4007 · 2023-10-07T21:39:46Z

src/handlers/payout/action.ts

This file was a bit insane. I think I broke it apart into 14 separate files most of which are over a hundred lines of code long.

0x4007 · 2023-10-07T21:42:09Z

src/handlers/payout/shims.ts

This file should soon be consolidated elsewhere. This originally acted as my crutch while I was refactoring.

0x4007 · 2023-10-07T21:43:32Z

supabase/migrations/20230730153700_permit.sql

These were collateral damage from find and replace nuking "bounty" from the codebase.

0x4007 · 2023-10-07T21:44:18Z

src/utils/web-assets.ts

Vestige from partially implemented Telegram bot.

whilefoo and others added 30 commits August 20, 2023 11:01

feat: e2e test setup

92b5b86

refactor: small adjustments

1e88b4e

refactor: small adjustments

d1acd0a

fix(build): remove unused variable

f350a5c

feat: add more tests

fe36b25

fix: ignore kebab-case in tests

78bb917

feat: added tests

b3081cf

Merge remote-tracking branch 'upstream/development' into e2e-tests

db1850f

feat: more tests

8fb1bce

feat: rate limit

2639a8f

feat: longer timeout

fc7cdf0

Merge remote-tracking branch 'upstream/development' into e2e-tests

064cdc0

Merge remote-tracking branch 'upstream/development' into e2e-tests

794f793

feat: update tests

51bc95f

Merge branch 'development' into refactor/general

35d36ca

Delete yarn.lock

5721a06

Just rebuild this due to merge conflicts.

Merge remote-tracking branch 'upstream/development' into e2e-tests

5e14775

fix: types

29e2cb4

build: create yarn lock

6c66c01

fix: comment and duplication

f89d38b

feat: workflow

cc89117

Merge remote-tracking branch 'upstream/development' into e2e-tests

308b6c2

feat: longer delays

8ba4743

Merge branch 'feat/cspell' into refactor/general

4892b69

refactor: paymentPermitMaxPrice to permitMaxPrice

0f87a1a

refactor: maxConcurrentBounties to maxConcurrentTasks

66b3f35

fix: defaults

751e3d2

fix: security related default feature enabled

db3685b

refactor: enableAccessControl to publicAccessControl

cd3c4b2

ref: ubiquity#697 (comment)

refactor: enableAccessControl to publicAccessControl cleanup

f067479

0x4007 and others added 8 commits October 8, 2023 04:29

fix: type errors

5be3203

fix(credits): type errors

79b1631

fix: all type errors solved

a545e96

fix(ci): lint

5df2579

chore: rename to kebab case in progress

03bd004

chore: rename to kebab case in progress

c0756ce

chore: rename to kebab case in progress

de87bf0

Update kebab-case.yml

97ed659

0x4007 marked this pull request as ready for review October 7, 2023 21:26

0x4007 requested a review from 0xcodercrane as a code owner October 7, 2023 21:26

0x4007 commented Oct 7, 2023

View reviewed changes

src/utils/web-assets.ts Outdated

Copy link

Member Author

0x4007 Oct 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vestige from partially implemented Telegram bot.

0x4007 added 4 commits October 8, 2023 16:59

feat: source map support

cb0842b

fix: bot starts up

6212c3f

fix(logger): can find

457f59a

fix(logging): debugging

503c337

0x4007 closed this Oct 9, 2023

0x4007 mentioned this pull request Oct 9, 2023

Refactor/general #644

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/database functions #849

Fix/database functions #849

0x4007 commented Oct 4, 2023 •

edited

Loading

0x4007 commented Oct 7, 2023 •

edited

Loading

0x4007 Oct 7, 2023

0x4007 Oct 7, 2023

0x4007 Oct 7, 2023

0x4007 Oct 7, 2023

0x4007 Oct 7, 2023

0x4007 Oct 7, 2023 •

edited

Loading

0x4007 Oct 7, 2023

0x4007 Oct 7, 2023

0x4007 Oct 8, 2023

0x4007 Oct 7, 2023

0x4007 Oct 7, 2023 •

edited

Loading

0x4007 Oct 7, 2023

0x4007 Oct 7, 2023

0x4007 Oct 7, 2023

Fix/database functions #849

Fix/database functions #849

Conversation

0x4007 commented Oct 4, 2023 • edited Loading

0x4007 commented Oct 7, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0x4007 Oct 7, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0x4007 Oct 7, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0x4007 commented Oct 4, 2023 •

edited

Loading

0x4007 commented Oct 7, 2023 •

edited

Loading

0x4007 Oct 7, 2023 •

edited

Loading

0x4007 Oct 7, 2023 •

edited

Loading