.npmrc

@@ -1,3 +0,0 @@
-@astrogd:registry=https://git.astrogd.cloud/api/packages/packages/npm/
-@internal:registry=https://git.astrogd.cloud/api/packages/internal/npm/
-//git.astrogd.cloud/api/packages/internal/npm/:_authToken=${NPM_TOKEN}

Changelog.md

@@ -1,43 +0,0 @@
-# Changelog
-
-This file is used to list changes made to this software.
-
-_Current development release: 1.1.1_
-
-## V1.1.1 [2023-09-16]
-
-### Updates
-- Updated packages to latest versions
-
-### Bugfixes
-- Fixed a bug where the bot would crash on startup if the database connection establishment took too long
-
-### Other
-- Renamed db service in docker compose file from database to db
-
-## V1.1.0 [2022-11-29]
-
-### Features
-
-- If a channel gets deleted and the responsible user has been detected, a message will be sent to that user informing him of the deletion
-
-## V1.0.0 [2022-11-29]
-
-### Features
-
-- /info
-- /logchannel
-- /blocklist get
-- /blocklist add
-- /blocklist remove
-- /preservesettings
-- /showblocklist
-- /showsettings
-- Data will be deleted by default when the bot leaves the server
-- Server admins can change the behaviour of the bot when it leaves the server to keep the data persistent
-- Scans for blocked words in channel names and deletes the channel if found
-- Gets the user creating or renaming a channel to a blocked word
-- When settings are changed or channels are deleted, notifications to a logchannel can be enabled
-- CLI to change settings and get information during runtime by attaching to the apps docker container
-- API for automated uptime checks to prevent the bot from going offline unnoticed
-- Bot notifies admins via /showsettings when it lacks permissions needed for its functionality

Dockerfile

@@ -10,5 +10,4 @@ ENV NODE_ENV=production
 COPY --from=builder node_modules ./node_modules
 COPY build/ .
 VOLUME [ "/usr/src/app/data" ]
-EXPOSE 80
 CMD ["node", "--enable-source-maps", "index.js"]

README.md

@@ -1,61 +1,30 @@
 # eu.astrogd.white-leopard
-
 A Discord bot that checks Discord channel names for banned words and prevents renaming of them
 
 ## Commands
-
+### /logchanel [channel?]
-### /logchanel [channel?] `Permission: MANAGE_GUILD`
-
 Sets the channel where the bot will log if a channel meets the banned word criteria. If channel is omitted, the log channel will be disabled.
 
-### /blocklist `Permission: MANAGE_GUILD`
+### /blocklist
-
 #### /blocklist get
-
+Gets the global and server specific banned word list and returns it
-Returns the global and server specific banned word list and returns it (Same behaviour as /showblocklist)
 
 #### /blocklist add [word]
-
 Adds the word to the server specific blocklist
 
 #### /blocklist remove [word]
-
 Removes the word from the server specific blocklist
 
-### /info `Permission: EVERYONE`
-
-Returns general information about the bot and the servers stats
-
-### /preservesettings `Permission: ADMINISTRATOR`
-
-Changes the behaviour when the bot leaves the server.
-Options are:
-
-- Keep settings persistent even if the bot leaves
-- Delete setting when the bot leaves the server [default]
-
-### /showblocklist `Permission: MANAGE_CHANNELS`
-
-Returns the global and server specific banned word list and returns it
-
-### /showsettings `Permission: MANAGE_GUILD`
-
-Returns the current settings for the server
-
 ## Environment variables
-
 | Name        | Description                                                   | Required | Example             |
-| :--------------- | :------------------------------------------------------------------------------ | :------: | :------------------ |
+| :---------- | :------------------------------------------------------------ | :------: | :------------------ |
 | TOKEN       | Discord bot token to log into the API with                    |   ▶️/🚀    | NzYzMDP3MzE1Mzky... |
-| DB_HOST          | Hostname of the database                                                        |    ▶️     | 127.0.0.1           |
+| DB_HOST     | Hostname of the database                                      |    ▶️     | 127.0.0.1:3546      |
 | DB_USERNAME | Username of the database                                      |    ▶️     | root                |
 | DB_PASSWORD | Password of the database                                      |    ▶️     | abc123              |
 | DB_DATABASE | Database name                                                 |    ▶️     | white-leopard       |
 | CLIENT_ID   | Client ID of the Discord appication associated with the token |    🚀     | 763035392692274     |
-| DEPLOY_TOKEN     | Production Discord bot token to log into the API with                           |    🚀     | NzYzMDP3MzE1Mzky... |
-| DEPLOY_CLIENT_ID | Production Client ID of the Discord appication associated with the deploy token |    🚀     | 763035392692274     |
-
-### Icon explanation
 
+### Icon explanation:
 - ▶️ = Required in runtime
 - 🚀 = Required during CI/CD

ci/deploy.ts

@@ -4,8 +4,8 @@ import dotenv from "dotenv";
 dotenv.config({ path: path.join(__dirname, "../.env") });
 
 // Environment checking
-const TOKEN = process.env["DEPLOY_TOKEN"];
+const TOKEN = process.env["TOKEN"];
-const CLIENT_ID = process.env["DEPLOY_CLIENT_ID"];
+const CLIENT_ID = process.env["CLIENT_ID"];
 
 if (!TOKEN) throw new ReferenceError("Environment variable TOKEN is missing");
 if (!CLIENT_ID) throw new ReferenceError("Environment variable CLIENT_ID is missing");

docker-compose.yml

@@ -1,23 +1,18 @@
-version: "3.9"
+version: "2"
 services:
   app:
     image: astrogd/white-leopard:dev
     build: ./
-    ports:
-      - 80:80
-    tty: true
-    stdin_open: true
     depends_on:
-      - db
+      - database
     restart: unless-stopped
     environment:
       - TOKEN=$TOKEN
-      - DB_HOST=db
+      - DB_HOST=database
       - DB_USERNAME=$DB_USERNAME
       - DB_PASSWORD=$DB_PASSWORD
       - DB_DATABASE=$DB_DATABASE
-      - MONITOR_URL=$MONITOR_URL
+  database:
-  db:
     image: postgres:latest
     restart: unless-stopped
     ports:

index.ts

@@ -4,12 +4,8 @@ import swapConsole from "./src/tools/consoleSwapper";
 config();
 swapConsole();
 
-import "./src/tools/startupTime";
 import "./src/client/init";
 import "./src/commands";
