change: Renaming warns to memos

Author: phil-flip

changelog.md

@@ -0,0 +1,16 @@
+**Changelog:**
+__3.1.0 - Renaming warns to memos__
+
+New Stuff:
+- None
+
+Important Changes:
+- Renaming warns to memos
+  - This makes the usage of the command more open and doesn't restrict to only warnings.
+
+Boring Bug Fixes:
+- None
+
+Planned for the Future:
+- Hard mode: kick/ban everyone on global ban list; kick every unverified bot;...
+- everything else

changelog.txt

@@ -42,7 +42,7 @@ async function postUserinfo(message, userID, bans, warns) {
       .addField('Account Creation Date', discordUser.createdAt, true)
       .setThumbnail(discordUser.displayAvatarURL({ format: 'png', dynamic: true, size: 1024 }));
     if (bans) embed.addField('Bans', bans, true);
-    if (warns) embed.addField('Warns', warns, true);
+    if (warns) embed.addField('Memos', warns, true);
     if (sharedServers.size) embed.addField(`Shared servers - ${sharedServers.size}`, `\`\`\`${sharedServers.map((sharedMember) => sharedMember.name).join('\n')}\`\`\``, false);
     return message.channel.send({ embed });
   }

commands/archive/lookup.js

@@ -68,7 +68,7 @@ module.exports.run = async (interaction) => {
   if (allBans.length < 5) return postBans(allBans, interaction);
 
   const message = await new MessageEmbed()
-    .setDescription(`The bot is about to spam ${allBans.length} listed bans into this channel! This action can not be stopped midway through. \nAre you sure?`)
+    .setDescription(`The bot is about to spam ${allBans.length} listed bans into this channel! This action can not be stopped midway through.\nAre you sure?`)
     .setColor('ORANGE');
   const confirmMessage = await reply(interaction, {
     embeds: [message], components: [buttons], fetchReply: true, ephemeral: true,

commands/checkallusers.js

@@ -43,7 +43,7 @@ async function postUserinfo(interaction, userID, bans, warns, followUp = false)
     .addField('Account Creation Date', date(discordUser.createdAt), true)
     .setThumbnail(discordUser.displayAvatarURL({ format: 'png', dynamic: true, size: 1024 }));
   if (bans) embed.addField('Bans', `${bans}`, true);
-  if (warns) embed.addField('Warns', `${warns}`, true);
+  if (warns) embed.addField('Memos', `${warns}`, true);
   if (sharedServers.size) {
     // FIXME: check if it really only shows one server
     const serverlist = sharedServers.map((sharedMember) => sharedMember.name).join('\n');
@@ -111,13 +111,13 @@ function postWarns(interaction, warns) {
   warns.forEach(async (warn) => {
     const serverName = await getServerName(warn.serverID);
     const embed = new MessageEmbed()
-      .setColor(16755456) // yellow
+      .setColor('YELLOW') // yellow
       .setDescription(`**Reason**:\n\`\`\`${warn.reason || 'None'}\`\`\``)
-      .setAuthor({ name: `Warned on ${serverName}` })
+      .setAuthor({ name: `Memo created in ${serverName}` })
       .addField('ServerID', `\`${warn.serverID}\``, true)
-      .addField('WarnID', `\`${warn.warnID}\``, true)
-      .addField('Warning creation date', date(warn.createdAt));
-    if (date(warn.createdAt) !== date(warn.updatedAt)) embed.addField('Warning updated date', date(warn.updatedAt));
+      .addField('MemoID', `\`${warn.warnID}\``, true)
+      .addField('Memo creation date', date(warn.createdAt));
+    if (date(warn.createdAt) !== date(warn.updatedAt)) embed.addField('Memo updated date', date(warn.updatedAt));
     reply(interaction, { embeds: [embed] }, true);
   });
 }

commands/lookup.js

@@ -0,0 +1,94 @@
+const { MessageEmbed } = require('discord.js');
+
+const Warn = require('../database/models/Warn');
+
+// TODO: recreate richmessage embed sender to it can be sent to other servers
+
+// checks if server is partisipating server
+function getServerEntry(serverID) {
+  return client.functions.get('GET_DB_server').run(serverID, true);
+}
+
+// warns other servers
+async function messageWarnedUserInGuild(channelID, userTag, userID, warnMessage, serverName) {
+  const embed = new MessageEmbed();
+  embed.setColor(16755456);
+  embed.setFooter({ text: `For more information about this user, use '/lookup ${userID}'` });
+  embed.setTitle(`A memo was added to a user in your server in '${serverName}'!`);
+  embed.setDescription(`Tag: \`${userTag}\`
+  ID: \`${userID}\`
+  Reason: \`\`\`${warnMessage || 'none'}\`\`\``);
+  const channel = await client.channels.cache.get(channelID);
+  channel.send({ embeds: [embed] });
+}
+
+// warns other servers for aliases
+async function messageWarnedAliasUserInGuild(channelID, userTag, userID, warnMessage, serverName, orgUserTag) {
+  const embed = new MessageEmbed();
+  embed.setColor(16755456);
+  embed.setFooter({ text: `For more information about this user, use '/lookup ${orgUserTag}'` });
+  embed.setTitle(`A memo was added to an alias of a user in your server in '${serverName}'!`);
+  embed.setDescription(`**The user \`${userTag}\` is an alias of a user that has been warned!**
+
+  Tag: \`${orgUserTag}\`
+  ID: \`${userID}\`
+  Reason: \`\`\`${warnMessage || 'none'}\`\`\``);
+  const channel = await client.channels.cache.get(channelID);
+  channel.send({ embeds: [embed] });
+}
+
+async function checkforInfectedGuilds(guild, orgUserID, warnMessage) {
+  let aliases = await client.functions.get('GET_DB_alias').run(orgUserID);
+  if (!aliases) aliases = [orgUserID];
+  const orgUser = await client.users.fetch(orgUserID, false);
+  // look for each of the conencted users (alias) if they are a member in the corresponding guild
+  aliases.forEach((userID) => {
+    client.guilds.cache.forEach(async (toTestGuild) => {
+      // dont post in own guild
+      // TODO: warn own server that there are aliases: let through, if user is not the same as who a warn was issued for
+      if (guild.id === toTestGuild.id) return;
+      const serverMember = toTestGuild.members.cache.get(userID);
+      if (!serverMember) return;
+      const serverID = toTestGuild.id;
+      const infectedGuild = await getServerEntry(serverID);
+      if (infectedGuild && infectedGuild.active && infectedGuild.logChannelID) {
+        if (orgUserID === userID) messageWarnedUserInGuild(infectedGuild.logChannelID, orgUser.tag, orgUserID, warnMessage, guild.name);
+        else messageWarnedAliasUserInGuild(infectedGuild.logChannelID, serverMember.user.tag, orgUserID, warnMessage, guild.name, orgUser.tag);
+      }
+    });
+  });
+}
+
+module.exports.run = async (interaction) => {
+  // check maintainer permissions
+  if (!await client.functions.get('CHECK_DB_perms').run(interaction.user.id, 'staff', interaction.guild.id, interaction.member)) {
+    messageFail(interaction, `You are not authorized to use \`/${module.exports.data.name}\``);
+    return;
+  }
+  const subName = interaction.options.getSubcommand(true);
+  const warnMessage = interaction.options.getString('message', true);
+  client.commands.get(`${module.exports.data.name}_${subName}`).run(interaction, warnMessage, Warn, checkforInfectedGuilds);
+};
+
+module.exports.data = new CmdBuilder()
+  .setName('memo')
+  .setDescription('Managed memos about a user for other servers to see.')
+  .addSubcommand((SC) => SC
+    .setName('add')
+    .setDescription('Add Memo.')
+    .addUserOption((option) => option.setName('user').setDescription('Provide a user.').setRequired(true))
+    .addStringOption((option) => option
+      .setName('message')
+      .setDescription('Memo text.')
+      .setRequired(true)))
+  .addSubcommand((SC) => SC
+    .setName('edit')
+    .setDescription('Edit a existing memo.')
+    .addNumberOption((option) => option
+      .setName('memoid')
+      .setDescription('Provide the memo ID of the one you want to edit.')
+      .setRequired(true))
+    .addStringOption((option) => option
+      .setName('message')
+      .setDescription('New memo text.')
+      .setRequired(true)));

commands/memo.js

@@ -8,12 +8,12 @@ module.exports.run = async (interaction, warnMessage, Warn, checkforInfectedGuil
   const user = interaction.options.getUser('user', true);
   const userID = user.id;
   // check if user is a bot
-  if (user.bot) return messageFail(interaction, 'This user is a bot and cannot be warned.');
+  if (user.bot) return messageFail(interaction, 'This user is a bot and you can\'t add a memo to them.');
   // checking if user is AB
-  if (userID === client.user.id) return messageFail(interaction, 'You can\'t warn the bot itself!');
+  if (userID === client.user.id) return messageFail(interaction, 'You can\'t add a memo the bot itself!');
   // add warn
   await addWarn(Warn, interaction.guild.id, userID, warnMessage);
-  messageSuccess(interaction, `The user with the ID \`${userID}\` got a new warning added.\nWarning other servers.\nPlease keep in mind: The warning feature is not a way to reach out to the user!`);
+  messageSuccess(interaction, `The memo got added to the user with the ID \`${userID}\`.\nWarning other servers.\nPlease keep in mind: The memo feature is not a way to reach out to the user!`);
   checkforInfectedGuilds(interaction.guild, userID, warnMessage);
 };
 

commands/warn/add.js commands/memo/add.jscommands/warn/add.js renamed to commands/memo/add.js

@@ -14,19 +14,19 @@ module.exports.run = async (interaction, warnMessage, Warn, checkforInfectedGuil
   //   messageFail(interaction, 'This is not a warn-ID!');
   //   return;
   // }
-  const warnID = interaction.options.getNumber('warnid', true);
+  const warnID = interaction.options.getNumber('memoid', true);
   const serverID = interaction.guild.id;
   const warning = await getWarning(Warn, warnID);
   // check if warn is existent
-  if (!warning) return messageFail(interaction, 'A Warning with this ID doesn\'t exist!');
+  if (!warning) return messageFail(interaction, 'A memo with this ID doesn\'t exist!');
   // check if warn is from the same server
   if (warning.serverID !== serverID) {
-    messageFail(interaction, 'You can only edit warnings form the server where they have been issued from.');
+    messageFail(interaction, 'You can only edit memos form the server where they have been issued from.');
     return;
   }
   // add warn
   await editWarn(Warn, warnID, warnMessage);
-  messageSuccess(interaction, `The warning with the the ID ${warnID} has been edited. Warning other servers.`);
+  messageSuccess(interaction, `The memo with the the ID ${warnID} has been edited. Warning other servers.`);
   checkforInfectedGuilds(interaction.guild, warning.userID, warnMessage);
 };
 

commands/warn/edit.js commands/memo/edit.jscommands/warn/edit.js renamed to commands/memo/edit.js

@@ -1,94 +1,18 @@
 const { MessageEmbed } = require('discord.js');
 
-const Warn = require('../database/models/Warn');
-
-// TODO: recreate richmessage embed sender to it can be sent to other servers
-
-// checks if server is partisipating server
-function getServerEntry(serverID) {
-  return client.functions.get('GET_DB_server').run(serverID, true);
-}
-
-// warns other servers
-async function messageWarnedUserInGuild(channelID, userTag, userID, warnMessage, serverName) {
-  const embed = new MessageEmbed();
-  embed.setColor(16755456);
-  embed.setFooter({ text: `For more information about this user, use '/lookup ${userID}'` });
-  embed.setTitle(`A user on your server has been warned on '${serverName}'!`);
-  embed.setDescription(`Tag: \`${userTag}\`
-  ID: \`${userID}\`
-  Reason: \`\`\`${warnMessage || 'none'}\`\`\``);
-  const channel = await client.channels.cache.get(channelID);
-  channel.send({ embeds: [embed] });
-}
-
-// warns other servers for aliases
-async function messageWarnedAliasUserInGuild(channelID, userTag, userID, warnMessage, serverName, orgUserTag) {
-  const embed = new MessageEmbed();
-  embed.setColor(16755456);
-  embed.setFooter({ text: `For more information about this user, use '/lookup ${orgUserTag}'` });
-  embed.setTitle(`An alias of a user on your server has been warned on '${serverName}'!`);
-  embed.setDescription(`**The user \`${userTag}\` is an alias of a user that has been warned!**
-
-  Tag: \`${orgUserTag}\`
-  ID: \`${userID}\`
-  Reason: \`\`\`${warnMessage || 'none'}\`\`\``);
-  const channel = await client.channels.cache.get(channelID);
-  channel.send({ embeds: [embed] });
-}
-
-async function checkforInfectedGuilds(guild, orgUserID, warnMessage) {
-  let aliases = await client.functions.get('GET_DB_alias').run(orgUserID);
-  if (!aliases) aliases = [orgUserID];
-  const orgUser = await client.users.fetch(orgUserID, false);
-  // look for each of the conencted users (alias) if they are a member in the corresponding guild
-  aliases.forEach((userID) => {
-    client.guilds.cache.forEach(async (toTestGuild) => {
-      // dont post in own guild
-      // TODO: warn own server that there are aliases: let through, if user is not the same as who a warn was issued for
-      if (guild.id === toTestGuild.id) return;
-      const serverMember = toTestGuild.members.cache.get(userID);
-      if (!serverMember) return;
-      const serverID = toTestGuild.id;
-      const infectedGuild = await getServerEntry(serverID);
-      if (infectedGuild && infectedGuild.active && infectedGuild.logChannelID) {
-        if (orgUserID === userID) messageWarnedUserInGuild(infectedGuild.logChannelID, orgUser.tag, orgUserID, warnMessage, guild.name);
-        else messageWarnedAliasUserInGuild(infectedGuild.logChannelID, serverMember.user.tag, orgUserID, warnMessage, guild.name, orgUser.tag);
-      }
-    });
-  });
-}
-
 module.exports.run = async (interaction) => {
   // check maintainer permissions
   if (!await client.functions.get('CHECK_DB_perms').run(interaction.user.id, 'staff', interaction.guild.id, interaction.member)) {
     messageFail(interaction, `You are not authorized to use \`/${module.exports.data.name}\``);
     return;
   }
-  const subName = interaction.options.getSubcommand(true);
-  const warnMessage = interaction.options.getString('message', true);
-  client.commands.get(`${module.exports.data.name}_${subName}`).run(interaction, warnMessage, Warn, checkforInfectedGuilds);
+  const embed = new MessageEmbed();
+  embed.setColor(16755456);
+  embed.setDescription('This command has been deprecated. Use `/memo` instead');
+  const channel = await client.channels.cache.get(channelID);
+  channel.send({ embeds: [embed] });
 };
 
 module.exports.data = new CmdBuilder()
   .setName('warn')
-  .setDescription('Warns other servers about a specific user.')
-  .addSubcommand((SC) => SC
-    .setName('add')
-    .setDescription('Add warning.')
-    .addUserOption((option) => option.setName('user').setDescription('Provide a user.').setRequired(true))
-    .addStringOption((option) => option
-      .setName('message')
-      .setDescription('Message this warning should be.')
-      .setRequired(true)))
-  .addSubcommand((SC) => SC
-    .setName('edit')
-    .setDescription('Edit a existing warning.')
-    .addNumberOption((option) => option
-      .setName('warnid')
-      .setDescription('Provide the warn ID of the one you want to edit.')
-      .setRequired(true))
-    .addStringOption((option) => option
-      .setName('message')
-      .setDescription('Message this warning should be.')
-      .setRequired(true)));
+  .setDescription('This command has been deprecated. Use /memo instead.');

commands/warn.js

@@ -18,7 +18,7 @@
             "text": "./about.txt"
         },
         "changelog": {
-            "text": "./changelog.txt"
+            "text": "./changelog.md"
         }
     },
     "functions": {