🔖 0.3.1

commit be217b1 Author: Evan Elias Young <[email protected]> Date: Mon Mar 14 17:52:55 2022 -0500 🔖 0.3.1 commit fe879d7 Author: Evan Elias Young <[email protected]> Date: Mon Mar 14 17:52:17 2022 -0500 ✨ warn user about guild commands in DMs commit eb18b10 Author: Evan Elias Young <[email protected]> Date: Mon Mar 14 16:21:35 2022 -0500 ✨ add source to about-bot
evaneliasyoung · Mar 14, 2022 · a81de3e · a81de3e
1 parent 28289d5
commit a81de3e
Show file tree

Hide file tree

Showing 23 changed files with 102 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "triangle-chan",
- "version": "0.3.0",
+ "version": "0.3.1",
  "description": "Triangle Fraternity's own waifu Discord bot!",
  "keywords": [
  "bot",

diff --git a/src/commands/category/add.command.ts b/src/commands/category/add.command.ts
@@ -215,7 +215,11 @@ export abstract class CategoryAddCommand {
  })
  async execute(interaction: CommandInteraction) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/category-add` can only be used in a server.',
+ });
+
  const categories = await GET_GUILD_CATEGORIES(interaction.guildId);
 
  if (!categories.length) {

diff --git a/src/commands/category/create.command.ts b/src/commands/category/create.command.ts
@@ -47,7 +47,10 @@ export abstract class CategoryCreateCommand {
  interaction: CommandInteraction
  ) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/category-create` can only be used in a server.',
+ });
 
  if (!name)
  return await interaction

diff --git a/src/commands/category/edit.command.ts b/src/commands/category/edit.command.ts
@@ -58,7 +58,10 @@ export abstract class CategoryEditCommand {
  interaction: CommandInteraction
  ) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/category-edit` can only be used in a server.',
+ });
 
  if (!newName && !newDesc && mutuallyExclusive === null) {
  log.debug(`User didn't change anything about the category`);

diff --git a/src/commands/category/list.command.ts b/src/commands/category/list.command.ts
@@ -34,7 +34,10 @@ export abstract class CategoryListCommand {
  })
  async execute(interaction: CommandInteraction) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/category-list` can only be used in a server.',
+ });
 
  const categories = await GET_GUILD_CATEGORIES(interaction.guildId).catch(
  MessageWithErrorHandler(

diff --git a/src/commands/category/remove.command.ts b/src/commands/category/remove.command.ts
@@ -36,7 +36,10 @@ export abstract class CategoryRemoveCommand {
  interaction: CommandInteraction
  ) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/category-remove` can only be used in a server.',
+ });
 
  if (!name) {
  log.debug(

diff --git a/src/commands/category/update.command.ts b/src/commands/category/update.command.ts
@@ -43,7 +43,10 @@ export abstract class CategoryUpdateCommand {
  interaction: CommandInteraction
  ) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/category-update` can only be used in a server.',
+ });
 
  if (!messageLink) {
  log.error(

diff --git a/src/commands/counter/create.command.ts b/src/commands/counter/create.command.ts
@@ -66,7 +66,10 @@ export abstract class CounterCreateCommand {
  interaction: CommandInteraction
  ) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/counter-create` can only be used in a server.',
+ });
 
  if (!isVoiceChannel(channel))
  return await interaction

diff --git a/src/commands/counter/edit.command.ts b/src/commands/counter/edit.command.ts
@@ -71,7 +71,10 @@ export abstract class CounterEditCommand {
  interaction: CommandInteraction
  ) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/counter-edit` can only be used in a server.',
+ });
 
  if (!newName && !newEmoji && !newType) {
  log.debug(`User didn't change anything about the counter`);