-import "./src/events";
-import "./src/cli";
-import "./src/service";
 import client from "./src/client";
 
 function shutdown() {
@@ -20,4 +16,3 @@ function shutdown() {
 
 process.on("SIGINT", shutdown);
 process.on("SIGHUP", shutdown);
-process.on("SIGTERM", shutdown);

package.json

@@ -1,27 +1,18 @@
 {
   "name": "eu.astrogd.white-leopard",
-  "version": "1.2.0",
+  "version": "1.0.0-alpha.2",
   "description": "A Discord bot that checks channel names for blacklisted words and reverts the changes if necessary",
   "main": "build/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "tsc && shx cp package-lock.json build/package-lock.json",
-    "start:rebuild": "npm run build && node --enable-source-maps .",
+    "deploy-dev": "ts-node ci/devDeploy.ts",
-    "version:dev": "npm version prerelease --preid dev --no-commit-hooks --no-git-tag-version",
+    "start": "npm run build && npm run deploy-dev && docker-compose up --no-start && docker compose start database && node --enable-source-maps .",
-    "version:patch": "npm version prepatch --preid dev --no-commit-hooks --no-git-tag-version",
+    "migration:create": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate -d src/data/dataSource.ts -p src/data/migrations/data",
-    "version:minor": "npm version preminor --preid dev --no-commit-hooks --no-git-tag-version",
+    "migration:run": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:run -d src/data/dataSource.ts",
-    "version:major": "npm version premajor --preid dev --no-commit-hooks --no-git-tag-version",
+    "migration:revert": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:revert -d src/data/dataSource.ts",
-    "version:release": "npm version patch --no-commit-hooks --no-git-tag-version",
+    "migration:show": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:show -d src/data/dataSource.ts",
-    "deploy-commands:dev": "ts-node ci/devDeploy.ts",
+    "migration:check": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate --check -d src/data/dataSource.ts src/data/migrations/data"
-    "deploy-commands:prod": "ts-node ci/deploy.ts",
-    "deploy:dev": "npm run build && npm run deploy-commands:dev && docker compose build && docker compose up -d",
-    "deploy:prod": "rimraf build && npm run build && npm run deploy-commands:prod && docker build -t astrogd/white-leopard:latest . && docker push astrogd/white-leopard:latest",
-    "start": "npm run build && npm run deploy-commands:dev && docker-compose up -d db && node --enable-source-maps .",
-    "migration:create": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate -d src/data/dataSource.migration.ts -p src/data/migrations/data",
-    "migration:run": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:run -d src/data/dataSource.migration.ts",
-    "migration:revert": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:revert -d src/data/dataSource.migration.ts",
-    "migration:show": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:show -d src/data/dataSource.migration.ts",
-    "migration:check": "node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate --check -d src/data/dataSource.migration.ts src/data/migrations/data"
   },
   "repository": {
     "type": "git",
@@ -34,21 +25,17 @@
   },
   "homepage": "https://github.com/r-Overwatch2/eu.astrogd.white-leopard#readme",
   "devDependencies": {
-    "@types/express": "^4.17.14",
+    "@types/fs-extra": "^9.0.13",
-    "@types/fs-extra": "^11.0.2",
+    "@types/node": "^18.11.9",
-    "@types/node": "^18.17.17",
+    "rimraf": "^3.0.2",
-    "rimraf": "^5.0.1",
     "shx": "^0.3.4",
     "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@astrogd/eu.astrogd.uptime-kuma-push-monitor": "^1.0.0-dev.3",
+    "discord.js": "^14.6.0",
-    "discord.js": "^14.13.0",
     "dotenv": "^16.0.3",
-    "express": "^4.18.2",
+    "fs-extra": "^10.1.0",
-    "fs-extra": "^11.0.0",
-    "moment": "^2.29.4",
     "pg": "^8.8.0",
     "typeorm": "^0.3.10"
   }

src/cli/global.ts

@@ -1,80 +0,0 @@
-import { IsNull } from "typeorm";
-import { Badword, database } from "../data";
-import { Console } from "console";
-
-const console = new Console(process.stdout);
-
-export default async function execute(args: string[]) {
-    const command = args[0];
-    if (!command) return printHelp();
-
-    switch (command.toLowerCase()) {
-        case "get": {
-            const globalWords = await database.getRepository(Badword).find({
-                where: {
-                    guildID: IsNull()
-                }
-            });
-
-            console.log(`Global blocked words:\n\n${globalWords.map(w => w.value).reduce((c, n) => c + ", " + n, "").slice(2)}`);
-            break;
-        }
-
-        case "add": {
-            const word = args[1]?.toLowerCase();
-            if (!word) return printHelp();
-
-            if (await database.getRepository(Badword).count({
-                where: {
-                    value: word,
-                    guildID: IsNull()
-                }
-            }) > 0) return console.log(`${word} is already in the blocklist`);
-
-            const entity = new Badword();
-            entity.value = word;
-            
-            await database.getRepository(Badword).save(entity);
-            console.log(`${word} has been added to the global block list`);
-            break;
-        }
-
-        case "remove": {
-            const word = args[1]?.toLowerCase();
-            if (!word) return printHelp();
-
-            await database.getRepository(Badword).delete({
-                value: word,
-                guildID: IsNull()
-            });
-
-            console.log(`Removed ${word} from the global block list`);
-            break;
-        }
-
-        case "count": {
-            const count = await database.getRepository(Badword).count({
-                where: {
-                    guildID: IsNull()
-                }
-            });
-
-            console.log(`There are ${count} globally blocked words`);
-            break;
-        }
-
-        default: {
-            printHelp();
-            break;
-        }
-    }
-}
-
-function printHelp() {
-    console.log(`Usage "global":
-
-global get
-global add [WORD]
-global remove [WORD]
-global count`);
-}

src/cli/guild.ts

@@ -1,140 +0,0 @@
-import { getGuildSetting } from "../tools/data";
-import { Badword, database, GuildSetting } from "../data";
-import { Console } from "console";
-
-const console = new Console(process.stdout);
-
-export default async function execute(args: string[]) {
-    const command = args[0];
-    if (!command) return printHelp();
-
-    switch (command.toLowerCase()) {
-        case "info": {
-            if (!args[1]) return printHelp();
-            const settings = await getGuildSetting(args[1]);
-            const wordCount = await database.getRepository(Badword).count({
-                where: {
-                    guildID: args[1]
-                }
-            });
-
-            console.log(`Guild ${args[1]}:
-    - Preserve Settings: ${settings.preserveDataOnGuildLeave ? "ENABLED" : "DISABLED"}
-    - Logchannel: ${settings.notificationChannelID ? `ENABLED (${settings.notificationChannelID})` : "DISABLED"}
-    - blocked Words: ${wordCount}`);
-            break;
-        }
-
-        case "words": {
-            if (!args[1] || !args[2]) return printWordHelp();
-
-            const badWords = await database.getRepository(Badword).find({
-                where: {
-                    guildID: args[2]
-                }
-            });
-
-            switch (args[1].toLowerCase()) {
-                case "get": {
-                    console.log(`Bad words for ${args[2]}:\n\n${badWords.map((badWord) => badWord.value).reduce((prev, next) => prev + ", " + next, "").slice(2)}`);
-                    break;
-                }
-
-                case "add": {
-                    if (!args[3]) {
-                        printWordHelp();
-                        break;
-                    }
-
-                    if (badWords.filter(w => w.value === args[3]!.toLowerCase()).length > 0) {
-                        console.log("Word already exists");
-                        break;
-                    }
-
-                    const badWord = new Badword();
-                    badWord.guildID = args[2];
-                    badWord.value = args[3].toLowerCase();
-
-                    await database.getRepository(Badword).save(badWord);
-                    console.log(`${args[3].toLowerCase()} added to guild ${args[2]}`);
-                    break;
-                }
-
-                case "remove": {
-                    if (!args[3]) {
-                        printWordHelp();
-                        break;
-                    }
-
-                    const badWord = badWords.find((w) => w.value === args[3]?.toLowerCase());
-
-                    if (!badWord) {
-                        console.log(`${args[3].toLowerCase()} is not in blocklist of guild ${args[2]}`);
-                        break;
-                    }
-
-                    await database.getRepository(Badword).delete({
-                        id: badWord.id
-                    });
-
-                    console.log(`${badWord.value} deleted for guild ${args[2]}`);
-                    break;
-                }
-
-                case "clear": {
-                    await database.getRepository(Badword).delete({
-                        guildID: args[2]
-                    });
-
-                    console.log(`Deleted ${badWords.length} entries`);
-                    break;
-                }
-
-                default: {
-                    printHelp();
-                    break;
-                }
-            }
-
-            break;
-        }
-
-        case "delete": {
-            if (!args[1]) return printHelp();
-
-            await database.getRepository(GuildSetting).delete({
-                id: args[1]
-            });
-
-            await database.getRepository(Badword).delete({
-                guildID: args[1]
-            });
-
-            console.log(`Deleted all data for guild ${args[1]}`);
-            break;
-        }
-
-        default: {
-            printHelp();
-            break;
-        }
-    }
-}
-
-
-function printHelp() {
-    console.log(`Usage "guild":
-
-guild info [GUILDID]
-guild words [get|add|remove|clear]
-guild delete [GUILDID]`);
-}
-
-function printWordHelp() {
-    console.log(`Usage "guild words":
-
-guild words get [GUILDID]
-guild words add [GUILDID] [WORD]
-guild words remove [GUILDID] [WORD]
-guild words clear [GUILDID]`);
-}

src/cli/index.ts

@@ -1,75 +0,0 @@
-import * as readline from "node:readline/promises";
-import { stdin as input, stdout as output } from "node:process";
-import pack from "../../package.json";
-import { Console } from "node:console";
-import moment from "moment";
-import startupTime from "../tools/startupTime";
-import client from "../client";
-
-import guild from "./guild";
-import global from "./global";
-
-const console = new Console(process.stdout);
-
-const rl = readline.createInterface(input, output);
-
-rl.on("line", async (msg) => {
-    const [command, ...args] = msg.split(" ");
-    if (!command) return;
-
-    switch (command.toLowerCase()) {
-        case "version": {
-            console.log(`Channel filter V${pack.version} by AstroGD®`);
-            break;
-        }
-
-        case "uptime": {
-            console.log(`Application is running for ${moment(startupTime).fromNow(true)}`);
-            break;
-        }
-
-        case "clear": {
-            console.clear();
-            break;
-        }
-
-        case "guild": {
-            await guild(args);
-            break;
-        }
-
-        case "help": {
-            printHelp();
-            break;
-        }
-
-        case "global": {
-            await global(args);
-            break;
-        }
-
-        case "servercount": {
-            console.log(`This bot is on ${client.guilds.cache.size} guilds`);
-            break;
-        }
-
-        default: {
-            console.log(`Unknown command. Try "help" for help`);
-            break;
-        }
-    }
-
-    rl.prompt();
-});
-
-function printHelp() {
-    console.log(`Commands:
-
-version
-uptime
-guild
-global
-help
-servercount
-clear`);
-}

src/client/init.ts

@@ -1,25 +1,10 @@
-import { runCleanup } from "../service";
 import client from "./index";
-import { initPromise } from "../data/dataSource";
-import pushMonitor from "@astrogd/eu.astrogd.uptime-kuma-push-monitor";
 
 const token = process.env["TOKEN"];
 if (!token) throw new ReferenceError("TOKEN environment variable is missing");
 
-async function run() {
-    console.log("Establishing database connection");
-    await initPromise;
-    console.log("Connection established\nAuthenticating with Discord API");
 client.login(token);
-}
 
-client.on("ready", async () => {
+client.on("ready", () => {
     console.log(`Connected to Discord API. Bot account is ${client.user?.tag} (${client.user?.id})`);
-    if (process.env["MONITOR_URL"]) pushMonitor.register(process.env["MONITOR_URL"], 120);
-    pushMonitor.enableShutdownNotifications();
-    pushMonitor.setPerformanceHandler(() => client.ws.ping);
-
-    runCleanup();
 });
-
-run();

src/commands/blocklist.ts

@@ -1,11 +1,9 @@
 import { ChatInputCommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
 import { database, Badword } from "../data";
 import { IsNull } from "typeorm";
-import { getGuildSetting } from "../tools/data";
+import { getGuildSetting, isPremiumActive } from "../tools/data";
 import getDefaultEmbed, { getFailedEmbed, getSuccessEmbed } from "../tools/defaultEmbeds";
 import { getGuildChannel } from "../tools/discord";
-import { Color, Emoji } from "../tools/design";
-import { execute as showBlocklistRunner } from "./showblocklist";
 
 const builder = new SlashCommandBuilder();
 builder.setName("blocklist");
@@ -46,12 +44,30 @@ async function execute(interaction: ChatInputCommandInteraction): Promise<void>
     if (!interaction.guildId) throw new Error("Command was executed in DM context");
 
     const settings = await getGuildSetting(interaction.guildId);
+    const isPremium = isPremiumActive(settings.isPremiumUntil);
 
     const logChannel = settings.notificationChannelID ? await getGuildChannel(interaction.guildId, settings.notificationChannelID) : null;
 
     switch (interaction.options.getSubcommand(true)) {
         case "get": {
-            await showBlocklistRunner(interaction);
+            const guildBadWords = await database.getRepository(Badword).find({
+                select: {
+                    value: true
+                },
+                where: {
+                    guildID: interaction.guildId
+                }
+            });
+            const globalBadWords = await database.getRepository(Badword).find({
+                where: {
+                    guildID: IsNull()
+                }
+            });
+
+            interaction.reply({
+                content: `\`\`\`Global bad word list\`\`\`\n||${globalBadWords.map((word) => word.value).reduce((prev, next) => prev + ", " + next, "").slice(2)} ||\n\`\`\`Local server bad word list (${guildBadWords.length}/${isPremium ? 100 : 10})\`\`\`\n||${guildBadWords.map((word) => word.value).reduce((prev, next) => prev + ", " + next, "").slice(2)} ||`,
+                ephemeral: true
+            }).catch();
             break;
         }
 
@@ -62,14 +78,14 @@ async function execute(interaction: ChatInputCommandInteraction): Promise<void>
                 }
             });
 
-            const limit = 100;
+            const limit = isPremium ? 100 : 10;
             if (count >= limit) {
                 const embed = getFailedEmbed();
-                embed.setDescription(`You reached the word limit for your guild. Please delete a word before adding a new one`);
+                embed.setDescription("You reached the word limit for your guild. Please delete a word before adding a new one");
                 interaction.reply({
                     embeds: [embed],
                     ephemeral: true
-                }).catch(() => {});
+                }).catch();
                 return;
             }
 
@@ -88,7 +104,7 @@ async function execute(interaction: ChatInputCommandInteraction): Promise<void>
                 interaction.reply({
                     embeds: [embed],
                     ephemeral: true
-                }).catch(() => {});
+                }).catch();
                 return;
             }
 
