Merge branch 'develop' into feature/300-moon-set

.forgejo/workflows/production.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: 18.x
+        node-version: 20.x
     - run: yarn install --frozen-lockfile
     - run: yarn build
     - run: yarn test
@@ -29,7 +29,7 @@ jobs:
     needs: build
     runs-on: node
     steps:
-    - uses: https://github.com/appleboy/ssh-action@v1.0.3
+    - uses: https://github.com/appleboy/ssh-action@v1.1.0
       env:
         DB_NAME: ${{ secrets.PROD_DB_NAME }}
         DB_AUTH_USER: ${{ secrets.PROD_DB_AUTH_USER }}

.forgejo/workflows/stage.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: 18.x
+        node-version: 20.x
     - run: yarn install --frozen-lockfile
     - run: yarn build
     - run: yarn test
@@ -29,7 +29,7 @@ jobs:
     needs: build
     runs-on: node
     steps:
-    - uses: https://github.com/appleboy/ssh-action@v1.0.3
+    - uses: https://github.com/appleboy/ssh-action@v1.1.0
       env:
         DB_NAME: ${{ secrets.STAGE_DB_NAME }}
         DB_AUTH_USER: ${{ secrets.STAGE_DB_AUTH_USER }}

.forgejo/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: 18.x
+        node-version: 20.x
     - run: yarn install --frozen-lockfile
     - run: yarn build
     - run: yarn test

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vylbot-app",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "A discord bot made for Vylpes' Den",
   "main": "./dist/vylbot",
   "typings": "./dist",
@@ -32,14 +32,12 @@
     "discord.js": "^14.3.0",
     "dotenv": "^16.0.0",
     "emoji-regex": "^10.0.0",
-    "minimatch": "9.0.5",
+    "minimatch": "10.0.1",
     "mysql": "^2.18.1",
     "random-bunny": "^2.1.6",
-    "typeorm": "0.3.20"
+    "typeorm": "^0.3.20"
   },
   "resolutions": {
-    "**/semver": "^7.5.2",
-    "**/undici": "^6.0.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",

src/commands/501231711271780357/entry.ts

@@ -1,4 +1,4 @@
-import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
+import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
 import EmbedColours from "../../constants/EmbedColours";
 import SettingsHelper from "../../helpers/SettingsHelper";
 import { Command } from "../../type/command";
@@ -24,6 +24,8 @@ export default class Entry extends Command {
             .setTitle("Welcome")
             .setDescription(`Welcome to the server! Please make sure to read the rules in the <#${rulesChannelId}> channel and type the code found there in here to proceed to the main part of the server.`);
 
-        await interaction.channel.send({ embeds: [ embed ]});
+        const channel = interaction.channel as TextChannel;
+
+        await channel.send({ embeds: [ embed ]});
     }
 }

src/commands/code.ts

@@ -1,4 +1,4 @@
-import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
+import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
 import SettingsHelper from "../helpers/SettingsHelper";
 import StringTools from "../helpers/StringTools";
 import { Command } from "../type/command";
@@ -59,6 +59,8 @@ export default class Code extends Command {
             .setTitle("Entry Code")
             .setDescription(code);
 
-        await interaction.channel.send({ embeds: [ embed ]});
+        const channel = interaction.channel as TextChannel;
+
+        await channel.send({ embeds: [ embed ]});
     }
 }

src/commands/linkonly.ts

@@ -0,0 +1,30 @@
+import { CommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
+import { Command } from "../type/command";
+import SettingsHelper from "../helpers/SettingsHelper";
+
+export default class Linkonly extends Command {
+    constructor() {
+        super();
+
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("linkonly")
+            .setDescription("Set the link only channel, leave blank to disable")
+            .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages)
+            .addChannelOption(x => x
+                .setName("channel")
+                .setDescription("The channel"));
+    }
+
+    public override async execute(interaction: CommandInteraction) {
+        if (!interaction.guild) return;
+
+        const channel = interaction.options.get("channel")?.channel;
+
+        const channelid = channel?.id ?? "";
+        const channelName = channel?.name ?? "<NONE>";
+
+        await SettingsHelper.SetSetting("channel.linkonly", interaction.guild.id, channelid);
+
+        await interaction.reply(`Set the link only channel to \`${channelName}\``);
+    }
+}

