update api token

Reviewed-on: #80

.env.example

@@ -7,4 +7,6 @@ BOT_WEBHOOK_SECRET=RANDOM_SECRET_VALUE
 SERVER_HOST=localhost
 SERVER_PORT=3000
 BOT_ADMINS=[1]
-GROUP_IDS=-
+GROUP_IDS=-
+GRAPHQL_URL=http://localhost:3000/api/graphql
+GRAPHQL_API_TOKEN="token-here"

.github/workflows/main.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   REGISTRY: gitea.lucids-cove.duckdns.org
-  OWNER: lcm
+  OWNER: wkc
   IMAGE_NAME: no-twitter-bot
 
 jobs:
@@ -18,7 +18,6 @@ jobs:
       matrix:
         node-version: [20.x]
     steps:
-      - uses: actions/checkout@v4
       - name: "Base requirements"
         run: |
           # packages
@@ -26,6 +25,7 @@ jobs:
           # ansible collections
           ansible-galaxy collection install community.general --force
           ansible-galaxy collection install ansible.posix --force
+      - uses: actions/checkout@v4
       - name: Enable Corepack
         run: npm install -g corepack && corepack enable
       - name: Log into registry ${{ env.REGISTRY }}
@@ -34,6 +34,8 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ env.OWNER }}
           password: ${{ secrets.TOKEN }}
+      - name: Docker Hub Login
+        run: echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Setup Docker buildx

compose.override.yml

@@ -1,9 +1,21 @@
 services:
-  bot:
+  no-twitter-bot:
+    image: gitea.lucids-cove.duckdns.org/wkc/no-twitter-bot:latest
+    container_name: no-twitter-bot
+    environment:
+      - BOT_TOKEN=${BOT_TOKEN}
+      - BOT_MODE=${BOT_MODE}
+      - LOG_LEVEL=${LOG_LEVEL}
+      - DEBUG=${DEBUG}
+      - BOT_WEBHOOK=${BOT_WEBHOOK}
+      - BOT_WEBHOOK_SECRET=${BOT_WEBHOOK_SECRET}
+      - SERVER_HOST=${SERVER_HOST}
+      - SERVER_PORT=${SERVER_PORT}
+      - BOT_ADMINS=${BOT_ADMINS}
+      - GROUP_IDS=${GROUP_IDS}
+      - GRAPHQL_URL=${GRAPHQL_URL}
     ports:
       - "3000:80"
     volumes:
       - ".:/usr/src"
-    env_file:
-      - .env.bot.dev
     command: npm run dev

compose.prod.yml

@@ -1,4 +1,19 @@
 services:
-  bot:
-    env_file:
-      - .env.bot.prod
+  no-twitter-bot:
+    image: gitea.lucids-cove.duckdns.org/wkc/no-twitter-bot:latest
+    container_name: no-twitter-bot
+    # env_file: stack.env
+    environment:
+      - BOT_TOKEN=${BOT_TOKEN}
+      - BOT_MODE=${BOT_MODE}
+      - LOG_LEVEL=${LOG_LEVEL}
+      - DEBUG=${DEBUG}
+      - BOT_WEBHOOK=${BOT_WEBHOOK}
+      - BOT_WEBHOOK_SECRET=${BOT_WEBHOOK_SECRET}
+      - SERVER_HOST=${SERVER_HOST}
+      - SERVER_PORT=${SERVER_PORT}
+      - BOT_ADMINS=${BOT_ADMINS}
+      - GROUP_IDS=${GROUP_IDS}
+      - GRAPHQL_URL=${GRAPHQL_URL}
+    build:
+      context: .

compose.yml

@@ -1,6 +1,19 @@
 services:
-  bot:
+  no-twitter-bot:
+    image: gitea.lucids-cove.duckdns.org/wkc/no-twitter-bot:latest
     container_name: no-twitter-bot
-    env_file: stack.env
+    # env_file: stack.env
+    environment:
+      - BOT_TOKEN=${BOT_TOKEN}
+      - BOT_MODE=${BOT_MODE}
+      - LOG_LEVEL=${LOG_LEVEL}
+      - DEBUG=${DEBUG}
+      - BOT_WEBHOOK=${BOT_WEBHOOK}
+      - BOT_WEBHOOK_SECRET=${BOT_WEBHOOK_SECRET}
+      - SERVER_HOST=${SERVER_HOST}
+      - SERVER_PORT=${SERVER_PORT}
+      - BOT_ADMINS=${BOT_ADMINS}
+      - GROUP_IDS=${GROUP_IDS}
+      - GRAPHQL_URL=${GRAPHQL_URL}
     build:
       context: .

package.json