@@ -106,8 +122,7 @@ async function execute(interaction: ChatInputCommandInteraction): Promise<void>
             });
 
             const logMessage = getDefaultEmbed();
-            logMessage.setTitle(`${Emoji.SETTINGS} Word added`);
+            logMessage.setTitle("Word added");
-            logMessage.setColor(Color.INFORMING_BLUE);
             logMessage.setDescription(`"||${word}||" has been added to the blocklist`);
             logMessage.addFields({
                 name: "This action was performed by",
@@ -116,7 +131,7 @@ async function execute(interaction: ChatInputCommandInteraction): Promise<void>
             if (logChannel && logChannel.isTextBased()) {
                 logChannel.send({
                     embeds: [logMessage]
-                }).catch(() => {});
+                }).catch();
             }
             break;
         }
@@ -137,7 +152,7 @@ async function execute(interaction: ChatInputCommandInteraction): Promise<void>
                 interaction.reply({
                     embeds: [embed],
                     ephemeral: true
-                }).catch(() => {});
+                }).catch();
                 return;
             }
 
@@ -150,11 +165,10 @@ async function execute(interaction: ChatInputCommandInteraction): Promise<void>
             interaction.reply({
                 embeds: [embed],
                 ephemeral: true
-            }).catch(() => {});
+            }).catch();
 
             const logMessage = getDefaultEmbed();
