fixed compiler errors (#2)

* typescript new

* Update config.json

* updated

* fixed

* changed license, actually fixed sql file now

* added license

* Create LICENSE

* Small update to license

* fixed compiler errors, updated buttons

* added config.example.yml

* Delete config.yml

* rest of the fixes

* added config.ts

* color, bug, added timestamp

* added banned words, fixed regex

* Refactor sql and eslint

Co-authored-by: Matthew Bakhtiari <[email protected]>
Co-authored-by: Matthew <[email protected]>

Author: 3 people

.eslintrc.json

@@ -0,0 +1,24 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "airbnb-base"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": 12,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "import/extensions": "off",
+        "import/no-unresolved": "off",
+        "no-console": "off",
+        "@typescript-eslint/no-var-requires": "warn",
+        "class-methods-use-this": "off"
+    }
+}

.eslintrc.yml

@@ -3,4 +3,6 @@ node_modules
 package-lock.json
 *.js
 *.map
-config.yaml
+.idea
+build
+config.yml

.gitignore

@@ -1,9 +1,9 @@
-token: 
-botId: 
+token:  
 channelid: 
-color: 0x20d84e
+color: 
 ownerid: 
-postgres:
+modrole: 
+database:
   username: 
   password: 
   host: 

bannedwords.txt

@@ -1,5 +1,7 @@
-CREATE TABLE if not exists nickreq (
+CREATE SCHEMA nickreq;
+
+CREATE TABLE if not exists nickreq.requests (
 	user_id VARCHAR ( 50 ) NOT NULL,
 	nick VARCHAR ( 50 ) NOT NULL,
 	state BOOLEAN
-);
+);

config.example.yml

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "discord-buttons": "^3.2.1",
+    "discord-buttons": "github:discord-buttons/discord-buttons",
     "discord.js": "^12.5.3",
     "discord.js-commando": "^0.12.3",
     "js-yaml": "^4.1.0",
@@ -9,11 +9,20 @@
     "require": "^2.4.20"
   },
   "devDependencies": {
+    "@types/js-yaml": "^4.0.2",
     "@types/node": "^15.12.5",
-    "@typescript-eslint/eslint-plugin": "^4.28.2",
-    "@typescript-eslint/parser": "^4.28.2",
-    "eslint": "^7.30.0",
-    "eslint-config-airbnb-typescript": "^12.3.1"
+    "@types/pg": "^8.6.1",
+    "@types/ws": "^7.4.6",
+    "@typescript-eslint/eslint-plugin": "^4.29.3",
+    "@typescript-eslint/parser": "^4.29.3",
+    "eslint": "^7.32.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-config-airbnb-typescript": "^12.3.1",
+    "eslint-plugin-import": "^2.24.2",
+    "typescript": "^4.3.5"
   },
-  "license": "GPLv3"
+  "license": "GPL-3.0",
+  "scripts": {
+    "start": "tsc && node build"
+  }
 }

migrations/init.sql

@@ -0,0 +1,32 @@
+import { Command, CommandoClient, CommandoMessage } from 'discord.js-commando';
+import { readFileSync, writeFileSync } from 'fs';
+
+export default class NickReq extends Command {
+  constructor(client: CommandoClient) {
+    super(client, {
+      name: 'add',
+      group: 'nickreq',
+      memberName: 'add',
+      description: 'Add banned words to the filter.',
+      guildOnly: true,
+      userPermissions: ['MANAGE_MESSAGES'],
+      examples: ['add word', 'add word1\nword2\nword3'],
+      args: [
+        {
+          key: 'words',
+          prompt: 'No words provided, please provide words to add.',
+          type: 'string',
+        },
+      ],
+    });
+  }
+
+  async run(message: CommandoMessage, { words }: { words: string }): Promise<null> {
+    const wordArray = words.split('\n').filter((e) => e !== '');
+    const bannedWords = readFileSync('./bannedwords.txt', 'utf-8').split('\n').filter((e) => e !== '');
+    const finalStr = wordArray.concat(bannedWords.filter((item) => wordArray.indexOf(item) < 0)).join('\n');
+    writeFileSync('bannedwords.txt', finalStr, 'utf8');
+    await message.reply('Added words.');
+    return null;
+  }
+}

package.json

@@ -0,0 +1,21 @@
+import { Command, CommandoClient, CommandoMessage } from 'discord.js-commando';
+
+export default class NickReq extends Command {
+  constructor(client: CommandoClient) {
+    super(client, {
+      name: 'list',
+      group: 'nickreq',
+      memberName: 'list',
+      description: 'List all banned words.',
+      guildOnly: true,
+      userPermissions: ['MANAGE_MESSAGES'],
+    });
+  }
+
+  async run(message: CommandoMessage): Promise<null> {
+    await message.reply('Here is a file with all the banned words in nicknames.', {
+      files: ['./bannedwords.txt'],
+    });
+    return null;
+  }
+}

