chore: update config (ubiquity#847)

* chore: update config * chore: update config * chore: update config * chore: update config * chore: update config * chore: update config * test: update config
ubiquity-whilefoo · Oct 2, 2023 · f0b3ac9 · f0b3ac9
1 parent 062dee5
commit f0b3ac9
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 55 deletions.
diff --git a/src/bindings/config.ts b/src/bindings/config.ts
@@ -1,14 +1,6 @@
 import ms from "ms";
 
 import { BotConfig, BotConfigSchema, LogLevel } from "../types";
-import {
-  DEFAULT_BOT_DELAY,
-  DEFAULT_DISQUALIFY_TIME,
-  DEFAULT_FOLLOWUP_TIME,
-  DEFAULT_PERMIT_BASE_URL,
-  DEFAULT_TIME_RANGE_FOR_MAX_ISSUE,
-  DEFAULT_TIME_RANGE_FOR_MAX_ISSUE_ENABLED,
-} from "../configs";
 import { getPayoutConfigByNetworkId } from "../helpers";
 import { ajv } from "../utils";
 import { Context } from "probot";
@@ -37,6 +29,12 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
     openAIKey,
     openAITokenLimit,
     newContributorGreeting,
+    timeRangeForMaxIssueEnabled,
+    timeRangeForMaxIssue,
+    permitBaseUrl,
+    botDelay,
+    followUpTime,
+    disqualifyTime,
   } = await getWideConfig(context);
 
   const publicKey = await getScalarKey(process.env.X25519_PRIVATE_KEY);
