Merge pull request #9 from PretendoNetwork/network-dumps

Scan and reupload network dumps

.gitignore

@@ -60,4 +60,5 @@ typings/
 # custom
 config.json
 db.json
-database.db
+database.db
+network-dumps-tmp

package.json

@@ -23,11 +23,13 @@
  "@discordjs/builders": "^1.3.0",
  "@discordjs/rest": "^1.3.0",
  "@napi-rs/canvas": "^0.1.40",
+ "axios": "^1.4.0",
  "cld": "^2.9.0",
  "discord-api-types": "^0.31.2",
  "discord-html-transcripts": "^3.1.2",
  "discord.js": "^14.8.0",
  "fs-extra": "^10.1.0",
+ "lookpath": "^1.2.2",
  "natural": "^6.5.0",
  "sqlite": "^4.1.2",
  "sqlite3": "^5.1.2"

src/bot.js

@@ -9,10 +9,14 @@ const config = require('../config.json');
 
 const client = new Discord.Client({
  intents: [
+ Discord.GatewayIntentBits.DirectMessages,
  Discord.GatewayIntentBits.Guilds,
  Discord.GatewayIntentBits.GuildMessages,
  Discord.GatewayIntentBits.GuildMembers,
  Discord.GatewayIntentBits.MessageContent,
+ ],
+ partials: [
+ Discord.Partials.Channel
  ]
 });
 

src/commands/settings.js

@@ -5,13 +5,15 @@ const { SlashCommandBuilder } = require('@discordjs/builders');
 const editableOptions = [
  'admin_role_id',
  'unverified_role_id',
+ 'developer_role_id',
  'mod_applications_channel_id',
  'reports_channel_id',
  'readme_channel_id',
  'rules_channel_id',
  'stats_members_channel_id',
  'stats_people_channel_id',
  'stats_bots_channel_id',
+ 'uploaded_network_dumps_channel_id',
 ];
 
 async function verifyInputtedKey(interaction) {
@@ -40,7 +42,7 @@ async function settingsHandler(interaction) {
  '```\n' + key + '=' + '\'' + `${value}` + '\'' + '\n```',
  ephemeral: true,
  allowedMentions: {
- parse: [], // dont allow tagging anything
+ parse: [], // * Dont allow tagging anything
  },
  });
  return;

src/commands/togglerole.js

@@ -26,7 +26,7 @@ async function toggleroleHandler(interaction) {
  }
 
  const hasRole = member.roles.cache.has(role.id);
- 
+
  if (hasRole) {
  await member.roles.remove(role);
  } else {

src/database.js

@@ -14,13 +14,15 @@ async function connect() {
  guild_id TEXT,
  admin_role_id TEXT,
  unverified_role_id TEXT,
+ developer_role_id TEXT,
  mod_applications_channel_id TEXT,
  reports_channel_id TEXT,
  readme_channel_id TEXT,
  rules_channel_id TEXT,
  stats_members_channel_id TEXT,
  stats_people_channel_id TEXT,
  stats_bots_channel_id TEXT,
+ uploaded_network_dumps_channel_id TEXT,
  UNIQUE(guild_id)
  )`);
 

src/events/messageCreate.js

@@ -1,8 +1,8 @@
-const timers = require('node:timers/promises');
 const Discord = require('discord.js');
 const { button: disableNLPButton } = require('../buttons/disable-nlp');
 const { button: expandErrorButton } = require('../buttons/expand-error');
 const errorCodeUtils = require('../utils/errorCode');
+const { networkDumpsUploader } = require('../utils/network-dumps-upload');
 const database = require('../database');
 
 const ayyRegex = /\bay{1,}\b/gi;
@@ -16,36 +16,37 @@ async function messageCreateHandler(message) {
  return;
  }
 
- // * ayy => lmaoo
- if (ayyRegex.test(message.content)) {
- const lmaod = message.content.replaceAll(ayyRegex, (match) => {
- let newMatch = match.replaceAll('y', 'o').replaceAll('Y', 'O');
- newMatch = newMatch.replaceAll('a', 'lma').replaceAll('A', 'LMA');
- return newMatch;
- });
-
- // Check that the message isn't too long to be sent
- if (lmaod.length < 2000) {
- await message.reply({
- content: lmaod,
- allowedMentions: { parse: [] }
+ // * Message was sent in the guild
+ if (!(message.channel instanceof Discord.DMChannel)) {
+ // * ayy => lmaoo
+ if (ayyRegex.test(message.content)) {
+ const lmaod = message.content.replaceAll(ayyRegex, (match) => {
+ let newMatch = match.replaceAll('y', 'o').replaceAll('Y', 'O');
+ newMatch = newMatch.replaceAll('a', 'lma').replaceAll('A', 'LMA');
+ return newMatch;
  });
- } else {
- await message.reply('Looks like the resulting message is too long :/');
+
+ // * Check that the message isn't too long to be sent
+ if (lmaod.length < 2000) {
+ await message.reply({
+ content: lmaod,
+ allowedMentions: { parse: [] }
+ });
+ } else {
+ await message.reply('Looks like the resulting message is too long :/');
+ }
  }
 
- return;
- }
+ // * Check if automatic help is disabled
+  const isHelpDisabled = await database.checkAutomaticHelpDisabled(message.guildId, message.member.id);
 
- // * Check if automatic help is disabled
- const isHelpDisabled = await database.checkAutomaticHelpDisabled(message.guildId, message.member.id);
+ if (!isHelpDisabled) {
+ // * Only do automatic help if not disabled
+ await tryAutomaticHelp(message);
+ }
 
- if (isHelpDisabled) {
- // * Bail if automatic help is disabled
- return;
+ await networkDumpsUploader(message);
  }
-
- await tryAutomaticHelp(message);
 }
 
 /**

src/nlp/message-processor.js

@@ -6,8 +6,8 @@ const trainingDataDir = `${__dirname}/training-data`;
 
 class AIMessageProcessor {
  constructor() {
- this.classifierThreshold = 0.8;
- this.cldThreshold = 80;
+ this.classifierThreshold = 1;
+ this.cldThreshold = 100;
  this.classifiers = {};
  this.answers = {};
 

src/utils/cooldown.js

@@ -66,15 +66,15 @@ function getRelativeTime(timestamp) {
  }
 
  else if (elapsed < msPerMonth) {
- return `in ${Math.round(elapsed/msPerDay)} day(s)`; 
+ return `in ${Math.round(elapsed/msPerDay)} day(s)`;
  }
 
  else if (elapsed < msPerYear) {
- return `in ${Math.round(elapsed/msPerMonth)} month(s)`; 
+ return `in ${Math.round(elapsed/msPerMonth)} month(s)`;
  }
 
  else {
- return `in ${Math.round(elapsed/msPerYear)} year(s)`; 
+ return `in ${Math.round(elapsed/msPerYear)} year(s)`;
  }
 }