diff --git a/src/commands/counter/list.command.ts b/src/commands/counter/list.command.ts
@@ -31,7 +31,10 @@ export abstract class CounterListCommand {
  })
  async execute(interaction: CommandInteraction) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/counter-list` can only be used in a server.',
+ });
 
  const counters = await GET_COUNTERS_BY_GUILD_ID(interaction.guildId).catch(
  MessageWithErrorHandler(

diff --git a/src/commands/counter/remove.command.ts b/src/commands/counter/remove.command.ts
@@ -11,7 +11,6 @@
 import {CommandInteraction} from 'discord.js';
 import {Discord, Slash, SlashOption} from 'discordx';
 import {DELETE_COUNTER_BY_NAME} from '../../database/database.js';
-import CounterService from '../../services/counter.service.js';
 import {
  InteractionFailedHandlerGenerator,
  logger,
@@ -21,8 +20,6 @@ const InteractionFailedHandler = InteractionFailedHandlerGenerator(log);
 
 @Discord()
 export abstract class CounterRemoveCommand {
- #counterService = new CounterService();
-
  @Slash('counter-remove', {
  description: 'Removes the counters from the voice channels.',
  })
@@ -35,9 +32,11 @@ export abstract class CounterRemoveCommand {
  name: string,
  interaction: CommandInteraction
  ) {
- const {guild, guildId} = interaction;
- if (!guildId) return log.error(`GuildID did not exist on interaction.`);
- if (!guild) return log.error('Guild did not exist on interaction.');
+ if (!interaction.guildId)
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/counter-remove` can only be used in a server.',
+ });
 
  if (!name) {
  log.error(`Required option name was undefined.`);

diff --git a/src/commands/counter/sync.command.ts b/src/commands/counter/sync.command.ts
@@ -26,9 +26,12 @@ export abstract class CounterSyncCommand {
  description: 'Syncs the counts of the counter channels.',
  })
  async execute(interaction: CommandInteraction) {
- const {guild, guildId} = interaction;
- if (!guildId) return log.error(`GuildID did not exist on interaction.`);
- if (!guild) return log.error('Guild did not exist on interaction.');
+ const {guild} = interaction;
+ if (!guild)
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/counter-` can only be used in a server.',
+ });
 
  try {
  await this.#counterService.handleGuild(guild);

diff --git a/src/commands/react/channel.command.ts b/src/commands/react/channel.command.ts
@@ -45,7 +45,10 @@ export abstract class ReactChannelCommand {
  interaction: CommandInteraction
  ) {
  if (!interaction.guildId)
- return log.error(`GuildID did not exist on interaction.`);
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/react-channel` can only be used in a server.',
+ });
 
  try {
  await interaction

diff --git a/src/commands/react/list.command.ts b/src/commands/react/list.command.ts
@@ -29,7 +29,11 @@ export abstract class ReactListCommand {
  description: 'List all reaction roles that are currently active.',
  })
  async execute(interaction: CommandInteraction) {
- if (!interaction.isCommand() || !interaction.guildId) return;
+ if (!interaction.guildId)
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/react-list` can only be used in a server.',
+ });
 
  const reactRoles = await GET_REACT_ROLES_BY_GUILD_ID(
  interaction.guildId

diff --git a/src/commands/react/message.command.ts b/src/commands/react/message.command.ts
@@ -111,7 +111,11 @@ export abstract class ReactMessageCommand {
  messageLink: string,
  interaction: CommandInteraction
  ) {
- if (!interaction.isCommand() || !interaction.guildId) return;
+ if (!interaction.guildId)
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/react-message` can only be used in a server.',
+ });
 
  if (!messageLink)
  return await interaction