@@ -64,25 +62,25 @@ export const loadConfig = async (context: Context): Promise<BotConfig> => {
       rpc: rpc,
       privateKey: privateKey,
       paymentToken: paymentToken,
-      permitBaseUrl: process.env.PERMIT_BASE_URL || DEFAULT_PERMIT_BASE_URL,
+      permitBaseUrl: process.env.PERMIT_BASE_URL || permitBaseUrl,
     },
     unassign: {
       timeRangeForMaxIssue: process.env.DEFAULT_TIME_RANGE_FOR_MAX_ISSUE
         ? Number(process.env.DEFAULT_TIME_RANGE_FOR_MAX_ISSUE)
-        : DEFAULT_TIME_RANGE_FOR_MAX_ISSUE,
+        : timeRangeForMaxIssue,
       timeRangeForMaxIssueEnabled: process.env.DEFAULT_TIME_RANGE_FOR_MAX_ISSUE_ENABLED
         ? process.env.DEFAULT_TIME_RANGE_FOR_MAX_ISSUE_ENABLED == "true"
-        : DEFAULT_TIME_RANGE_FOR_MAX_ISSUE_ENABLED,
-      followUpTime: ms(process.env.FOLLOW_UP_TIME || DEFAULT_FOLLOWUP_TIME),
-      disqualifyTime: ms(process.env.DISQUALIFY_TIME || DEFAULT_DISQUALIFY_TIME),
+        : timeRangeForMaxIssueEnabled,
+      followUpTime: ms(process.env.FOLLOW_UP_TIME || followUpTime),
+      disqualifyTime: ms(process.env.DISQUALIFY_TIME || disqualifyTime),
     },
     supabase: {
       url: process.env.SUPABASE_URL ?? "",
       key: process.env.SUPABASE_KEY ?? "",
     },
     telegram: {
       token: process.env.TELEGRAM_BOT_TOKEN ?? "",
-      delay: process.env.TELEGRAM_BOT_DELAY ? Number(process.env.TELEGRAM_BOT_DELAY) : DEFAULT_BOT_DELAY,
+      delay: process.env.TELEGRAM_BOT_DELAY ? Number(process.env.TELEGRAM_BOT_DELAY) : botDelay,
     },
     logNotification: {
       url: process.env.LOG_WEBHOOK_BOT_URL || "",

diff --git a/src/configs/index.ts b/src/configs/index.ts
@@ -1,4 +1,3 @@
-export * from "./shared";
 export * from "./strings";
 export * from "./abis";
 export * from "./ubiquibot-config-default";
diff --git a/src/configs/shared.ts b/src/configs/shared.ts
diff --git a/src/configs/ubiquibot-config-default.ts b/src/configs/ubiquibot-config-default.ts
@@ -98,6 +98,12 @@ export const DefaultConfig: MergedConfig = {
     organization: true,
   },
   staleBountyTime: "0d",
+  timeRangeForMaxIssue: 24, //24
+  timeRangeForMaxIssueEnabled: false,
+  permitBaseUrl: "https://pay.ubq.fi",
+  botDelay: 100, // 100ms
+  followUpTime: "4 days",
+  disqualifyTime: "7 days",
   newContributorGreeting: {
     enabled: true,
     header:

diff --git a/src/handlers/comment/handlers/assign.ts b/src/handlers/comment/handlers/assign.ts
@@ -5,7 +5,7 @@ import { deadLinePrefix } from "../../shared";
 import { getWalletAddress, getWalletMultiplier } from "../../../adapters/supabase";
 import { tableComment } from "./table";
 import { bountyInfo } from "../../wildcard";
-import { ASSIGN_COMMAND_ENABLED, GLOBAL_STRINGS } from "../../../configs";
+import { GLOBAL_STRINGS } from "../../../configs";
 import { isParentIssue } from "../../pricing";
 
 export const assign = async (body: string) => {
@@ -19,6 +19,7 @@ export const assign = async (body: string) => {
   const id = organization?.id || repository?.id; // repository?.id as fallback
 
   const staleBounty = config.assign.staleBountyTime;
+  const startEnabled = config.command.find((command) => command.name === "start");
 
   logger.info(`Received '/start' command from user: ${payload.sender.login}, body: ${body}`);
   const issue = (_payload as Payload).issue;
@@ -28,7 +29,7 @@ export const assign = async (body: string) => {
     return "Skipping '/start' because of no issue instance";
   }
 
-  if (!ASSIGN_COMMAND_ENABLED) {
+  if (!startEnabled?.enabled) {
     logger.info(`Ignore '/start' command from user: ASSIGN_COMMAND_ENABLED config is set false`);
     return GLOBAL_STRINGS.assignCommandDisabledComment;
   }

diff --git a/src/handlers/comment/handlers/help.ts b/src/handlers/comment/handlers/help.ts
@@ -1,6 +1,5 @@
 import { userCommands } from ".";
-import { getBotContext, getLogger } from "../../../bindings";
-import { ASSIGN_COMMAND_ENABLED } from "../../../configs";
+import { getBotConfig, getBotContext, getLogger } from "../../../bindings";
 import { IssueType, Payload } from "../../../types";
 import { IssueCommentCommands } from "../commands";
 
@@ -28,13 +27,15 @@ export const listAvailableCommands = async (body: string) => {
 };
 
 export const generateHelpMenu = () => {
+  const config = getBotConfig();
+  const startEnabled = config.command.find((command) => command.name === "start");
   let helpMenu = "### Available commands\n```";
   const commands = userCommands();
   commands.map((command) => {
     // if first command, add a new line
     if (command.id === commands[0].id) {
       helpMenu += `\n`;
-      if (!ASSIGN_COMMAND_ENABLED) return;
+      if (!startEnabled) return;
     }
     helpMenu += `- ${command.id}: ${command.description}`;
     // if not last command, add a new line (fixes too much space below)
@@ -43,6 +44,6 @@ export const generateHelpMenu = () => {
     }
   });
 
-  if (!ASSIGN_COMMAND_ENABLED) helpMenu += "```\n***_To assign yourself to an issue, please open a draft pull request that is linked to it._***";
+  if (!startEnabled) helpMenu += "```\n***_To assign yourself to an issue, please open a draft pull request that is linked to it._***";
   return helpMenu;
 };
diff --git a/src/helpers/label.ts b/src/helpers/label.ts
@@ -1,11 +1,17 @@
 import { Context } from "probot";
 import { getBotConfig, getBotContext, getLogger } from "../bindings";
-import { COLORS } from "../configs";
 import { calculateBountyPrice } from "../handlers";
 import { Label, Payload } from "../types";
 import { deleteLabel } from "./issue";
 import { calculateWeight } from "../helpers";
 
+// cspell:disable
+export const COLORS = {
+  default: "ededed",
+  price: "1f883d",
+};
+// cspell:enable
+
 export const listLabelsForRepo = async (per_page?: number, page?: number): Promise<Label[]> => {
   const context = getBotContext();
   const payload = context.payload as Payload;

diff --git a/src/helpers/payout.ts b/src/helpers/payout.ts
@@ -12,7 +12,6 @@
  */
 
 import { Static } from "@sinclair/typebox";
-import { DEFAULT_RPC_ENDPOINT } from "../configs";
 import { PayoutConfigSchema } from "../types";
 import { getUserPermission } from "./issue";
 import { getBotContext, getLogger } from "../bindings";
@@ -21,7 +20,7 @@ import { getAccessLevel } from "../adapters/supabase";
 // available tokens for payouts
 const PAYMENT_TOKEN_PER_NETWORK: Record<string, { rpc: string; token: string }> = {
   "1": {
-    rpc: DEFAULT_RPC_ENDPOINT,
+    rpc: "https://rpc-bot.ubq.fi/v1/mainnet",
     token: "0x6B175474E89094C44Da98b954EedeAC495271d0F", // DAI
   },
   "100": {

diff --git a/src/types/config.ts b/src/types/config.ts
@@ -236,6 +236,12 @@ export const MergedConfigSchema = Type.Object({
   openAITokenLimit: Type.Optional(Type.Number()),
   staleBountyTime: Type.String(),
   newContributorGreeting: NewContributorGreetingSchema,
+  timeRangeForMaxIssue: Type.Number(),
+  timeRangeForMaxIssueEnabled: Type.Boolean(),
+  permitBaseUrl: Type.String(),
+  botDelay: Type.Number(),
+  followUpTime: Type.String(),
+  disqualifyTime: Type.String(),
 });
 
 export type MergedConfig = Static<typeof MergedConfigSchema>;
diff --git a/src/utils/private.ts b/src/utils/private.ts
@@ -162,6 +162,12 @@ export const getWideConfig = async (context: Context) => {
     openAITokenLimit: mergedConfigData.openAITokenLimit,
     staleBountyTime: mergedConfigData.staleBountyTime,
     newContributorGreeting: mergedConfigData.newContributorGreeting,
+    timeRangeForMaxIssue: mergedConfigData.timeRangeForMaxIssue,
+    timeRangeForMaxIssueEnabled: mergedConfigData.timeRangeForMaxIssueEnabled,
+    permitBaseUrl: mergedConfigData.permitBaseUrl,
+    botDelay: mergedConfigData.botDelay,
+    followUpTime: mergedConfigData.followUpTime,
+    disqualifyTime: mergedConfigData.disqualifyTime,
   };
 
   return configData;