this makes me wanna cry

Author: invisicat

Diff for: README.md

@@ -2,8 +2,13 @@
 
 ![GitHub](https://img.shields.io/github/license/andyiscool5463/ricebot)
 ![David](https://img.shields.io/david/andyiscool5463/ricebot)
+[![Build Status](https://travis-ci.com/AndyIsCool5463/rice-bot.svg?token=Syh8JoqVaQwAWirquxET&branch=master)](https://travis-ci.com/AndyIsCool5463/rice-bot)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7371b0fbdaea484aa52dbf8d9caa470c)](https://www.codacy.com?utm_source=github.com&utm_medium=referral&utm_content=AndyIsCool5463/rice-bot&utm_campaign=Badge_Grade)
+![Discord](https://img.shields.io/discord/285078632794161153)
+![Uptime Robot status](https://img.shields.io/uptimerobot/status/m784818736-b5ee05189c50f2f367cebf78)
+![Uptime Robot ratio (30 days)](https://img.shields.io/uptimerobot/ratio/m784818736-b5ee05189c50f2f367cebf78)
 
-Fast, clean, countless features your server made in [discord.js](DiscordJSLink) and [Typescript](typescriptlink).
+Fast, clean, countless features your server made in [discord.js](https://discord.js.org/) and [Typescript](https://www.typescriptlang.org/).
 Invite me _T.B.A_.
 
 # Features
@@ -30,13 +35,7 @@ T.B.A
 
 I would like to thank these people for creating these awesome libaries / sites. I wouldn't have been able to make this bot if it wern't for these good folks.
 
-- Hydrabolt - Creator of [Discord.JS](discordjslink) - [Github](hydraboltgithub)
-- People at Dirigeants - Creators of [Klasa](klasa) - [Github](dirigeantsgithub) (Huge inspiration)
+- Hydrabolt - Creator of [Discord.JS](https://discord.js.org/) - [Github](https://github.com/hydrabolt)
+- People at Dirigeants - Creators of [Klasa](https://github.com/dirigeants/klasa) - [Github](https://github.com/dirigeants) (Huge inspiration)
 - IRL Friends
 - You, for reading this :)
-
-[discordjslink]: https://discord.js.org/
-[typescriptlink]: https://www.typescriptlang.org/
-[klasa]: https://github.com/dirigeants/klasa
-[hydraboltgithub]: https://github.com/hydrabolt
-[dirigeantsgithub]: https://github.com/dirigeants

Diff for: modules.d.ts

@@ -4,3 +4,4 @@ declare namespace NodeJS {
     MONGO_URL: string;
   }
 }
+declare module "simple-youtube-api";

Diff for: package.json

@@ -9,12 +9,16 @@
     "test": "jest",
     "start": "env NODE_ENV=production nodemon index.ts"
   },
+  "engines": {
+    "node": "13.10.1"
+  },
   "dependencies": {
     "@babel/preset-typescript": "^7.9.0",
     "@types/dotenv": "^8.2.0",
     "@types/mongodb": "^3.5.8",
     "@types/mongoose": "^5.7.12",
     "@types/node": "^13.11.1",
+    "cachegoose": "^8.0.0",
     "chalk": "^4.0.0",
     "discord.js": "^12.1.1",
     "dotenv": "^8.2.0",
@@ -25,8 +29,10 @@
     "mongoose": "^5.9.10",
     "nodemon": "^2.0.3",
     "promise-each": "^2.2.0",
+    "simple-youtube-api": "^5.2.1",
     "ts-node": "^8.8.2",
-    "typescript": "^3.8.3"
+    "typescript": "^3.8.3",
+    "ytdl-core-discord": "^1.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",

Diff for: src/Monitors/CommandMonitor.ts

@@ -36,9 +36,8 @@ class CommandMonitor extends Monitor {
     const GS = await GSController.ensureGuild(msg.guild);
     let prefix: string | undefined;
     // i dont know how resource intensive this shit is but ye better than regex 🙃
-    for (const thisPrefix of GS.config.prefix) {
-      if (msg.content.startsWith(<string>thisPrefix))
-        prefix = <string>thisPrefix;
+    for (const thisPrefix of <string[]>GS.config.prefix) {
+      if (msg.content.startsWith(thisPrefix)) prefix = thisPrefix;
     }
 
     if (!prefix) return;
@@ -49,11 +48,10 @@ class CommandMonitor extends Monitor {
     args.reverse();
     // HACK: Change this shit asap
     const cmd =
-      client.CommandStore.get(command[0].toLowerCase()) ||
-      client.CommandStore.storeAlias.get(command[0].toLowerCase());
+      client.CommandStore.storeAlias.get(command[0].toLowerCase()) ||
+      client.CommandStore.get(command[0].toLowerCase());
     if (!cmd) return;
     const bruh = checkArgs(msg, cmd, args);
-    console.log(cmd.usage.length);
     if (isEmpty(bruh) && cmd.usage.length >= 1) return;
     /**
      * <> | required argument
@@ -75,7 +73,11 @@ class CommandMonitor extends Monitor {
       return;
     }
     if (!cmd.runIn.includes(msg.channel.type)) return;
-    cmd.run(msg, [bruh], client);
+    cmd.run(msg, [bruh], client).catch((e: Error) => {
+      msg.channel.send(
+        `There was an error executing your command. \n \`\`\`${e.message}\`\`\``
+      );
+    });
     return;
   }
 }

Diff for: src/Monitors/GuildMemberJoin.ts

@@ -0,0 +1,47 @@
+- File: IDEA.md
+- Project: ricebot
+- File Created: Sunday, 26th April 2020 4:15:14 pm
+- Author: andyl5463 ([email protected])
+- ***
+- Last Modified: Sunday, 26th April 2020 4:15:17 pm
+- Modified By: andyl5463 ([email protected]>)
+- ***
+- Copyright 2020 - 2020 Longshot Development, Longshot Development
+
+# IDEA Music
+
+> Permission Level 4 (T.B.A).
+
+## Rule Set
+
+1. Max 10 in queue for memory reasons. might experiement with higher ups.
+2. Queue is in memory
+3. Queue will have a store with `<guildID, Metadata>`
+
+## MetaData
+
+```
+{
+    song: <Song Metadata>,
+    requestedBy: <User Snowflake>,
+    timeRequested: <Date>
+}
+```
+
+## Commands
+
+- `play <URL | big string (max 100 chars)>` - Gets Video via `URL` or `Search`.
+
+- `pause` - Pauses playback.
+
+- `resume` - Resumes playback.
+
+- `stop` - Stops Playback.
+
+- `queue` - Displays Queue with Embed.
+
+- `np | nowplaying` - Displays Now Playing in Native Embed (No Pagination)
+
+## Backend
+
+i have no fuckign clue

Diff for: src/Music/IDEA.md

@@ -20,10 +20,23 @@ import mongoose from "mongoose";
 import EventStore from "./core/EventStore";
 import * as fsn from "fs-nextra";
 import Event from "./core/Event";
+import MusicStore from "./core/MusicStore";
+import InhibitorStore from "./core/InhibitorStore";
+/**
+ * My Ideas Upcoming After #3 Commit.
+ *
+ * Fuck all the methods in this class.
+ * just do everything in the constructor.
+ *
+ *
+ */
 class Rice extends Client {
   public MonitorStore: MonitorStore = new MonitorStore(this);
   public CommandStore: CommandStore = new CommandStore();
   public EventStore: EventStore = new EventStore(this);
+  public MusicStore: MusicStore = new MusicStore();
+  public InhibitorStore: InhibitorStore = new InhibitorStore();
+
   public constructor() {
     super();
     // Enmap
@@ -42,6 +55,9 @@ class Rice extends Client {
     this.on("guildDelete", (guild) =>
       this.EventStore.get("guildDelete")!.run(this, [guild])
     );
+    this.on("guildMemberAdd", (guildMember) =>
+      this.EventStore.get("guildMemberAdd")!.run(this, [guildMember])
+    );
     this.on("warn", (warn) => console.log(warn));
 
     // Setup Commands
@@ -57,8 +73,7 @@ class Rice extends Client {
   }
   public async connectToMongo(): Promise<void> {
     mongoose
-      // @ts-ignore
-      .connect(process.env.MONGO_URL, {
+      .connect(<string>process.env.MONGO_URL, {
         useUnifiedTopology: true,
         useNewUrlParser: true,
       })
@@ -124,9 +139,12 @@ class Rice extends Client {
   }
 }
 export default Rice;
-// process.on("uncaughtException", (error?: Error) => {
-//   const errorMsg = error.stack.replace(new RegExp(`${__dirname}/`, "g"), "./");
-//   console.log("Uncaught Exception: " + errorMsg);
-//   console.log(error);
-//   process.exit(1);
-// });
+process.on("uncaughtException", (error?: Error) => {
+  const errorMsg = error!.stack!.replace(
+    new RegExp(`${__dirname}/`, "g"),
+    "./"
+  );
+  console.log("Uncaught Exception: " + errorMsg);
+  console.log(error);
+  process.exit(1);
+});

Diff for: src/Rice.ts

@@ -13,11 +13,12 @@
 import { Message } from "discord.js";
 import Command from "../../core/Command";
 import Rice from "../../Rice";
+import playMusic from "../../util/Music/playMusic";
 module.exports = class extends Command {
   constructor() {
     super({
       name: "true",
-      enable: false,
+      enable: true,
       cooldown: 0,
       runIn: ["text"],
       permLevel: 0,
@@ -27,6 +28,6 @@ module.exports = class extends Command {
     });
   }
   public async run(msg: Message, [..._args], _client: Rice): Promise<void> {
-    msg.channel.send(`Hello World ${_args.map((c) => c)}`);
+    playMusic(_client, msg);
   }
 };

Diff for: src/commands/Misc/HelloWorld.ts

@@ -1,6 +1,7 @@
 import Command from "../../core/Command";
 import { Message } from "discord.js";
-
+import GSController from "../../core/api/GuildSettings.controller";
+//import { IGuildSettings } from "../../core/api/IGuildSettings";
 /*
  * File: config.ts
  * Project: ricebot
@@ -17,16 +18,43 @@ module.exports = class extends Command {
     super({
       name: "config",
       enable: true,
-      aliases: [""],
+      aliases: ["conf", "cfg"],
       cooldown: 0,
       permLevel: 6,
       runIn: ["text"],
       usage: "<set|get|reset|list|remove> [key:string] [value:string]",
       usageDelimiter: " ",
     });
   }
-  async run(msg: Message, [{ ...required }]): Promise<void> {
-    msg.channel.send("im alive");
-    console.log(required);
+  async run(msg: Message, [{ ...args }]): Promise<Message> {
+    const { required, key, value } = args;
+    GSController.testo(msg.guild!.id).then(() => {
+      console.log("did iut");
+    });
+    if (!key || !value) return msg.channel.send("No Key / Value Input.");
+
+    switch (key) {
+      case "prefix":
+        // GSController.changeConfig(msg.guild!, required, key, value)
+        //   .then((cfg: IGuildSettings) => {
+        //     msg.channel.send(`Changed prefix to: ${cfg.config.prefix}`);
+        //   })
+        //   .catch((e) => {
+        //     console.log(e);
+        //   });
+
+        break;
+      case "xp":
+        break;
+      case "nsfw":
+        break;
+      case "joinRole":
+        break;
+      case "EventJoin":
+        break;
+      default:
+        return msg.channel.send("wtf");
+    }
+    return msg.channel.send(`${required}-${key}-${value}`);
   }
 };

Diff for: src/commands/System/config.ts

@@ -51,7 +51,11 @@ class Command {
     this.usageDelimiter = usageDelimiter;
   }
 
-  public run(_message: Message, [..._args], _client: Rice): void {}
+  public async run(
+    _message: Message,
+    [..._args],
+    _client: Rice
+  ): Promise<Message | void> {}
   get getRunIn() {
     return this.runIn;
   }

Diff for: src/core/Command.ts

@@ -0,0 +1,18 @@
+import { Snowflake } from "discord.js";
+
+/*
+ * File: IQueue.ts
+ * Project: ricebot
+ * File Created: Sunday, 26th April 2020 4:30:12 pm
+ * Author: andyl5463 ([email protected])
+ * -----
+ * Last Modified: Sunday, 26th April 2020 4:30:12 pm
+ * Modified By: andyl5463 ([email protected]>)
+ * -----
+ * Copyright 2020 - 2020 Longshot Development, Longshot Development
+ */
+export default interface Queue {
+  song: any;
+  requestedBy: Snowflake;
+  timeRequested: Date;
+}

Diff for: src/core/IQueue.ts

@@ -0,0 +1,12 @@
+/*
+ * File: Inhibitor.ts
+ * Project: ricebot
+ * File Created: Tuesday, 28th April 2020 3:51:09 pm
+ * Author: AndyIsCool5463 ([email protected])
+ * -----
+ * Last Modified: Tuesday, 28th April 2020 3:51:09 pm
+ * Modified By: AndyIsCool5463 ([email protected]>)
+ * -----
+ * Copyright 2020 - 2020 Longshot Development, Longshot Development
+ */
+export default class Inhibitor {}

Diff for: src/core/Inhibitor.ts

@@ -0,0 +1,22 @@
+/*
+ * File: InhibitorStore.ts
+ * Project: ricebot
+ * File Created: Tuesday, 28th April 2020 3:49:56 pm
+ * Author: AndyIsCool5463 ([email protected])
+ * -----
+ * Last Modified: Tuesday, 28th April 2020 3:49:56 pm
+ * Modified By: AndyIsCool5463 ([email protected]>)
+ * -----
+ * Copyright 2020 - 2020 Longshot Development, Longshot Development
+ */
+
+import Store from "./Store";
+import Inhibitor from "./Inhibitor";
+import { Collection } from "discord.js";
+
+export default class InhibitorStore extends Store<string, Inhibitor> {
+  public store: Collection<string, Inhibitor> = super.getStore;
+  constructor() {
+    super();
+  }
+}

Diff for: src/core/InhibitorStore.ts

@@ -31,6 +31,6 @@ class Monitor {
     this.ignoreOthers = ignoreOthers;
     this.ignoreSelf = ignoreSelf;
   }
-  public run(_msg: Message, _client: Rice): void {}
+  public async run(_msg: Message, _client: Rice): Promise<Message | void> {}
 }
 export default Monitor;

Diff for: src/core/Monitor.ts

@@ -12,6 +12,7 @@
 
 import Monitor from "./Monitor";
 import Store from "./Store";
+import { Message } from "discord.js";
 /**
  * This class handles all the monitors which are functions that only execute on `Discord.Client#onMessage`
  */
@@ -23,15 +24,19 @@ class MonitorStore extends Store<string, Monitor> {
     super();
     this.client = client;
   }
-  run(msg: any) {
+  run(msg: Message) {
     for (const monit of super.getStore.values()) {
       if (
         monit.enabled &&
         !(monit.ignoreBots && msg.author.bot) &&
         !(monit.ignoreSelf && this.client.user === msg.author) &&
         !(monit.ignoreOthers && this.client.user !== msg.author)
       ) {
-        monit.run(msg, this.client);
+        monit.run(msg, this.client).catch((Exception: Error) => {
+          msg.channel.send(
+            `There was an error executing your command. \n \`\`\`${Exception.message}\`\`\``
+          );
+        });
       }
     }
   }