diff --git a/src/commands/react/nuke.command.ts b/src/commands/react/nuke.command.ts
@@ -77,6 +77,12 @@ export abstract class ReactNukeCommand {
  description: 'This will remove ALL react roles for this server.',
  })
  async execute(interaction: CommandInteraction) {
+ if (!interaction.guildId)
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/react-nuke` can only be used in a server.',
+ });
+
  const buttons = new MessageActionRow({
  components: [
  new MessageButton({

diff --git a/src/commands/react/remove.command.ts b/src/commands/react/remove.command.ts
@@ -41,6 +41,12 @@ export abstract class ReactRemoveCommand {
  role: Role,
  interaction: CommandInteraction
  ) {
+ if (!interaction.guildId)
+ return await interaction.reply({
+ ephemeral: true,
+ content: 'Hey! `/react-` can only be used in a server.',
+ });
+
  if (!role) {
  log.error(
  `Interaction was missing role property despite it being required.`

diff --git a/src/commands/react/role.command.ts b/src/commands/react/role.command.ts
@@ -54,7 +54,13 @@ export abstract class ReactRoleCommand {
  emoji: string,
  interaction: CommandInteraction
  ) {
- if (!interaction.isCommand() || !interaction.guildId) return;
+ if (!interaction.guildId)
+ return await interaction
+ .reply({
+ ephemeral: true,
+ content: 'Hey! `/react-role` can only be used in a server.',
+ })
+ .catch(InteractionFailedHandler);
 
  const {guild} = interaction;
  if (!guild) return;

diff --git a/src/commands/role/appoint.command.ts b/src/commands/role/appoint.command.ts
@@ -44,6 +44,14 @@ export default abstract class RoleAppointCommand {
  role: Role,
  interaction: CommandInteraction
  ) {
+ if (!interaction.guildId)
+ return await interaction
+ .reply({
+ ephemeral: true,
+ content: 'Hey! `/role-appoint` can only be used in a server.',
+ })
+ .catch(InteractionFailedHandler);
+
  if (role.members.has(user.id))
  return await interaction
  .reply({

diff --git a/src/index.ts b/src/index.ts
@@ -4,7 +4,7 @@
  *
  * @author Evan Elias Young
  * @date 2022-03-05
- * @date 2022-03-11
+ * @date 2022-03-14
  * @copyright Copyright 2022 Evan Elias Young. All rights reserved.
  */
 
@@ -34,6 +34,8 @@ import {
  ReactMessage,
  ReactRole,
 } from './database/database.js';
+import PermissionService from './services/permission.service.js';
+const permissionService = new PermissionService();
 const log = logger(import.meta);
 const MessageWithErrorHandler = MessageWithErrorHandlerGenerator(log);
 
@@ -49,6 +51,8 @@ const client = new Client({
  partials: ['MESSAGE', 'REACTION', 'CHANNEL', 'GUILD_MEMBER'],
 });
 
+permissionService.client = client;
+
 async function run() {
  const path: string = `${__dirname}/{events,commands}/**/*.ts`;
 

diff --git a/src/info.ts b/src/info.ts
@@ -4,14 +4,15 @@
  *
  * @author Evan Elias Young
  * @date 2022-03-09
- * @date 2022-03-13
+ * @date 2022-03-14
  * @copyright Copyright 2022 Evan Elias Young. All rights reserved.
  */
 
 import {ActivitiesOptions} from 'discord.js';
 import {DateTime} from 'luxon';
 
 export namespace BotInfo {
+ export const source = '[GitHub](https://github.com/evaneliasyoung/triangle-chan)'
  export const tagline = `Triangle-Chan: The Tenaciously Tasteful Discord Tease`;
  export const library =
  '[discord.ts / Node](https://github.com/oceanroleplay/discord.ts)';

diff --git a/src/services/embed.service.ts b/src/services/embed.service.ts
@@ -4,7 +4,7 @@
  *
  * @author Evan Elias Young
  * @date 2022-03-05
- * @date 2022-03-13
+ * @date 2022-03-14
  * @copyright Copyright 2022 Evan Elias Young. All rights reserved.
  */
 
@@ -278,9 +278,10 @@ export default class EmbedService {
  new MessageEmbed({
  description: BotInfo.tagline,
  fields: [
- {name: 'Author', value: 'MoM Chapter', inline: true},
+ {name: 'Source', value: BotInfo.source, inline: true},
  {name: 'Library', value: BotInfo.library, inline: true},
  {name: 'Version', value: BotInfo.version, inline: true},
+ {name: 'Author', value: 'MoM Chapter', inline: true},
  {name: 'Date', value: dateToISO(BotInfo.date), inline: true},
  {
  name: 'Servers',