-            logMessage.setTitle(`${Emoji.SETTINGS} Word removed`);
+            logMessage.setTitle("Word removed");
-            logMessage.setColor(Color.INFORMING_BLUE);
             logMessage.setDescription(`"||${word}||" has been removed from the blocklist`);
             logMessage.addFields({
                 name: "This action was performed by",
@@ -163,7 +177,7 @@ async function execute(interaction: ChatInputCommandInteraction): Promise<void>
             if (logChannel && logChannel.isTextBased()) {
                 logChannel.send({
                     embeds: [logMessage]
-                }).catch(() => {});
+                }).catch();
             }
             break;
         }

src/commands/ci.ts

@@ -1,19 +1,7 @@
-import * as notification from "./logchannel";
+import * as notification from "./notification";
 import * as blocklist from "./blocklist";
-import * as info from "./info";
-import * as preserveSettings from "./preserveSettings";
-import * as showBlocklist from "./showblocklist";
-import * as showSettings from "./showSettings";
 
-const commands = [];
+const array = [notification.builder.toJSON(), blocklist.builder.toJSON()];
-commands.push(notification);
-commands.push(blocklist);
-commands.push(info);
-commands.push(preserveSettings);
-commands.push(showBlocklist);
-commands.push(showSettings);
-
-const array = commands.map((command) => command.builder.toJSON());
 
 export {
     array

src/commands/index.ts

@@ -1,20 +1,12 @@
 import { ChatInputCommandInteraction, Collection, Events, SlashCommandBuilder } from "discord.js";
-import * as notification from "./logchannel";
+import * as notification from "./notification";
 import * as blocklist from "./blocklist";
-import * as info from "./info";
-import * as preserveSettings from "./preserveSettings";
-import * as showBlocklist from "./showblocklist";
-import * as showSettings from "./showSettings";
 import client from "../client";
 import getDefaultEmbed from "../tools/defaultEmbeds";
 
 const commands = new Collection<string, { builder: SlashCommandBuilder, execute: (interaction: ChatInputCommandInteraction) => Promise<void> }>();
 commands.set(notification.builder.name, notification);
 commands.set(blocklist.builder.name, blocklist);
-commands.set(info.builder.name, info);
-commands.set(preserveSettings.builder.name, preserveSettings);
-commands.set(showBlocklist.builder.name, showBlocklist);
-commands.set(showSettings.builder.name, showSettings);
 
 client.on(Events.InteractionCreate, async (interaction) => {
     if (!interaction.isChatInputCommand()) return;
@@ -44,6 +36,6 @@ client.on(Events.InteractionCreate, async (interaction) => {
         await interaction.reply({
             embeds: [embed],
             ephemeral: true
-        }).catch(() => {});
+        }).catch();
     }
 });

src/commands/info.ts

@@ -1,59 +0,0 @@
-import { ChatInputCommandInteraction, SlashCommandBuilder } from "discord.js";
-import { IsNull } from "typeorm";
-import { Badword, database } from "../data";
-import getDefaultEmbed from "../tools/defaultEmbeds";
-import pack from "../../package.json";
-import { Color, Emoji } from "../tools/design";
-
-const builder = new SlashCommandBuilder();
-builder.setName("info");
-builder.setDescription("Shows information about this bot and the server settings");
-builder.setDMPermission(false);
-
-async function execute(interaction: ChatInputCommandInteraction): Promise<void> {
-    if (!interaction.inGuild()) throw new Error("Command was executed outside guild context");
-
-    const globalBlockedWordsCount = await database.getRepository(Badword).count({
-        where: {
-            guildID: IsNull()
-        }
-    });
-    const localBlockedWordsCount = await database.getRepository(Badword).count({
-        where: {
-            guildID: interaction.guildId
-        }
-    });
-
-    const embed = getDefaultEmbed();
-    embed.setTitle(`${Emoji.SECURITY_CHALLENGE} Channel filter V${pack.version} by AstroGD®`);
-    embed.setDescription(`Codename eu.astrogd.white-leopard`);
-    embed.setColor(Color.INFORMING_BLUE);
-    embed.addFields({
-        name: "What does this bot do?",
-        value: "This bot checks for blocked words contained in channel names and reverts the changes if found."
-    },{
-        name: "Author",
-        value: `This bot was created by AstroGD#0001 ${Emoji.ASTROGD} mainly for the official r/Overwatch2 Subreddit Discord server`
-    },{
-        name: "Global word count",
-        value: globalBlockedWordsCount.toString(),
-        inline: true
-    },{
-        name: "Local word count",
-        value: localBlockedWordsCount.toString(),
-        inline: true
-    },{
-        name: `${Emoji.WAVING} Have a question or want to say hello?`,
-        value: "Join the support Discord server at https://go.astrogd.eu/discord"
-    });
-
-    interaction.reply({
-        embeds: [embed],
-        ephemeral: true
-    }).catch(() => {});
-}
-
-export {
-    builder,
-    execute
-}

src/commands/notification.ts

@@ -1,15 +1,14 @@
 import { SlashCommandBuilder, PermissionFlagsBits, ChannelType, ChatInputCommandInteraction, NewsChannel, TextBasedChannel, CategoryChannel, StageChannel, TextChannel, PrivateThreadChannel, PublicThreadChannel, VoiceChannel, APIInteractionDataResolvedChannel, ForumChannel } from "discord.js";
-import getDefaultEmbed, { getFailedEmbed, getSuccessEmbed } from "../tools/defaultEmbeds";
+import getDefaultEmbed, { getSuccessEmbed } from "../tools/defaultEmbeds";
 import { database, GuildSetting } from "../data";
 import { getGuildSetting } from "../tools/data";
-import { getGuildChannel, getChannelPermission } from "../tools/discord";
+import { getGuildChannel } from "../tools/discord";
-import { Emoji } from "../tools/design";
 
 const builder = new SlashCommandBuilder();
 builder.setName("logchannel");
 builder.setDescription("Configures the log channel");
 builder.setDMPermission(false);