src/commands/nickreq/add.ts

@@ -1,21 +1,21 @@
-const commando = require('discord.js-commando');
-const { MessageButton, MessageActionRow } = require('discord-buttons');
-import { load } from 'js-yaml';
+import { Command, CommandoClient, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed, TextChannel } from 'discord.js';
 import { readFileSync } from 'fs';
-import DB from '../../db.js';
-import { MessageEmbed } from 'discord.js';
+import DB from '../../db';
 
+import Config from '../../config';
 
-const fileContents = readFileSync('./config.yml', 'utf8');
-const config = load(fileContents);
+const config = Config.getConfig();
 
-export default class NickReq extends commando.Command {
-  constructor(client) {
+export default class NickReq extends Command {
+  constructor(client: CommandoClient) {
     super(client, {
       name: 'request',
       group: 'nickreq',
       memberName: 'request',
       description: 'Main Nickname Request commands',
+      guildOnly: true,
+      examples: ['request example nickname'],
       args: [
         {
           key: 'nick',
@@ -26,54 +26,72 @@ export default class NickReq extends commando.Command {
     });
   }
 
-  async run(message, { nick }) {
-    if (message.guild == null) return;
+  async run(message: CommandoMessage, { nick }: { nick: string }): Promise<null> {
     if (nick.length > 32) {
       await message.reply('The nickname must be less than 32 characters');
-      return;
+      return null;
     }
 
-    const re = /^[\\x00-\\x7F]/;
-    const testx = re.test(nick);
-    if (testx === true) {
-      await message.send('Illegal charecters in nickname!');
-      return;
+    const testx = /^[A-Za-z0-9]/.test(nick);
+    if (!testx) {
+      await message.reply('Illegal charecters in start of nickname!');
+      return null;
     }
-
     const check = await DB.check(message.author.id);
     if (check.length !== 0) {
       await message.reply('You already have an ongoing request!');
-      return;
+      return null;
     }
-    await DB.insert(message.author.id, nick);
 
-    const channel = await message.guild.channels.cache.get(config.channelid);
+    const bannedWords = readFileSync('./bannedwords.txt', 'utf-8').split('\n').filter((e) => e !== '');
+    const testy = new RegExp(`(${bannedWords.join('|')})`, 'g').test(nick);
+    if (testy) {
+      await message.reply('You cannot use those words in your nickname.');
+      return null;
+    }
+    const channel = await this.client.channels.fetch(config.channelid);
+    if (channel === undefined || !(channel instanceof TextChannel)) {
+      console.error('Unable to fetch channel!');
+      return null;
+    }
+    await DB.insert(message.author.id, nick);
 
     const embed = new MessageEmbed({
       title: 'Nickname Request',
-      description: `I would like to set my nickname to: \`${nick}\``,
-      color: config.color,
+      description: `I would like to set my nickname to: ${nick}`,
+      color: (config.color !== null) ? config.color : 0xFFFF00,
       author: {
         name: `${message.author.username}#${message.author.discriminator}`,
-        iconURL: message.author.avatarURL(),
+        iconURL: message.author.avatarURL() || undefined,
       },
-      footer: { text: message.author.id },
-    });
-    const button1 = new MessageButton()
-    .setLabel('Accept')
-    .setStyle('green')
-    .setID('Accepted');
-    const button2 = new MessageButton()
-    .setLabel('Reject')
-    .setStyle('red')
-    .setID('Rejected');
-    const row = new MessageActionRow()
-    .addComponent(button1)
-    .addComponent(button2);
-    await channel.send({
+      footer: { text: `${message.author.id}` },
+    }).setTimestamp();
+    const buttonEmbed = {
+      type: 1,
+      components: [
+        {
+          type: 2,
+          style: 3,
+          label: 'Accept',
+          emoji: undefined,
+          disabled: false,
+          url: undefined,
+          custom_id: 'Accepted',
+        },
+        {
+          type: 2,
+          style: 4,
+          label: 'Reject',
+          emoji: undefined,
+          disabled: false,
+          url: undefined,
+          custom_id: 'Rejected',
+        },
+      ],
       embed,
-      component: row,
-    });
+    };
+    await channel.send(buttonEmbed);
     await message.reply('Request sent.');
+    return null;
   }
 }