Decouple discobot from commonwealth

packages/discord-bot/Procfile

@@ -1,2 +1,2 @@
-listener: node --max_old_space_size=$(./scripts/get-max-old-space-size.sh) packages/discord-bot/build/discord-bot/discord-listener/discordListener.js
-consumer: node --max_old_space_size=$(./scripts/get-max-old-space-size.sh) packages/discord-bot/build/discord-bot/discord-consumer/discordConsumer.js
+listener: node --max_old_space_size=$(./scripts/get-max-old-space-size.sh) packages/discord-bot/build/packages/discord-bot/src/discord-listener/discordListener.js
+consumer: node --max_old_space_size=$(./scripts/get-max-old-space-size.sh) packages/discord-bot/build/packages/discord-bot/src/discord-consumer/discordConsumer.js

packages/discord-bot/README.md

@@ -1 +1,3 @@
-For documentation, see the [Discobot knowledge base entry](../../knowledge_base/Discobot.md).
+# Discord-Bot
+
+For documentation, see the [Discobot knowledge base entry](../../knowledge_base/Discobot.md).

packages/discord-bot/package.json

@@ -4,11 +4,11 @@
   "description": "",
   "scripts": {
     "build": "tsc --project tsconfig.json && tsc-alias",
-    "start": "ts-node discord-listener/discordListener.ts",
-    "start-consumer": "ts-node discord-consumer/discordConsumer.ts",
+    "start": "ts-node src/discord-listener/discordListener.ts",
+    "start-consumer": "ts-node src/discord-consumer/discordConsumer.ts",
     "check-types": "tsc --noEmit",
-    "start-prod-consumer": "node build/discord-bot/discord-consumer/discordConsumer.js",
-    "start-prod-listener": "node build/discord-bot/discord-listener/discordListener.js",
+    "start-prod-consumer": "node build/packages/discord-bot/src/discord-consumer/discordConsumer.js",
+    "start-prod-listener": "node build/packages/discord-bot/src/discord-listener/discordListener.js",
     "switch-staging-app": "chmod u+x scripts/switch-discobot-staging-env.sh && ./scripts/switch-discobot-staging-env.sh"
   },
   "keywords": [],

packages/discord-bot/discord-consumer/discordConsumer.ts → packages/discord-bot/src/discord-consumer/discordConsumer.ts

@@ -18,14 +18,14 @@ import {
   startHealthCheckLoop,
 } from 'common-common/src/scripts/startHealthCheckLoop';
 import { StatsDController } from 'common-common/src/statsd';
+import v8 from 'v8';
 import {
   handleCommentMessages,
   handleThreadMessages,
-} from 'discord-bot/discord-consumer/handlers';
-import { rollbar } from 'discord-bot/utils/rollbar';
-import { getForumLinkedTopic } from 'discord-bot/utils/util';
-import v8 from 'v8';
+} from '../discord-consumer/handlers';
 import { CW_BOT_KEY, DISCOBOT_ADDRESS, RABBITMQ_URI } from '../utils/config';
+import { rollbar } from '../utils/rollbar';
+import { getForumLinkedTopic } from '../utils/util';
 
 let isServiceHealthy = false;
 

packages/discord-bot/discord-consumer/handlers.ts → packages/discord-bot/src/discord-consumer/handlers.ts

@@ -4,14 +4,13 @@ import {
   ThreadDiscordActions,
 } from '@hicommonwealth/core';
 import axios from 'axios';