-builder.setDefaultMemberPermissions(PermissionFlagsBits.ManageGuild);
+builder.setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels);
 builder.addChannelOption((option) => {
     option.addChannelTypes(ChannelType.GuildText, ChannelType.GuildAnnouncement);
     option.setName("channel");
@@ -35,7 +34,7 @@ async function resetNotificationChannel(guildSetting: GuildSetting, interaction:
     if (logChannel && logChannel.isTextBased()) {
         logChannel.send({
             embeds: [logEmbed]
-        }).catch(() => {});
+        }).catch();
     }
 
     const embed = getSuccessEmbed();
@@ -43,7 +42,7 @@ async function resetNotificationChannel(guildSetting: GuildSetting, interaction:
     interaction.reply({
         embeds: [embed],
         ephemeral: true
-    }).catch(() => {});
+    }).catch();
 }
 
 const execute = async (interaction: ChatInputCommandInteraction) => {
@@ -55,24 +54,10 @@ const execute = async (interaction: ChatInputCommandInteraction) => {
     if (!optionVal) return await resetNotificationChannel(guildSetting, interaction);
 
     const channel = getTextBasedChannel(optionVal);
-    if (channel.isDMBased()) return;
-
-    const permissions = await getChannelPermission(channel);
-    if (!permissions || !permissions.has(PermissionFlagsBits.ViewChannel) || !permissions.has(PermissionFlagsBits.SendMessages)) {
-        const embed = getFailedEmbed();
-        embed.setDescription(`Bot doesn't have permission to view and/or write in channel <#${channel.id}>`);
-        interaction.reply({
-            embeds: [ embed ],
-            ephemeral: true
-        }).catch(() => {});
-        return;
-    }
-
-
     if (guildSetting.notificationChannelID) {
         const oldLogChannel = await getGuildChannel(guildSetting.id, guildSetting.notificationChannelID);
         const embed = getDefaultEmbed();
-        embed.setTitle(`${Emoji.SETTINGS} Settings changed`);
+        embed.setTitle("Settings changed");
         embed.setDescription(`Log channel has been switched to <#${channel.id}>`);
         embed.addFields({
             name: "This action was performed by",
@@ -82,7 +67,7 @@ const execute = async (interaction: ChatInputCommandInteraction) => {
         if (oldLogChannel && oldLogChannel.isTextBased()) {
             oldLogChannel.send({
                 embeds: [embed]
-            }).catch(() => {});
+            }).catch();
         }
     }
 
@@ -90,7 +75,7 @@ const execute = async (interaction: ChatInputCommandInteraction) => {
     await database.getRepository(GuildSetting).save(guildSetting);
 
     const embed = getDefaultEmbed();
-    embed.setTitle(`${Emoji.SETTINGS} Settings changed`);
+    embed.setTitle("Settings changed");
     embed.setDescription("This channel has been set as the log channel");
     embed.addFields({
         name: "This action was performed by",
@@ -99,7 +84,7 @@ const execute = async (interaction: ChatInputCommandInteraction) => {
 
     channel.send({
         embeds: [ embed ]
-    }).catch(() => {});
+    }).catch();
 
     const reply = getSuccessEmbed();
     reply.setDescription(`Log channel was set to <#${channel.id}>`);
@@ -107,7 +92,7 @@ const execute = async (interaction: ChatInputCommandInteraction) => {
     interaction.reply({
         embeds: [ reply ],
         ephemeral: true
-    }).catch(() => {});
+    }).catch();
 
     return;
 }

src/commands/preserveSettings.ts

@@ -1,66 +0,0 @@
-import { SlashCommandBuilder, ChatInputCommandInteraction, PermissionFlagsBits } from "discord.js";
-import { database, GuildSetting } from "../data";
-import { getGuildSetting } from "../tools/data";
-import getDefaultEmbed, { getSuccessEmbed } from "../tools/defaultEmbeds";
-import { Emoji } from "../tools/design";
-import { getGuildChannel } from "../tools/discord";
-
-const builder = new SlashCommandBuilder();
-builder.setName("preservesettings");
-builder.setDescription("Sets if the bot should save the server settings and blocklist if it leaves the server or delete it");
-builder.addStringOption((option) => {
-    option.addChoices({
-        name: "Keep data when bot leaves the server",
-        value: "keep"
-    }, {
-        name: "Delete data when bot leaves the server",
-        value: "delete"
-    });
-    option.setName("behaviour");
-    option.setDescription("How the bot behaves when leaving the server");
-    option.setRequired(true);
-    return option;
-});
-builder.setDMPermission(false);
-builder.setDefaultMemberPermissions(PermissionFlagsBits.Administrator);
-
-async function execute(interaction: ChatInputCommandInteraction): Promise<void> {
-    if (!interaction.inGuild()) throw new Error("Command was executed outside guild context");
-
-    const settings = await getGuildSetting(interaction.guildId);
-    const option = interaction.options.getString("behaviour", true).toLowerCase();
-
-    if (option !== "keep" && option !== "delete") throw new TypeError(`option "behaviour" expected to be of type "keep" | "delete" but was "${option}"`);
-
-    settings.preserveDataOnGuildLeave = option === "keep";
-
-    await database.getRepository(GuildSetting).save(settings);
-
-    const embed = getSuccessEmbed();
-    embed.setDescription(`Preserve settings on server leave is now ${settings.preserveDataOnGuildLeave ? "ENABLED" : "DISABLED"}`);
-
-    interaction.reply({
-        embeds: [embed],
-        ephemeral: true
-    }).catch(() => {});
-
-    if (!settings.notificationChannelID) return;
-    const logChannel = await getGuildChannel(interaction.guildId, settings.notificationChannelID);
-    if (!logChannel || !logChannel.isTextBased()) return;
-    const logEmbed = getDefaultEmbed();
-    logEmbed.setTitle(`${Emoji.SETTINGS} Settings changed`);
-    logEmbed.setDescription(`Preserve settings on server leave is now ${settings.preserveDataOnGuildLeave ? "ENABLED" : "DISABLED"}`);
-    logEmbed.addFields({
-        name: "This action was performed by",
-        value: `${interaction.user.tag} (${interaction.user.id})`
-    });
-
-    logChannel.send({
-        embeds: [logEmbed]
-    }).catch(() => {});
-}
-
-export {
-    builder,
-    execute
-}

src/commands/showSettings.ts

@@ -1,110 +0,0 @@
-import { ChatInputCommandInteraction, Guild, PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
-import client from "../client";
-import { Badword, database } from "../data";
-import { getGuildSetting } from "../tools/data";
-import getDefaultEmbed from "../tools/defaultEmbeds";
-import { Color, Emoji } from "../tools/design";
-import { getGuildChannel, getChannelPermission } from "../tools/discord";
-
-const builder = new SlashCommandBuilder();
-builder.setName("showsettings");
-builder.setDescription("Show the current settings of this guild");
-builder.setDMPermission(false);
-builder.setDefaultMemberPermissions(PermissionFlagsBits.ManageGuild);
-
-async function execute(interaction: ChatInputCommandInteraction): Promise<void> {
-    if (!interaction.inGuild()) throw new Error("Interaction was performed outside guild context");
-
-    const guild = await new Promise<null | Guild>((resolve) => {
-        client.guilds.fetch(interaction.guildId).catch(() => {resolve(null)}).then((guild) => {resolve(guild || null)});
-    });
-
-    if (!guild) throw new Error("Guild is unavailable");
-
-    const settings = await getGuildSetting(interaction.guildId);
-    const wordCount = await database.getRepository(Badword).count({
-        where: {
-            guildID: interaction.guildId
-        }
-    });
-
-    const logChannel = settings.notificationChannelID ? await getGuildChannel(interaction.guildId, settings.notificationChannelID) : null;
-
-    const embed = getDefaultEmbed();
-    embed.setTitle(`Settings from guild ${interaction.guild?.name || ""} (${interaction.guildId})`);
-    embed.setDescription("Thanks for using this bot");
-    embed.setColor(Color.INFORMING_BLUE);
-    embed.addFields({
-        name: "Logchannel",
-        value: settings.notificationChannelID ? `<#${settings.notificationChannelID}>` : "Not configured",
-        inline: true
-    }, {
-        name: "Words in Blocklist",
-        value: `${wordCount}/100`,
-        inline: true
-    }, {
-        name: `Preserve data on server leave is ${settings.preserveDataOnGuildLeave ? "active" : "inactive"}`,
-        value: settings.preserveDataOnGuildLeave ? "Your settings will be saved even if the bot gets kicked" : "Your settings will be deleted as soon as the bot leaves this server"
-    }, {
-        name: `${Emoji.WAVING} Found a bug? Want to request a feature? Say hello?`,
-        value: "Join the support server at https://go.astrogd.eu/discord"
-    });
-
-    const embeds = [];
-    embeds.push(embed);
-
-    const invalidLogChannelEmbed = getDefaultEmbed();
-    invalidLogChannelEmbed.setColor(Color.WARNING_YELLOW);
-    invalidLogChannelEmbed.setTitle(`${Emoji.CHAT_DENY} Logchannel is misconfigured!`);
-    invalidLogChannelEmbed.setDescription("The bot is unable to read and/or write in the configured logChannel. Please adjust your permissions.");
-
-    const missingPermissionEmbed = getDefaultEmbed();
-    missingPermissionEmbed.setColor(Color.WARNING_YELLOW);
-    missingPermissionEmbed.setTitle(`${Emoji.CHAT_DENY} Bot is missing permissions to function properly!`);
-    missingPermissionEmbed.setDescription("Without these missing Permissions, the bot won't work properly and might lead to unexpected behavior");
-
-    if (logChannel && logChannel.isTextBased()) {
-        const permissions = await getChannelPermission(logChannel);
-        if (!permissions || !permissions.has(PermissionFlagsBits.ViewChannel) || !permissions.has(PermissionFlagsBits.SendMessages)) {
-            embeds.push(invalidLogChannelEmbed);
-        }
-    }
-
-    if ((!logChannel || !logChannel.isTextBased()) && settings.notificationChannelID) {
-        embeds.push(invalidLogChannelEmbed);
-    }
-
-    const member = await guild.members.fetchMe();
-    if (!member.permissions.has(PermissionFlagsBits.ViewAuditLog)) {
-        missingPermissionEmbed.addFields({
-            name: "View Audit Logs",
-            value: "With this permission the bot can determine who created or updated a channel with a blocked word"
-        });
-    }
-
-    if (!member.permissions.has(PermissionFlagsBits.ViewChannel)) {
-        missingPermissionEmbed.addFields({
-            name: "View Channels",
-            value: "If the bot can't see a channel, it won't be able to detect blocked words in it"
-        });
-    }
-
-    if (!member.permissions.has(PermissionFlagsBits.ManageChannels)) {
-        missingPermissionEmbed.addFields({
-            name: "Manage Channels",
-            value: "If the bot can't delete a channel, it can't protect your server from channels with blocked words"
-        });
-    }
-
-    if (missingPermissionEmbed.data.fields?.length || 0 > 0) embeds.push(missingPermissionEmbed);
-
-    interaction.reply({
-        embeds: embeds,
-        ephemeral: true
-    }).catch(() => {});
-}
-
-export {
-    builder,
-    execute
-}

src/commands/showblocklist.ts

@@ -1,37 +0,0 @@
-import { ChatInputCommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
-import { IsNull } from "typeorm";
-import { Badword, database } from "../data";
-
-const builder = new SlashCommandBuilder();
-builder.setName("showblocklist");
-builder.setDescription("Shows the blocklist of this server");
-builder.setDMPermission(false);
-builder.setDefaultMemberPermissions(PermissionFlagsBits.ManageChannels);
-
-async function execute(interaction: ChatInputCommandInteraction): Promise<void> {
-    if (!interaction.inGuild()) throw new Error("Command was executed outside guild context");
-    
-    const guildBadWords = await database.getRepository(Badword).find({
-        select: {
-            value: true
-        },
-        where: {
-            guildID: interaction.guildId
-        }
-    });
-    const globalBadWords = await database.getRepository(Badword).find({
-        where: {
-            guildID: IsNull()
-        }
-    });
-
-    interaction.reply({
-        content: `\`\`\`Global bad word list\`\`\`\n||${globalBadWords.map((word) => word.value).reduce((prev, next) => prev + ", " + next, "").slice(2)} ||\n\`\`\`Local server bad word list (${guildBadWords.length}/100)\`\`\`\n||${guildBadWords.map((word) => word.value).reduce((prev, next) => prev + ", " + next, "").slice(2)} ||`,
-        ephemeral: true
-    }).catch(() => {});
-}
-
-export {
-    builder,
-    execute
-}

src/data/dataSource.migration.ts

@@ -1,3 +0,0 @@
-import dataSource from "./dataSource";
-
-export default dataSource;

src/data/dataSource.ts

@@ -28,9 +28,6 @@ const dataSource = new DataSource({
     migrationsTransactionMode: "each"
 });
 
-const initPromise = dataSource.initialize();
+dataSource.initialize();
 
 export default dataSource;
-export {
-    initPromise
-}

src/data/migrations/1669392941776-data.ts

@@ -1,19 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class data1669392941776 implements MigrationInterface {
-    name = 'data1669392941776'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
-            ALTER TABLE "guild_setting"
-            ADD "preserveDataOnGuildLeave" boolean NOT NULL DEFAULT false
-        `);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
-            ALTER TABLE "guild_setting" DROP COLUMN "preserveDataOnGuildLeave"
-        `);
-    }
-
-}

src/data/migrations/1669686263307-data.ts

@@ -1,19 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class data1669686263307 implements MigrationInterface {
-    name = 'data1669686263307'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
-            ALTER TABLE "guild_setting" DROP COLUMN "isPremiumUntil"
-        `);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
-            ALTER TABLE "guild_setting"
-            ADD "isPremiumUntil" TIMESTAMP
-        `);
-    }
-
-}

src/data/model/guildSetting.ts

@@ -8,6 +8,6 @@ export class GuildSetting {
     @Column("varchar", { nullable: true, default: null })
     notificationChannelID!: string | null;
 
-    @Column("boolean", { default: false })
+    @Column("timestamp", { nullable: true, default: null })
-    preserveDataOnGuildLeave!: boolean
+    isPremiumUntil!: Date | null;
 }

src/events/channelCreate.ts

@@ -1,116 +0,0 @@
-import client from "../client";
-import { AuditLogEvent, Events, GuildAuditLogsEntry, PermissionFlagsBits, User } from "discord.js";
-import { getGuildSetting } from "../tools/data";
-import { Badword, database } from "../data";
-import { IsNull } from "typeorm";
-import getDefaultEmbed, { getFailedEmbed, getUserReportEmbed } from "../tools/defaultEmbeds";
-import { getGuildChannel } from "../tools/discord";
-import { Color, Emoji } from "../tools/design";
-
-client.on(Events.ChannelCreate, async (newChannel) => {
-    if (newChannel.isDMBased()) return;
-    const name = newChannel.name.toLowerCase();
-
-    const guild = newChannel.guild;
-    const settings = await getGuildSetting(guild.id);
-
-    const globalBlocklist = await database.getRepository(Badword).find({
-        where: {
-            guildID: IsNull()
-        }
-    });
-    const localBlocklist = await database.getRepository(Badword).find({
-        where: {
-            guildID: guild.id
-        }
-    });
-
-    const blocklist = [...globalBlocklist, ...localBlocklist];
-    let found: string | null = null;
-
-    for (let i = 0; i < blocklist.length; i++) {
-        const word = blocklist[i];
-        if (!word) continue;
-
-        if (!name.includes(word.value)) continue;
-        found = word.value;
-        break;
-    }
-
-    if (found === null) return;
-
-    let responsibleUser: User | null;
-
-    try {
-        const clientMember = await guild.members.fetchMe();
-        const canSeeAuditLog = clientMember.permissions.has(PermissionFlagsBits.ViewAuditLog);
-        const auditLogs = canSeeAuditLog ? await guild.fetchAuditLogs({
-            type: AuditLogEvent.ChannelCreate,
-            limit: 50
-        }) : undefined;
-
-        const change = auditLogs?.entries.filter((entry) => {
-            if (entry.target.id !== newChannel.id) return false;
-
-            return entry.changes.filter((change) => {
-                return change.key === "name" && change.new === newChannel.name;
-            }).length > 0;
-        }).reduce<null | GuildAuditLogsEntry<AuditLogEvent.ChannelCreate, "Create", "Channel", AuditLogEvent.ChannelCreate>>((unknown, curr) => {
-            if (!unknown) return curr;
-            const prev = unknown as GuildAuditLogsEntry<AuditLogEvent.ChannelCreate, "Create", "Channel", AuditLogEvent.ChannelCreate>
-            return curr.createdTimestamp > prev.createdTimestamp ? curr : prev;
-        }, null);
-
-        responsibleUser = change?.executor || null;
-    } catch (error) {
-        responsibleUser = null;
-    }
-
-    const logChannel = settings.notificationChannelID ? await getGuildChannel(guild.id, settings.notificationChannelID) : null;
-
-    try {
-        if (!newChannel.deletable) throw new Error("Missing permissions to delete channel");
-        await newChannel.delete("[Automated] Detected blocked word in channel name");
-    } catch (error) {
-        if (!logChannel || !logChannel.isTextBased()) return;
-        const embed = getFailedEmbed();
-        embed.setDescription(`Couldn't delete <#${newChannel.id}> (${newChannel.id}): ${error instanceof Error ? error.message : error}`);
-        embed.addFields({
-            name: "Detected banned word:",
-            value: `||${found}||`
-        }, {
-            name: "Channel created by:",
-            value: responsibleUser ? `${responsibleUser.tag} (${responsibleUser.id})` : "`Couldn't detect responsible user :(`"
-        });
-
-        logChannel.send({
-            embeds: [embed]
-        }).catch(() => {});
-        return;
-    }
-
-    if (responsibleUser) {
-        const embed = getUserReportEmbed(guild.name, newChannel.name);
-        responsibleUser.send({
-            embeds: [embed]
-        }).catch(() => {});
-    }
-
-    if (!logChannel || !logChannel.isTextBased()) return;
-    const embed = getDefaultEmbed();
-    embed.setTitle(`${Emoji.SECURITY_CHALLENGE_FAILED} Blocked word detected`);
-    embed.setDescription(`||#${newChannel.name}|| (${newChannel.id}) has been deleted because its name contained a blocked word.`);
-    embed.setColor(Color.WARNING_YELLOW);
-    embed.addFields({
-        name: "Detected banned word:",
-        value: `||${found}||`,
-        inline: true
-    }, {
-        name: "Channel created by:",
-        value: responsibleUser ? `${responsibleUser.tag} (${responsibleUser.id})` : "`Couldn't detect responsible user :(`"
-    });
-
-    logChannel.send({
-        embeds: [embed]
-    }).catch(() => {});
-});

src/events/channelUpdate.ts

@@ -1,116 +0,0 @@
-import client from "../client";
-import { AuditLogEvent, Events, GuildAuditLogsEntry, PermissionFlagsBits, User } from "discord.js";
-import { getGuildSetting } from "../tools/data";
-import { Badword, database } from "../data";
-import { IsNull } from "typeorm";
-import getDefaultEmbed, { getFailedEmbed, getUserReportEmbed } from "../tools/defaultEmbeds";
-import { getGuildChannel } from "../tools/discord";
-import { Color, Emoji } from "../tools/design";
-
-client.on(Events.ChannelUpdate, async (oldChannel, newChannel) => {
-    if (oldChannel.isDMBased() || newChannel.isDMBased()) return;
-    const name = newChannel.name.toLowerCase();
-
-    const guild = oldChannel.guild;
-    const settings = await getGuildSetting(guild.id);
-
-    const globalBlocklist = await database.getRepository(Badword).find({
-        where: {
-            guildID: IsNull()
-        }
-    });
-    const localBlocklist = await database.getRepository(Badword).find({
-        where: {
-            guildID: guild.id
-        }
-    });
-
-    const blocklist = [...globalBlocklist, ...localBlocklist];
-    let found: string | null = null;
-
-    for (let i = 0; i < blocklist.length; i++) {
-        const word = blocklist[i];
-        if (!word) continue;
-
-        if (!name.includes(word.value)) continue;
-        found = word.value;
-        break;
-    }
-
-    if (found === null) return;
-
-    let responsibleUser: User | null;
-
-    try {
-        const clientMember = await guild.members.fetchMe();
-        const canSeeAuditLog = clientMember.permissions.has(PermissionFlagsBits.ViewAuditLog);
-        const auditLogs = canSeeAuditLog ? await guild.fetchAuditLogs({
-            type: AuditLogEvent.ChannelUpdate,
-            limit: 50
-        }) : undefined;
-
-        const change = auditLogs?.entries.filter((entry) => {
-            if (entry.target.id !== newChannel.id) return false;
-
-            return entry.changes.filter((change) => {
-                return change.key === "name" && change.new === newChannel.name;
-            }).length > 0;
-        }).reduce<null | GuildAuditLogsEntry<AuditLogEvent.ChannelUpdate, "Update", "Channel", AuditLogEvent.ChannelUpdate>>((unknown, curr) => {
-            if (!unknown) return curr;
-            const prev = unknown as GuildAuditLogsEntry<AuditLogEvent.ChannelUpdate, "Update", "Channel", AuditLogEvent.ChannelUpdate>
-            return curr.createdTimestamp > prev.createdTimestamp ? curr : prev;
-        }, null);
-
-        responsibleUser = change?.executor || null;
-    } catch (error) {
-        responsibleUser = null;
-    }
-
-    const logChannel = settings.notificationChannelID ? await getGuildChannel(guild.id, settings.notificationChannelID) : null;
-
-    try {
-        if (!newChannel.deletable) throw new Error("Missing permissions to delete channel");
-        await newChannel.delete("[Automated] Detected blocked word in channel name");
-    } catch (error) {
-        if (!logChannel || !logChannel.isTextBased()) return;
-        const embed = getFailedEmbed();
-        embed.setDescription(`Couldn't delete <#${newChannel.id}> (${newChannel.id}): ${error instanceof Error ? error.message : error}`);
-        embed.addFields({
-            name: "Detected banned word:",
-            value: `||${found}||`
-        }, {
-            name: "Channel renamed by:",
-            value: responsibleUser ? `${responsibleUser.tag} (${responsibleUser.id})` : "`Couldn't detect responsible user :(`"
-        });
-
-        logChannel.send({
-            embeds: [embed]
-        }).catch(() => {});
-        return;
-    }
-
-    if (responsibleUser) {
-        const embed = getUserReportEmbed(guild.name, newChannel.name);
-        responsibleUser.send({
-            embeds: [embed]
-        }).catch(() => {});
-    }
-
-    if (!logChannel || !logChannel.isTextBased()) return;
-    const embed = getDefaultEmbed();
-    embed.setTitle(`${Emoji.SECURITY_CHALLENGE_FAILED} Blocked word detected`);
-    embed.setDescription(`||#${newChannel.name}|| (${newChannel.id}) has been deleted because its name contained a blocked word.`);
-    embed.setColor(Color.WARNING_YELLOW);
-    embed.addFields({
-        name: "Detected banned word:",
-        value: `||${found}||`,
-        inline: true
-    }, {
-        name: "Channel renamed by:",
-        value: responsibleUser ? `${responsibleUser.tag} (${responsibleUser.id})` : "`Couldn't detect responsible user :(`"
-    });
-
-    logChannel.send({
-        embeds: [embed]
-    }).catch(() => {});
-});

src/events/guildDelete.ts

@@ -1,17 +0,0 @@
-import client from "../client";
-import { Events } from "discord.js";
-import { getGuildSetting } from "../tools/data";
-import { Badword, database, GuildSetting } from "../data";
-
-client.on(Events.GuildDelete, async (guild) => {
-    const settings = await getGuildSetting(guild.id);
-    if (settings.preserveDataOnGuildLeave) return;
-
-    await database.getRepository(GuildSetting).delete({
-        id: guild.id
-    });
-
-    await database.getRepository(Badword).delete({
-        guildID: guild.id
-    });
-});

src/events/index.ts

@@ -1,3 +0,0 @@
-import "./channelUpdate";
-import "./guildDelete";
-import "./channelCreate";

src/service/cleanup.ts

@@ -1,39 +0,0 @@
-import { Badword, database, GuildSetting } from "../data";
-import client from "../client";
-import { DiscordAPIError } from "discord.js";
-
-export default async function execute(): Promise<void> {
-    const guilds = await database.getRepository(GuildSetting).find({
-        where: {
-            preserveDataOnGuildLeave: false
-        }
-    });
-
-    for (const guild of guilds) {
-        try {
-            await client.guilds.fetch(guild.id);
-        } catch (error) {
-            if (!(error instanceof DiscordAPIError)) {
-                console.error(`service.cleanup failed: ${error}`);
-                return;
-            } 
-
-            const id = guild.id;
-
-            // 5001 = Missing access
-            if (error.code.toString() !== "50001") {
-                console.warn(`Guild ${guild.id} is unavailable but not because of error 5001:\n${error}`);
-                continue;
-            }
-
-            await database.getRepository(Badword).delete({
-                guildID: guild.id
-            });
-
-            await database.getRepository(GuildSetting).remove(guild);
-            console.log(`Removed data for guild ${id}`);
-        }
-    }
-
-    console.log("Cleanup completed");
-}

src/service/index.ts

@@ -1,5 +0,0 @@
-import runCleanup from "./cleanup";
-
-export {
-    runCleanup
-}

src/tools/data.ts

@@ -10,9 +10,20 @@ export async function getGuildSetting(guildID: string): Promise<GuildSetting> {
     if (!guildSetting) {
         guildSetting = new GuildSetting();
         guildSetting.id = guildID;
+        guildSetting.isPremiumUntil = null;
         guildSetting.notificationChannelID = null;
-        guildSetting.preserveDataOnGuildLeave = false;
     }
 
     return guildSetting;
 }
+
+export function isPremiumActive(timestamp: Date | null): boolean {
+
+    console.log(timestamp);
+
+    if (timestamp === null) return false;
+    const now = Number(new Date());
+    const activeUntil = Number(timestamp);
+
+    return now < activeUntil;
+}

src/tools/defaultEmbeds.ts

@@ -1,43 +1,31 @@
 import pack from "../../package.json";
 import { EmbedBuilder } from "discord.js";
 import client from "../client";
-import { Color, Emoji } from "./design";
 
 // const _coolColors = [0x054566];
 
 export default function getDefaultEmbed(): EmbedBuilder {
     const embed = new EmbedBuilder();
     embed.setFooter({
-        text: `Channel filter V${pack.version}`,
+        text: `Channel filter V${pack.version} by AstroGD®`,
         iconURL: client.user?.avatarURL() || undefined,
     });
     embed.setTimestamp(new Date());
-    embed.setColor(Color.ANONYMOUS_GRAY);
+    embed.setColor(0x3682cc);
 
     return embed;
 }
 
 export function getSuccessEmbed(): EmbedBuilder {
     const embed = getDefaultEmbed();
-    embed.setTitle(`${Emoji.CHAT_APPROVE} Success`);
+    embed.setTitle("Success");
-    embed.setColor(Color.SUCCESSFUL_GREEN);
+    embed.setColor(0x32d122);
     return embed;
 }
 
 export function getFailedEmbed(): EmbedBuilder {
     const embed = getDefaultEmbed();
-    embed.setTitle(`${Emoji.CHAT_DENY} Failed`);
+    embed.setTitle("Failed");
-    embed.setColor(Color.STOPSIGN_RED);
+    embed.setColor(0xD01B15);
-    return embed;
-}
-
-export function getUserReportEmbed(guildName: string, channelName: string): EmbedBuilder {
-    const embed = getDefaultEmbed();
-    embed.setColor(Color.STOPSIGN_RED);
-    embed.setTitle(`${Emoji.SECURITY_CHALLENGE_FAILED} A channel you modified has been deleted`);
-    embed.setDescription(`Hey there ${Emoji.WAVING}
-Your channel (#${channelName}) on the "${guildName}" server contained a blacklisted word and was deleted automatically.
-Please make sure to keep channel names friendly for everyone!`);
-
     return embed;
 }

src/tools/design.ts

@@ -1,30 +0,0 @@
-export enum Emoji {
-    DOUBLE_ARROW_RIGHT = "<:double_arrow_right:918922668936413267>",
-    SETTINGS = "<:settings:918912063970099232>",
-    TIME = "<:time:918913616743387156>",
-    DOCS = "<:docs:918917779283918899>",
-    MESSAGE = "<:message:918920872683786280>",
-    WAVING = "<:waving:918949572804505640>",
-    CHAT_APPROVE = "<:chat_approve:918910607317667860>",
-    CHAT_DENY = "<:chat_deny:918911411663544410>",
-    WARN = "<:warn:918914600181825556>",
-    INFORMATION = "<:information:918912973874028614>",
-    ERROR = "<:error:918915254447136841>",
-    SWITCH_ON = "<:switch_on:918915977662586892>",
-    SWITCH_OFF = "<:switch_off:918917065899925584>",
-    SWITCH_UNSET = "<:switch_unset:918917082807156796>",
-    SECURITY_CHALLENGE = "<:security_challenge:918919903405305946>",
-    SECURITY_CHALLENGE_SUCCESS = "<:security_challenge_success:918919918672576562>",
-    SECURITY_CHALLENGE_FAILED = "<:security_challenge_failed:918919932887064696>",
-    ASTROGD = "<:astrogd:918906741125697626>",
-    PREMIUM = "<:premium:918909591255908442>",
-}
-
-export enum Color {
-    PREMIUM_ORANGE = 0xFFC800,
-    SUCCESSFUL_GREEN = 0x77DE37,
-    STOPSIGN_RED = 0xDA2132,
-    WARNING_YELLOW = 0xF0E210,
-    INFORMING_BLUE = 0x2FAAE2,
-    ANONYMOUS_GRAY = 0x7B7B7B
-}

src/tools/discord.ts

@@ -1,25 +1,10 @@
-import { GuildBasedChannel, GuildTextBasedChannel, PermissionsBitField } from "discord.js";
+import { GuildBasedChannel } from "discord.js";
 import client from "../client";
 
 export async function getGuildChannel(guildID: string, channelID: string): Promise<GuildBasedChannel | null> {
-    try {
     const guild = await client.guilds.fetch(guildID);
     if (!guild) return null;
 
     const channel = await guild.channels.fetch(channelID);
     return channel;
-    } catch (_error) {
-        return null;
-    }
-}
-
-export async function getChannelPermission(channel: GuildTextBasedChannel): Promise<Readonly<PermissionsBitField> | null> {
-    try {
-        const guildMember = await channel.guild.members.fetchMe();
-        if (!guildMember) return null;
-
-        return channel.permissionsFor(guildMember);
-    } catch (error) {
-        return null;
-    }
 }

src/tools/startupTime.ts

@@ -1,3 +0,0 @@
-const startupTime = new Date();
-
-export default startupTime;