src/commands/rules.ts

@@ -1,4 +1,4 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
 import { existsSync, readFileSync } from "fs";
 import EmbedColours from "../constants/EmbedColours";
 import { Command } from "../type/command";
@@ -79,7 +79,7 @@ export default class Rules extends Command {
             embeds.push(embed);
         });
 
-        const channel = interaction.channel;
+        const channel = interaction.channel as TextChannel;
 
         if (!channel) {
             await interaction.reply({ content: "Channel not found.", ephemeral: true });
@@ -109,7 +109,9 @@ export default class Rules extends Command {
                     .setLabel(buttonLabel || "Verify")
             ]);
 
-        await interaction.channel?.send({
+        const channel = interaction.channel as TextChannel;
+
+        await channel.send({
             components: [ row ]
         });
 

src/constants/DefaultValues.ts

@@ -44,6 +44,9 @@ export default class DefaultValues {
             this.values.push({ Key: "verification.role", Value: "Entry" });
             this.values.push({ Key: "verification.code", Value: "" });
 
+            // Gif Only Mode
+            this.values.push({ Key: "channel.linkonly", Value: "" })
+
             // Event
             this.values.push({ Key: "event.message.delete.enabled", Value: "false" });
             this.values.push({ Key: "event.message.delete.channel", Value: "message-logs" });

src/events/MessageEvents/MessageCreate.ts

@@ -2,6 +2,7 @@ import { Message } from "discord.js";
 import SettingsHelper from "../../helpers/SettingsHelper";
 import VerificationCheck from "./MessageCreate/VerificationCheck";
 import CacheHelper from "../../helpers/CacheHelper";
+import LinkOnlyMode from "./MessageCreate/LinkOnlyMode";
 
 export default async function MessageCreate(message: Message) {
     if (!message.guild) return;
@@ -9,6 +10,8 @@ export default async function MessageCreate(message: Message) {
 
     await CacheHelper.UpdateServerCache(message.guild);
 
+    await LinkOnlyMode(message);
+
     const isVerificationEnabled = await SettingsHelper.GetSetting("verification.enabled", message.guild.id);
 
     if (isVerificationEnabled && isVerificationEnabled.toLocaleLowerCase() == "true") {

src/events/MessageEvents/MessageCreate/LinkOnlyMode.ts

@@ -0,0 +1,20 @@
+import { Message } from "discord.js";
+import SettingsHelper from "../../../helpers/SettingsHelper";
+
+export default async function LinkOnlyMode(message: Message) {
+    if (!message.guild) return;
+
+    const gifOnlyMode = await SettingsHelper.GetSetting("channel.linkonly", message.guild.id);
+
+    if (!gifOnlyMode) return;
+
+    const channel = message.guild.channels.cache.find(x => x.id == gifOnlyMode) || message.guild.channels.fetch(gifOnlyMode);
+
+    if (!channel) return;
+
+    if (message.content.startsWith("https://") || message.content.startsWith("http://")) return;
+
+    if (!message.deletable) return;
+
+    await message.delete();
+}

src/registry.ts

@@ -12,6 +12,7 @@ import Config from "./commands/config";
 import Disable from "./commands/disable";
 import Ignore from "./commands/ignore";
 import Kick from "./commands/kick";
+import Linkonly from "./commands/linkonly";
 import Poll from "./commands/poll";
 import Role from "./commands/Role/role";
 import ConfigRole from "./commands/Role/config";
@@ -55,6 +56,7 @@ export default class Registry {
         CoreClient.RegisterCommand("disable", new Disable());
         CoreClient.RegisterCommand("ignore", new Ignore());
         CoreClient.RegisterCommand("kick", new Kick());
+        CoreClient.RegisterCommand("linkonly", new Linkonly());
         CoreClient.RegisterCommand("poll", new Poll());
         CoreClient.RegisterCommand("rules", new Rules());
         CoreClient.RegisterCommand("say", new Say());