-import { TopicAttributes } from 'commonwealth/server/models/topic';
-import { SERVER_URL } from 'discord-bot/utils/config';
-import { sequelize } from 'discord-bot/utils/database';
+import { SERVER_URL } from '../utils/config';
+import { sequelize } from '../utils/database';
 
 export async function handleThreadMessages(
   action: ThreadDiscordActions,
   message: IDiscordMessage,
-  topic: TopicAttributes,
+  topic: { id: string; name: string },
   sharedReqData: Record<string, any>,
 ): Promise<void> {
   switch (action) {

packages/discord-bot/discord-listener/discordListener.ts → packages/discord-bot/src/discord-listener/discordListener.ts

@@ -8,11 +8,6 @@ import {
   ServiceKey,
   startHealthCheckLoop,
 } from 'common-common/src/scripts/startHealthCheckLoop';
-import {
-  handleMessage,
-  handleThreadChannel,
-} from 'discord-bot/discord-listener/handlers';
-import { rollbar } from 'discord-bot/utils/rollbar';
 import {
   Client,
   IntentsBitField,
@@ -21,7 +16,12 @@ import {
   ThreadChannel,
 } from 'discord.js';
 import v8 from 'v8';
+import {
+  handleMessage,
+  handleThreadChannel,
+} from '../discord-listener/handlers';
 import { DISCORD_TOKEN, RABBITMQ_URI } from '../utils/config';
+import { rollbar } from '../utils/rollbar';
 
 const log = factory.getLogger(formatFilename(__filename));
 

packages/discord-bot/discord-listener/handlers.ts → packages/discord-bot/src/discord-listener/handlers.ts

@@ -2,8 +2,8 @@ import { DiscordAction, IDiscordMessage } from '@hicommonwealth/core';
 import { factory, formatFilename } from 'common-common/src/logging';
 import { RabbitMQController } from 'common-common/src/rabbitmq';
 import { RascalPublications } from 'common-common/src/rabbitmq/types';
-import { getImageUrls } from 'discord-bot/discord-listener/util';
 import { Client, Message, ThreadChannel } from 'discord.js';
+import { getImageUrls } from '../discord-listener/util';
 import { rollbar } from '../utils/rollbar';
 import { getForumLinkedTopic } from '../utils/util';
 

packages/discord-bot/utils/util.ts → packages/discord-bot/src/utils/util.ts

@@ -1,14 +1,11 @@
-import { TopicAttributes } from 'commonwealth/server/models/topic';
 import { QueryTypes } from 'sequelize';
 import { sequelize } from './database';
 
 /**
  * Searches the Commonwealth database Topics table for any topics that are linked to the given Discord Forum
  */
-export async function getForumLinkedTopic(
-  forumId: string,
-): Promise<TopicAttributes> {
-  const result: TopicAttributes[] = await sequelize.query(
+export async function getForumLinkedTopic(forumId: string): Promise<any> {
+  const result = await sequelize.query(
     `
     SELECT * FROM "Topics" WHERE channel_id = :forumId AND deleted_at IS NULL LIMIT 1;
   `,

packages/discord-bot/tsconfig.json

@@ -4,16 +4,8 @@
     "lib": ["es2020"],
     "typeRoots": ["./node_modules/@types"],
     "skipLibCheck": true,
-    "outDir": "./build",
-    "baseUrl": "."
+    // TODO: "rootDir": "src",
+    "outDir": "build"
   },
-  "paths": {
-    "@hicommonwealth/*": ["../../libs/*/src"],
-    "common-common": ["../../packages/common-common"],
-    "common-common/*": ["../../packages/common-common/*"],
-    "commonwealth": ["../../packages/commonwealth"],
-    "commonwealth/*": ["../../packages/commonwealth/*"]
-  },
-  "include": ["discord-consumer", "discord-listener", "utils"],
-  "exclude": ["./node_modules", "node_modules", "build"]
+  "include": ["src"]
 }

tsconfig.json

@@ -9,17 +9,16 @@
     "esModuleInterop": true,
     "downlevelIteration": true,
     "traceResolution": false,
+    "baseUrl": ".",
     "paths": {
       "@hicommonwealth/*": ["libs/*/src"],
-      "common-common": ["./packages/common-common"],
-      "common-common/*": ["./packages/common-common/*"],
+      "common-common": ["packages/common-common"],
+      "common-common/*": ["packages/common-common/*"],
       "chain-testing/*": [
-        "./packages/commonwealth/test/util/evm-chain-testing/*"
+        "packages/commonwealth/test/util/evm-chain-testing/*"
       ],
       "token-balance-cache": ["./packages/token-balance-cache"],
-      "token-balance-cache/*": ["./packages/token-balance-cache/*"],
-      "discord-bot": ["./packages/discord-bot"],
-      "discord-bot/*": ["./packages/discord-bot/*"]
+      "token-balance-cache/*": ["./packages/token-balance-cache/*"]
     }
   },
   "ts-node": {