fix: emma commands only in emma server, improv: emma categories

3 files changed, 6 insertions, 5 deletions

diff --git a/server/src/commands/emma/FanArt.ts b/server/src/commands/emma/FanArt.ts
index 3d04718..5ac01f7 100644
--- a/server/src/commands/emma/FanArt.ts
+++ b/server/src/commands/emma/FanArt.ts
@@ -2,7 +2,7 @@ import { Command } from 'discord-akairo';
 import { Message } from 'discord.js';
 import FanArt from '../../database/models/FanArtModel';
 import mongoose from 'mongoose';
-import { mongoDBUri, colour } from '../../Config';
+import { mongoDBUri, colour, emmaServer } from '../../Config';
 mongoose.connect(mongoDBUri, {
     useNewUrlParser: true,
     useUnifiedTopology: true
@@ -45,7 +45,7 @@ export default class FanArtEmma extends Command {
     }
     
     public exec(msg: Message, { type, comment }): Promise<Message> | any  {
-        if (msg.guild.id.toString() !== '663964105983393793') return;
+        if (msg.guild.id.toString() !== emmaServer) return;
         const welcome = new FanArt({
             _id: mongoose.Types.ObjectId(),
             username: msg.author.username,
diff --git a/server/src/commands/emma/UglyCat.ts b/server/src/commands/emma/UglyCat.ts
index 95193fe..367c010 100644
--- a/server/src/commands/emma/UglyCat.ts
+++ b/server/src/commands/emma/UglyCat.ts
@@ -6,7 +6,7 @@ export default class UglyCatEmma extends Command {
     public constructor() {
         super('uglycat', {
             aliases: ['uglycat', 'ugycat'],
-            category: 'fun',
+            category: 'emma',
             description: {
                 content: 'Ugly Cat.',
                 usage: '',
diff --git a/server/src/commands/emma/Verify.ts b/server/src/commands/emma/Verify.ts
index 09bebbb..b09d93d 100644
--- a/server/src/commands/emma/Verify.ts
+++ b/server/src/commands/emma/Verify.ts
@@ -1,6 +1,6 @@
 import { Command } from 'discord-akairo';
 import { Message } from 'discord.js';
-import { colour } from '../../Config';
+import { colour, emmaServer } from '../../Config';
 import * as svgCaptcha from 'svg-captcha';
 import { MessageAttachment } from 'discord.js';
 import { TextChannel } from 'discord.js';
@@ -10,7 +10,7 @@ export default class VerifyEmma extends Command {
     public constructor() {
         super('verify', {
             aliases: ['verify'],
-            category: 'moderation',
+            category: 'emma',
             description: {
                 content: 'Allows to to verify yourself so you can access the rest of a server. Public version out soon!',
                 usage: '',
@@ -23,6 +23,7 @@ export default class VerifyEmma extends Command {
     }
     
     public async exec(msg: Message): Promise<Message> {
+        if (msg.guild.id.toString() !== emmaServer) return;
         msg.delete();
         if ((msg.channel as TextChannel).name !== verificationChannel) return;
         if (msg.channel.type ==='dm') return msg.channel.send('Sorry, verification needs to be initialized in the server\'s verification channel!');