@@ -1,14 +1,14 @@
 {
   "name": "no-twitter-bot",
   "type": "module",
-  "version": "2.0.0",
+  "version": "3.1.0",
   "private": true,
   "packageManager": "yarn@4.9.2",
   "description": "This grammY powered Telegram bot is designed to delete Twitter/X links and reformat services from whitelisted groups. This one is the main bot for the LCM Telegram groups/communities.",
   "imports": {
     "#root/*": "./build/src/*"
   },
-  "author": "Lucid Kobold (Lucid Creations Media) <social@lucidcreations.media>",
+  "author": "Lucid (Werewolf Kid Creations) <social@werewolfkid.monster>",
   "license": "MIT",
   "engines": {
     "node": ">=20.0.0",
@@ -32,24 +32,25 @@
     "@grammyjs/i18n": "1.1.2",
     "@grammyjs/parse-mode": "1.11.1",
     "@grammyjs/runner": "2.0.3",
-    "@grammyjs/types": "3.22.1",
-    "@hono/node-server": "1.19.1",
+    "@grammyjs/types": "3.22.2",
+    "@hono/node-server": "1.19.4",
+    "@urql/core": "^6.0.1",
     "callback-data": "1.1.1",
     "grammy": "1.38.2",
-    "hono": "4.9.6",
+    "hono": "4.9.9",
     "iso-639-1": "3.1.5",
-    "pino": "9.9.1",
+    "pino": "9.12.0",
     "pino-pretty": "13.1.1",
-    "tsx": "4.20.5",
-    "valibot": "0.42.1"
+    "tsx": "4.20.6",
+    "valibot": "1.1.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "4.19.0",
-    "@types/node": "^22.18.0",
-    "eslint": "^9.34.0",
+    "@antfu/eslint-config": "5.4.1",
+    "@types/node": "^24.5.2",
+    "eslint": "^9.36.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.5.2",
-    "tsc-watch": "^6.3.1",
+    "lint-staged": "^16.2.3",
+    "tsc-watch": "^7.2.0",
     "typescript": "^5.9.2"
   },
   "lint-staged": {

src/bot/features/botInfoCommand.ts

@@ -1,29 +1,70 @@
 import { Composer } from "grammy";
 import type { Context } from "#root/bot/context.js";
 import { logHandle } from "#root/bot/helpers/logging.js";
+import urql from "#root/lib/urql.js";
+import increment from "#root/lib/graphql/mutations/incrimentMutation.js";
 
 const composer = new Composer<Context>();
 
-const feature = composer.chatType(["private"]);
+const feature = composer.chatType(["private", "group", "supergroup"]);
 
 /**
  * What triggers this feature and adds to the log when it has been triggered.
  * The trigger is the command "/botInfo"
  */
 feature.hears(
-  "/botInfo",
+  /^\/botInfo/,
   logHandle("bot-info-command"),
   async (ctx: Context) => {
+    await urql.mutation(increment, { trigger: true });
+
     // Checks if the context includes a message property.
-    if (ctx.msg) {
-      // Replies to the message.
-      return await ctx.reply(
-        `I am a bot designed to delete any Twitter/X and Meta links along with corresponding reformatting services within whitelisted groups\\. I now check embedded links\\! By default I only work with whitelisted group IDs\\.\n\nYou can fork me from this link: https://github\\.com/lucid\\-creations\\-media/no\\-twitter\\-bot and deploy me for use in your own groups\\!`,
-        {
-          parse_mode: "MarkdownV2",
-          reply_parameters: { message_id: ctx.msg.message_id }
+    if (ctx.msg && ctx.chat && ctx.msg.from) {
+      // Doesn't respond to regular users in groups. This is to prevent users spamming the command.
+      if (ctx.chat.type !== "private") {
+        const chatMember = await ctx.getChatMember(ctx.msg.from.id);
+
+        if (!["creator", "administrator"].includes(chatMember.status)) {
+          return;
         }
-      );
+      }
+
+      await urql
+        .mutation(increment, { command: true })
+        .toPromise()
+        .then(async () => {
+          if (ctx.msg) {
+            // Replies to the message.
+            await ctx.reply(
+              `I am a bot designed to delete any Twitter/X and Meta links along with corresponding reformatting services\\. I now check embedded links\\!`,
+              {
+                parse_mode: "MarkdownV2",
+                reply_parameters: { message_id: ctx.msg.message_id }
+              }
+            );
+            await ctx.reply(
+              `[Lucid](https://werewolfkid.monster) made this bot as a protest against the enshittification of Twitter and Nazi\\-fication of it\\ ever since Elon Must did a Nazi salute at a Trump Rally celebrating Trump\\'s second inauguration\\.`,
+              {
+                parse_mode: "MarkdownV2",
+                reply_parameters: { message_id: ctx.msg.message_id }
+              }
+            );
+            await ctx.reply(
+              `Recently there have been reports of extremist right\\-wing individuals doxxing and harassing anyone left of center\\. The victims have come out to state that they\\'ve had several accounts hacked into\\, including onces with unique passwords\\. It is clear that these assholes are using some kind of script kiddie malware to capture\\/steal credentials and possibly even stored passwords\\.`,
+              {
+                parse_mode: "MarkdownV2",
+                reply_parameters: { message_id: ctx.msg.message_id }
+              }
+            );
+            return await ctx.reply(
+              `Lucid decided it was time to make a statement\\. Twitter\\/X is not safe anymore\\. The fandom doesn\\'t need it\\. It should be boycotted and not allowed anymore\\. Thus decided to try making this bot public\\-use to test it's viability\\. Feel free to add this bot into your own group\\. All it needs is an admin role with the permission to delete messages\\.`,
+              {
+                parse_mode: "MarkdownV2",
+                reply_parameters: { message_id: ctx.msg.message_id }
+              }
+            );
+          }
+        });
     }
   }
 );

src/bot/features/embedCheck.ts

@@ -3,6 +3,10 @@ import type { Context } from "#root/bot/context.js";
 import { logHandle } from "#root/bot/helpers/logging.js";
 import metaLinkCheck from "#root/lib/metaLinkCheck.js";
 import twitterLinkCheck from "#root/lib/twitterLinkCheck.js";
+import urql from "#root/lib/urql.js";
+import increment from "#root/lib/graphql/mutations/incrimentMutation.js";
+import addGroup from "#root/lib/graphql/mutations/addGroupMutation.js";
+import incrementGroup from "#root/lib/graphql/mutations/incrementGroupMutation.js";
 
 const composer = new Composer<Context>();
 
@@ -13,122 +17,166 @@ const feature = composer.chatType(["group", "supergroup"]);
  * The trigger is anytime an embedded url is detected.
  */
 feature.on("message::url", logHandle("embed-check"), async (ctx: Context) => {
+  await urql.mutation(increment, { trigger: true });
+
   if (ctx.chat && ctx.msg) {
-    // Pulling the group IDs from the env variables.
-    const GROUP_IDS = process.env.GROUP_IDS
-      ? process.env.GROUP_IDS.split(",")
-      : undefined;
+    const groupName = ctx.chat?.title;
+    const groupID = ctx.chat?.id;
+    const groupUsername = ctx.chat?.username;
+    let deletedLinks = 0;
 
-    if (ctx.chat && ctx.msg) {
-      if (GROUP_IDS !== undefined) {
-        // Checking if the message is from a whitelisted group.
-        const groupID = ctx.chat.id;
-        const flag = GROUP_IDS.includes(`${groupID}`);
-        const username = ctx.msg.from?.username;
+    const username = ctx.msg.from?.username;
 
-        if (flag) {
-          // Filters every message/caption entity that is a url into a new array.
-          const embeds = ctx.msg.entities
-            ? ctx.msg.entities.filter(e => e.type === "text_link")
-            : null;
-          const captionEmbeds = ctx.msg.caption_entities
-            ? ctx.msg.caption_entities.filter(e => e.type === "text_link")
-            : null;
+    // Filters every message/caption entity that is a url into a new array.
+    const embeds = ctx.msg.entities
+      ? ctx.msg.entities.filter(e => e.type === "text_link")
+      : null;
+    const captionEmbeds = ctx.msg.caption_entities
+      ? ctx.msg.caption_entities.filter(e => e.type === "text_link")
+      : null;
 
-          // If the caption embeds array isn't empty filter through them to check if any is a Twitter/X or Meta url.
-          if (captionEmbeds !== null && captionEmbeds.length) {
-            const metaLinks = captionEmbeds.filter(({ url }) =>
-              metaLinkCheck(url)
-            );
-            const twitterLinks = captionEmbeds.filter(({ url }) =>
-              twitterLinkCheck(url)
-            );
+    // If the caption embeds array isn't empty filter through them to check if any is a Twitter/X or Meta url.
+    if (captionEmbeds !== null && captionEmbeds.length) {
+      const metaLinks = captionEmbeds.filter(({ url }) => metaLinkCheck(url));
+      const twitterLinks = captionEmbeds.filter(({ url }) =>
+        twitterLinkCheck(url)
+      );
 
-            // Handle action and response if both meta and Twitter/X links are detected.
-            if (metaLinks.length && twitterLinks.length) {
-              // Deletes the offending message.
-              ctx.msg.delete();
+      // Handle action and response if both meta and Twitter/X links are detected.
+      if (metaLinks.length && twitterLinks.length) {
+        // Deletes the offending message.
+        ctx.msg.delete();
+        deletedLinks++;
+
+        await urql
+          .mutation(increment, { link: true })
+          .toPromise()
+          .then(async () => {
+            if (ctx.msg) {
               // Replies to the user informing them of the action.
-              return await ctx.reply(
+              await ctx.reply(
                 `@${username} Twitter and X links along with reformatting services for Twitter posts are not allowed here\\. Also Facebook and meta links along with with links to meta\\-owned services are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\.\n\nIf this was forwarded from a channel consider forwarding without the caption so the media isn't deleted\\.`,
                 { parse_mode: "MarkdownV2" }
               );
             }
+          });
+      }
 
-            // Handle action and response if only meta links are detected.
-            if (metaLinks.length) {
-              // Deletes the offending message.
-              ctx.msg.delete();
+      // Handle action and response if only meta links are detected.
+      if (metaLinks.length) {
+        // Deletes the offending message.
+        ctx.msg.delete();
+        deletedLinks++;
+
+        await urql
+          .mutation(increment, { link: true })
+          .toPromise()
+          .then(async () => {
+            if (ctx.msg) {
               // Replies to the user informing them of the action.
-              return await ctx.reply(
+              await ctx.reply(
                 `@${username} Facebook and meta links along with with links to meta\\-owned services are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\\n\nIf this was forwarded from a channel consider forwarding without the caption so the media isn't deleted\\.`,
                 { parse_mode: "MarkdownV2" }
               );
             }
+          });
+      }
 
-            // Handle action and response if only Twitter/X links are detected.
-            if (twitterLinks.length) {
-              // Deletes the offending message.
-              ctx.msg.delete();
+      // Handle action and response if only Twitter/X links are detected.
+      if (twitterLinks.length) {
+        // Deletes the offending message.
+        ctx.msg.delete();
+        deletedLinks++;
+
+        await urql
+          .mutation(increment, { link: true })
+          .toPromise()
+          .then(async () => {
+            if (ctx.msg) {
               // Replies to the user informing them of the action.
-              return await ctx.reply(
+              await ctx.reply(
                 `@${username} Twitter and X links along with reformatting services for Twitter posts are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\.\n\nIf this was forwarded from a channel consider forwarding without the caption so the media isn't deleted\\.`,
                 { parse_mode: "MarkdownV2" }
               );
             }
-          }
-          // If the embeds array isn't empty filter through them to check if any is a Twitter/X or Meta url.
-          if (embeds !== null && embeds.length) {
-            const metaLinks = embeds.filter(({ url }) => metaLinkCheck(url));
-            const twitterLinks = embeds.filter(({ url }) =>
-              twitterLinkCheck(url)
-            );
+          });
+      }
+    }
+    // If the embeds array isn't empty filter through them to check if any is a Twitter/X or Meta url.
+    if (embeds !== null && embeds.length) {
+      const metaLinks = embeds.filter(({ url }) => metaLinkCheck(url));
+      const twitterLinks = embeds.filter(({ url }) => twitterLinkCheck(url));
 
-            // Handle action and response if both meta and Twitter/X links are detected.
-            if (metaLinks.length && twitterLinks.length) {
-              // Deletes the offending message.
-              ctx.msg.delete();
+      // Handle action and response if both meta and Twitter/X links are detected.
+      if (metaLinks.length && twitterLinks.length) {
+        // Deletes the offending message.
+        ctx.msg.delete();
+        deletedLinks++;
+
+        await urql
+          .mutation(increment, { link: true })
+          .toPromise()
+          .then(async () => {
+            if (ctx.msg) {
               // Replies to the user informing them of the action.
-              return await ctx.reply(
+              await ctx.reply(
                 `@${username} Twitter and X links along with reformatting services for Twitter posts are not allowed here\\. Also Facebook and meta links along with with links to meta\\-owned services are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\.`,
                 { parse_mode: "MarkdownV2" }
               );
             }
+          });
+      }
 
-            // Handle action and response if only meta links are detected.
-            if (metaLinks.length) {
-              // Deletes the offending message.
-              ctx.msg.delete();
+      // Handle action and response if only meta links are detected.
+      if (metaLinks.length) {
+        // Deletes the offending message.
+        ctx.msg.delete();
+        deletedLinks++;
+
+        await urql
+          .mutation(increment, { link: true })
+          .toPromise()
+          .then(async () => {
+            if (ctx.msg) {
               // Replies to the user informing them of the action.
-              return await ctx.reply(
+              await ctx.reply(
                 `@${username} Facebook and meta links along with with links to meta\\-owned services are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\.`,
                 { parse_mode: "MarkdownV2" }
               );
             }
+          });
+      }
 
-            // Handle action and response if only Twitter/X links are detected.
-            if (twitterLinks.length) {
-              // Deletes the offending message.
-              ctx.msg.delete();
+      // Handle action and response if only Twitter/X links are detected.
+      if (twitterLinks.length) {
+        // Deletes the offending message.
+        ctx.msg.delete();
+        deletedLinks++;
+
+        await urql
+          .mutation(increment, { link: true })
+          .toPromise()
+          .then(async () => {
+            if (ctx.msg) {
               // Replies to the user informing them of the action.
-              return await ctx.reply(
+              await ctx.reply(
                 `@${username} Twitter and X links along with reformatting services for Twitter posts are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\.`,
                 { parse_mode: "MarkdownV2" }
               );
             }
-          }
-        }
+          });
       }
 
-      if (!GROUP_IDS) {
-        console.info("Group IDS:", process.env.GROUP_IDS);
-        return await ctx.reply(
-          `There was a problem retrieving the whitelist\\. Check the env variables and try again\\.`,
-          {
-            parse_mode: "MarkdownV2",
-            reply_parameters: { message_id: ctx.msg.message_id }
-          }
-        );
+      if (deletedLinks) {
+        return await urql
+          .mutation(addGroup, { groupID, groupName, groupUsername })
+          .toPromise()
+          .then(() =>
+            urql.mutation(incrementGroup, {
+              groupID,
+              linksDeleted: deletedLinks
+            })
+          );
       }
     }
   }

src/bot/features/getGroupIDCommand.ts

@@ -1,54 +0,0 @@
-import { Composer } from "grammy";
-import type { Context } from "#root/bot/context.js";
-import { logHandle } from "#root/bot/helpers/logging.js";
-
-const composer = new Composer<Context>();
-
-const feature = composer.chatType(["group", "supergroup"]);
-
-/**
- * What triggers this feature and adds to the log when it has been triggered.
- * The trigger is the command "/botInfo"
- */
-feature.hears(
-  "/getGroupID",
-  logHandle("get-group-id"),
-  async (ctx: Context) => {
-    // Pulling the group IDs from the env variables.
-    const GROUP_IDS = process.env.GROUP_IDS
-      ? process.env.GROUP_IDS.split(",")
-      : undefined;
-
-    // Checks if the context has a chat, msg, and from property.
-    if (ctx.chat && ctx.msg && ctx.msg.from) {
-      if (GROUP_IDS !== undefined) {
-        const groupID = ctx.chat.id;
-        const flag = GROUP_IDS.includes(`${groupID}`);
-
-        // Checks if the group is whitelisted
-        if (flag) {
-          const chatMember = await ctx.getChatMember(ctx.msg.from.id);
-
-          // Checks if the user is an admin
-          if (["creator", "administrator"].includes(chatMember.status)) {
-            return await ctx.reply(`The group id is: \`${groupID}\``, {
-              parse_mode: "MarkdownV2",
-              reply_parameters: { message_id: ctx.msg.message_id }
-            });
-          }
-
-          // Send a default message if the user is not an admin
-          return await ctx.reply(
-            `You have to be an admin to use this command\\!`,
-            {
-              parse_mode: "MarkdownV2",
-              reply_parameters: { message_id: ctx.msg.message_id }
-            }
-          );
-        }
-      }
-    }
-  }
-);
-
-export { composer as getGroupIDCommand };

src/bot/features/helpCommand.ts

@@ -1,6 +1,8 @@
 import { Composer } from "grammy";
 import type { Context } from "#root/bot/context.js";
 import { logHandle } from "#root/bot/helpers/logging.js";
+import urql from "#root/lib/urql.js";
+import increment from "#root/lib/graphql/mutations/incrimentMutation.js";
 
 const composer = new Composer<Context>();
 
@@ -10,76 +12,72 @@ const feature = composer.chatType(["group", "supergroup", "private"]);
  * What triggers this feature and adds to the log when it has been triggered.
  * The trigger is the command "/help"
  */
-feature.hears("/help", logHandle("help"), async (ctx: Context) => {
-  const GROUP_IDS = process.env.GROUP_IDS
-    ? process.env.GROUP_IDS.split(",")
-    : undefined;
+feature.hears(/^\/help/, logHandle("help"), async (ctx: Context) => {
+  await urql.mutation(increment, { trigger: true });
+
+  // const GROUP_IDS = process.env.GROUP_IDS
+  //   ? process.env.GROUP_IDS.split(",")
+  //   : undefined;
 
   // Checks there is a chat and msg property in the context.
-  if (ctx.chat && ctx.msg) {
-    // CHecks if the chat is private
-    if (ctx.chat.type === "private") {
-      // Responds with the command list.
-      return await ctx.reply(
-        `**Here are the available commands you can use:**\n\n/getGroupID _ADMIN ONLY | Only available in groups_\\- Replies with the ID of the group I am in\\.\n\n/isWKCGRoup _ADMIN ONLY_ \\- Checks if this group's ID is on the whitelist and responds accordingly\\.\n\n/botInfo _Private Command_\\- Info about me and how to fork me to deploy for your own use\\.\n\n/help\\- Displays this help message\\.`,
-        {
-          parse_mode: "MarkdownV2",
-          reply_parameters: { message_id: ctx.msg.message_id }
-        }
-      );
-    }
-
-    // Checks if the whitelist is set up.
-    if (GROUP_IDS !== undefined) {
-      const groupID = ctx.chat.id;
-      const flag = GROUP_IDS.includes(`${groupID}`);
-
-      // Checks if the chat is in the whitelist.
-      if (flag) {
-        // Responds with the command list.
-        return await ctx.reply(
-          `**Here are the available commands you can use:**\n\n/getGroupID _ADMIN ONLY_ \\- Replies with the ID of the group I am in\\.\n\n/isWKCGRoup _ADMIN ONLY_ \\- Checks if this group's ID is on the whitelist and responds accordingly\\.\n\n/botInfo _Private Command_\\- Info about me and how to fork me to deploy for your own use\\.\n\n/help\\- Displays this help message\\.`,
-          {
-            parse_mode: "MarkdownV2",
-            reply_parameters: { message_id: ctx.msg.message_id }
+  if (ctx.chat && ctx.msg && ctx.msg.from) {
+    await urql
+      .mutation(increment, { command: true })
+      .toPromise()
+      .then(async () => {
+        if (ctx.msg && ctx.chat && ctx.msg.from) {
+          // Checks if the chat is private
+          if (ctx.chat.type === "private") {
+            // Responds with message.
+            await ctx.reply(
+              `Currently I have no commands for the public beta\\. I require no configuration\\. Simply add me to a group and make me an admin with the permission to delete messages\\. From there I will start deleting any Twitter\\/X and Meta links I detect\\. I also check embeds and forwards\\. Use /\\botInfo to learn more about my mission and why I was created\\.`,
+              {
+                parse_mode: "MarkdownV2",
+                reply_parameters: { message_id: ctx.msg.message_id }
+              }
+            );
           }
-        );
-      }
 
-      // Checks if the chat is not in the whitelist.
-      if (!flag) {
-        await ctx
-          // Responds with the command list with a warning that the available commands are limited.
-          .reply(
-            `**Since this is not a whitelisted group the features are limited\\!\\!**\n\nHere are the available commands you can use:\n\n/isWKCGRoup _ADMIN ONLY_\\- Checks if this group's ID is on the whitelist and responds accordingly\\.\n\n/botInfo _Private Command_\\- Info about me and how to fork me to deploy for your own use\\.\n\n/help \\- Displays this help message\\.`,
+          // Checks if chat is a group.
+          if (ctx.chat.type !== "private") {
+            const chatMember = await ctx.getChatMember(ctx.msg.from.id);
+
+            // Checks if the user is an admin.
+            if (["creator", "administrator"].includes(chatMember.status)) {
+              // Respond with message.
+              await ctx.reply(
+                `Currently I have no commands for the public beta\\. I require no configuration\\. If I am not working\\, make sure I have an admin role with the permission to delete messages\\. I should already be deleting any Twitter\\/X and Meta links I detect\\. I also check embeds and forwards\\. Use /\\botInfo to learn more about my mission and why I was created\\.`,
+                {
+                  parse_mode: "MarkdownV2",
+                  reply_parameters: { message_id: ctx.msg.message_id }
+                }
+              );
+            } else {
+              /**
+               * Doesn't respond to regular users in groups. This is to prevent users spamming the command.
+               * Especially since this one includes some political opinions/messages.
+               */
+              return;
+            }
+          }
+
+          await ctx.reply(
+            `In the future a public GitHub repo will be set up with a mirror of the private git that the bot code is stored on\\. That repo will be used to handle bug reports and feature requests\\. Including requests to check for more domains\\.`,
             {
               parse_mode: "MarkdownV2",
               reply_parameters: { message_id: ctx.msg.message_id }
             }
-          )
-          .then(() => {});
-        // Sends a follow-up message with information about the bot.
-        return await ctx.reply(
-          `This group is NOT in the whitelisted and is NOT a part of the WKC Telegram groups/communities\\. I am a bot designed to delete any Twitter/X and Meta links along with corresponding reformatting services within whitelisted groups\\. You can fork me from this link: https://github\\.com/lucid\\-creations\\-media/no\\-twitter\\-bot and deploy me for use in your own groups\\!`,
-          {
-            parse_mode: "MarkdownV2",
-            reply_parameters: { message_id: ctx.msg.message_id }
-          }
-        );
-      }
-    }
+          );
 
-    //  Checks if the whitelist is not set up.
-    if (!GROUP_IDS) {
-      // Sends a warning that the whitelist is not set up or the bot cannot access it.
-      return await ctx.reply(
-        `There was a problem retrieving the whitelist\\. Check the env variables and try again\\.`,
-        {
-          parse_mode: "MarkdownV2",
-          reply_parameters: { message_id: ctx.msg.message_id }
+          return await ctx.reply(
+            `Down with fascism\\! Fuck MAGA\\! Fuck Trump\\! Fuck Nazis\\! Trans rights are human rights\\! Trans women are women\\! Trans men are men\\! Never let them take away your happiness\\!`,
+            {
+              parse_mode: "MarkdownV2",
+              reply_parameters: { message_id: ctx.msg.message_id }
+            }
+          );
         }
-      );
-    }
+      });
   }
 });
 

src/bot/features/isWKCGroup.ts

@@ -1,80 +0,0 @@
-import { Composer } from "grammy";
-import type { Context } from "#root/bot/context.js";
-import { logHandle } from "#root/bot/helpers/logging.js";
-
-const composer = new Composer<Context>();
-
-const feature = composer.chatType(["group", "supergroup"]);
-
-/**
- * What triggers this feature and adds to the log when it has been triggered.
- * The trigger is the command "/isWKCGroup"
- */
-feature.hears(
-  "/isWKCGroup",
-  logHandle("is-WKC-group"),
-  async (ctx: Context) => {
-    // Pulling the group IDs from the env variables.
-    const GROUP_IDS = process.env.GROUP_IDS
-      ? process.env.GROUP_IDS.split(",")
-      : undefined;
-
-    // Checking that context has chat, msg, and msg.from properties
-    if (ctx.chat && ctx.msg && ctx.msg.from) {
-      const groupID = ctx.chat.id;
-      const chatMember = await ctx.getChatMember(ctx.msg.from.id);
-
-      // Checking if the user is an admin.
-      if (["creator", "administrator"].includes(chatMember.status)) {
-        if (GROUP_IDS !== undefined) {
-          const flag = GROUP_IDS.includes(`${groupID}`);
-
-          // Checking if the group is whitelisted.
-          if (flag) {
-            // Confirming that the group is whitelisted and should be deleting detected messages.
-            await ctx.reply(
-              `This group is in the whitelisted and is a part of the WKC Telegram groups/communities\\. I should be deleting any Twitter/X and Meta links along with corresponding reformatting services within this group\\.`,
-              {
-                parse_mode: "MarkdownV2",
-                reply_parameters: { message_id: ctx.msg.message_id }
-              }
-            );
-          }
-
-          if (!flag) {
-            // Informing the user that features are blocked because the group is not in the whitelist.
-            await ctx.reply(
-              `This group is NOT in the whitelisted and is NOT a part of the WKC Telegram groups/communities\\. I am a bot designed to delete any Twitter/X and Meta links along with corresponding reformatting services within groups\\. You can fork me from this link: https://github\\.com/lucid\\-creations\\-media/no\\-twitter\\-bot and deploy me for use in your own groups\\!`,
-              {
-                parse_mode: "MarkdownV2",
-                reply_parameters: { message_id: ctx.msg.message_id }
-              }
-            );
-          }
-        }
-
-        if (!GROUP_IDS) {
-          // Altering that the whitelist is not set or the bot cannot access it.
-          await ctx.reply(
-            `There was a problem retrieving the whitelist\\. Check the env variables and try again\\.`,
-            {
-              parse_mode: "MarkdownV2",
-              reply_parameters: { message_id: ctx.msg.message_id }
-            }
-          );
-        }
-      } else {
-        // Informing the user that they need to be an admin to use this command.
-        await ctx.reply(
-          `You have to be an admin of this group to use this command\\!`,
-          {
-            parse_mode: "MarkdownV2",
-            reply_parameters: { message_id: ctx.msg.message_id }
-          }
-        );
-      }
-    }
-  }
-);
-
-export { composer as isWKCGroup };

src/bot/features/metaBlacklist.ts

@@ -2,6 +2,10 @@ import { Composer } from "grammy";
 import type { Context } from "#root/bot/context.js";
 import { logHandle } from "#root/bot/helpers/logging.js";
 import { metaRegex } from "#root/lib/metaLinkCheck.js";
+import urql from "#root/lib/urql.js";
+import increment from "#root/lib/graphql/mutations/incrimentMutation.js";
+import addGroup from "#root/lib/graphql/mutations/addGroupMutation.js";
+import incrementGroup from "#root/lib/graphql/mutations/incrementGroupMutation.js";
 
 const composer = new Composer<Context>();
 
@@ -15,40 +19,36 @@ feature.hears(
   metaRegex,
   logHandle("blacklist-detection-meta"),
   async (ctx: Context) => {
-    // Pulling the group IDs from the env variables.
-    const GROUP_IDS = process.env.GROUP_IDS
-      ? process.env.GROUP_IDS.split(",")
-      : undefined;
+    await urql.mutation(increment, { trigger: true });
 
     if (ctx.chat && ctx.msg) {
-      if (GROUP_IDS !== undefined) {
-        // Checking if the message is from a whitelisted group.
-        const groupID = ctx.chat.id;
-        const flag = GROUP_IDS.includes(`${groupID}`);
-        const username = ctx.msg.from?.username;
+      const username = ctx.msg.from?.username;
+      // Deletes the offending message.
+      ctx.msg.delete();
 
-        if (flag) {
-          // Deletes the offending message.
-          ctx.msg.delete();
-          // Replies to the user informing them of the action.
-          return await ctx.reply(
-            `@${username} Facebook and meta links along with with links to meta\\-owned services are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\.`,
-            { parse_mode: "MarkdownV2" }
-          );
-        }
-      }
+      return await urql
+        .mutation(increment, { link: true })
+        .toPromise()
+        .then(async () => {
+          if (ctx.msg) {
+            // Replies to the user informing them of the action.
+            await ctx.reply(
+              `@${username} Facebook and meta links along with with links to meta\\-owned services are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\.`,
+              { parse_mode: "MarkdownV2" }
+            );
 
-      // If the env variables are misconfigured an error is sent to the group.
-      if (!GROUP_IDS) {
-        console.info("Group IDS:", process.env.GROUP_IDS);
-        return await ctx.reply(
-          `There was a problem retrieving the whitelist\\. Check the env variables and try again\\.`,
-          {
-            parse_mode: "MarkdownV2",
-            reply_parameters: { message_id: ctx.msg.message_id }
+            const groupName = ctx.chat?.title;
+            const groupID = ctx.chat?.id;
+            const groupUsername = ctx.chat?.username;
+
+            return await urql
+              .mutation(addGroup, { groupID, groupName, groupUsername })
+              .toPromise()
+              .then(() =>
+                urql.mutation(incrementGroup, { groupID, linksDeleted: 1 })
+              );
           }
-        );
-      }
+        });
     }
   }
 );

src/bot/features/twitterBlacklist.ts

@@ -2,6 +2,10 @@ import { Composer } from "grammy";
 import type { Context } from "#root/bot/context.js";
 import { logHandle } from "#root/bot/helpers/logging.js";
 import { twitterRegex } from "#root/lib/twitterLinkCheck.js";
+import urql from "#root/lib/urql.js";
+import increment from "#root/lib/graphql/mutations/incrimentMutation.js";
+import addGroup from "#root/lib/graphql/mutations/addGroupMutation.js";
+import incrementGroup from "#root/lib/graphql/mutations/incrementGroupMutation.js";
 
 const composer = new Composer<Context>();
 
@@ -15,45 +19,36 @@ feature.hears(
   twitterRegex,
   logHandle("blacklist-detection-twitter"),
   async (ctx: Context) => {
-    // Pulling the group IDs from the env variables.
-    const GROUP_IDS = process.env.GROUP_IDS
-      ? process.env.GROUP_IDS.split(",")
-      : undefined;
+    await urql.mutation(increment, { trigger: true });
 
     if (ctx.chat && ctx.msg) {
-      if (GROUP_IDS !== undefined) {
-        // Checking if the message is from a whitelisted group.
-        const groupID = ctx.chat.id;
-        const flag = GROUP_IDS.includes(`${groupID}`);
-        const username = ctx.msg.from?.username;
+      const username = ctx.msg.from?.username;
+      // Deletes the offending message.
+      ctx.msg.delete();
 
-        if (flag) {
-          // Deletes the offending message.
-          ctx.msg.delete();
-          // Replies to the user informing them of the action.
-          return await ctx.reply(
-            `@${username} Twitter and X links along with reformatting services for Twitter posts are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\.`,
-            { parse_mode: "MarkdownV2" }
-          );
-        }
-      }
+      return await urql
+        .mutation(increment, { link: true })
+        .toPromise()
+        .then(async () => {
+          if (ctx.msg) {
+            // Replies to the user informing them of the action.
+            await ctx.reply(
+              `@${username} Twitter and X links along with reformatting services for Twitter posts are not allowed here\\. Please consider sharing the media directly or from other social media sources or websites\\. No administration action was taken against you other than the message being deleted\\.`,
+              { parse_mode: "MarkdownV2" }
+            );
 
-      // If the env variables are misconfigured an error is sent to the group.
-      if (!GROUP_IDS) {
-        console.info(
-          "Group IDS:",
-          process.env.GROUP_IDS,
-          GROUP_IDS,
-          GROUP_IDS !== undefined
-        );
-        return await ctx.reply(
-          `There was a problem retrieving the whitelist\\. Check the env variables and try again\\.`,
-          {
-            parse_mode: "MarkdownV2",
-            reply_parameters: { message_id: ctx.msg.message_id }
+            const groupName = ctx.chat?.title;
+            const groupID = ctx.chat?.id;
+            const groupUsername = ctx.chat?.username;
+
+            return await urql
+              .mutation(addGroup, { groupID, groupName, groupUsername })
+              .toPromise()
+              .then(() =>
+                urql.mutation(incrementGroup, { groupID, linksDeleted: 1 })
+              );
           }
-        );
-      }
+        });
     }
   }
 );

src/bot/features/welcome.ts

@@ -1,6 +1,8 @@
 import { Composer } from "grammy";
 import type { Context } from "#root/bot/context.js";
 import { logHandle } from "#root/bot/helpers/logging.js";
+import urql from "#root/lib/urql.js";
+import increment from "#root/lib/graphql/mutations/incrimentMutation.js";
 
 const composer = new Composer<Context>();
 
@@ -9,12 +11,21 @@ const feature = composer.chatType("private");
  * What triggers this feature and adds to the log when it has been triggered.
  * The trigger is the command "/start" or "start"
  */
-feature.command("start", logHandle("command-start"), ctx => {
-  // Responds with information about the bot.
-  return ctx.reply(
-    `Welcome\\! I am a bot created by Lucid for [Werewolf Kid Creations Media groups\\.](https://community.lucidcreations.media/) I am designed to delete any Twitter/X and Meta links along with corresponding reformatting services within the WKC groups\\. I now check embedded links\\! By default I only work with whitelisted group IDs\\. You can fork me from this link: https://github\\.com/lucid\\-creations\\-media/no\\-twitter\\-bot and deploy me for use in your own groups\\!\n\nLucid would consider hosting this bot for public use if crowd\\-funding would cover the hosting cost of the bot\\. Reach out if you would like to help\\.`,
-    { parse_mode: "MarkdownV2" }
-  );
+feature.command("start", logHandle("command-start"), async ctx => {
+  await urql.mutation(increment, { trigger: true });
+
+  await urql
+    .mutation(increment, { command: true })
+    .toPromise()
+    .then(async () => {
+      if (ctx.msg) {
+        // Responds with information about the bot.
+        return ctx.reply(
+          `Welcome\\! I am a bot created by Lucid for [Werewolf Kid Creations](https://werewolfkid.monster/) I am designed to delete any Twitter/X and Meta links along with corresponding reformatting services within groups\\. I also check embedded links and forwarded messages\\! I am currently in a public beta mode\\! Simply add me to a group and make me an admin with the permission to delete messages\\. From there I will start deleting any Twitter\\/X and Meta links I detect\\.`,
+          { parse_mode: "MarkdownV2" }
+        );
+      }
+    });
 });
 
 export { composer as welcomeFeature };

src/bot/index.ts

@@ -16,10 +16,8 @@ import { MemorySessionStorage, Bot as TelegramBot } from "grammy";
 import { twitterBlacklist } from "./features/twitterBlacklist.js";
 import { metaBlacklist } from "./features/metaBlacklist.js";
 import { botInfoCommand } from "./features/botInfoCommand.js";
-import { getGroupIDCommand } from "./features/getGroupIDCommand.js";
 import { helpCommand } from "./features/helpCommand.js";
 import { embedCheck } from "./features/embedCheck.js";
-import { isWKCGroup } from "./features/isWKCGroup.js";
 
 interface Dependencies {
   config: Config;
@@ -71,8 +69,6 @@ export function createBot(
 
   // Commands
   protectedBot.use(botInfoCommand);
-  protectedBot.use(getGroupIDCommand);
-  protectedBot.use(isWKCGroup);
   protectedBot.use(helpCommand);
 
   // Blacklist Feature

src/lib/graphql/mutations/addGroupMutation.ts

@@ -0,0 +1,24 @@
+import { gql } from "@urql/core";
+
+const addGroup = gql`
+  mutation addGroup(
+    $groupID: BigInt
+    $groupName: String
+    $groupUsername: String
+  ) {
+    addGroup(
+      groupID: $groupID
+      groupName: $groupName
+      groupUsername: $groupUsername
+    ) {
+      telegramID
+      name
+      username
+      linksDeleted
+      createdAt
+      updatedAt
+    }
+  }
+`;
+
+export default addGroup;

src/lib/graphql/mutations/incrementGroupMutation.ts

@@ -0,0 +1,16 @@
+import { gql } from "@urql/core";
+
+const incrementGroup = gql`
+  mutation incrementGroup($groupID: BigInt, $linksDeleted: Int) {
+    incrementGroup(groupID: $groupID, linksDeleted: $linksDeleted) {
+      telegramID
+      name
+      username
+      linksDeleted
+      createdAt
+      updatedAt
+    }
+  }
+`;
+
+export default incrementGroup;

src/lib/graphql/mutations/incrimentMutation.ts

@@ -0,0 +1,12 @@
+import { gql } from "@urql/core";
+
+const increment = gql`
+  mutation increment($command: Boolean, $link: Boolean, $trigger: Boolean) {
+    increment(command: $command, link: $link, trigger: $trigger) {
+      createdAt
+      updatedAt
+    }
+  }
+`;
+
+export default increment;

src/lib/urql.ts

@@ -0,0 +1,13 @@
+import { Client, cacheExchange, fetchExchange } from "@urql/core";
+
+const urql = new Client({
+  url: process.env.GRAPHQL_URL || "",
+  exchanges: [cacheExchange, fetchExchange],
+  fetchOptions: {
+    headers: {
+      "x-api-key": process.env?.GRAPHQL_API_TOKEN || ""
+    }
+  }
+});
+
+export default urql;

src/main.ts

@@ -64,21 +64,31 @@ async function startWebhook(config: WebhookConfig) {
   // to prevent receiving updates before the bot is ready
   await bot.init();
 
-  // start server
-  const info = await serverManager.start();
-  logger.info({
-    msg: "Server started",
-    url: info.url
-  });
+  const setWebhook = async (): Promise<void> => {
+    // set webhook
+    return await bot.api
+      .setWebhook(config.botWebhook, {
+        allowed_updates: config.botAllowedUpdates,
+        secret_token: config.botWebhookSecret
+      })
+      .then(() => {
+        logger.info({
+          msg: "Webhook was set",
+          url: config.botWebhook
+        });
+      });
+  };
 
-  // set webhook
-  await bot.api.setWebhook(config.botWebhook, {
-    allowed_updates: config.botAllowedUpdates,
-    secret_token: config.botWebhookSecret
-  });
-  logger.info({
-    msg: "Webhook was set",
-    url: config.botWebhook
+  // start server
+  const info = await serverManager.start().then(async info => {
+    logger.info({
+      msg: "Server started",
+      url: info.url
+    });
+
+    setTimeout(async () => {
+      await setWebhook();
+    }, 10000);
   });
 }