Merge pull request #8 from ctnkaan/staging

Staging to main

Author: ctnkaan

package.json

@@ -14,7 +14,7 @@
     "bing-translate-api": "^2.2.1",
     "discord.js": "^12.5.3",
     "dotenv": "^10.0.0",
-    "memejs": "^2.0.1"
+    "memejs": "^1.2.3"
   },
   "devDependencies": {
     "@types/node": "^16.11.4",

src/commands/help.ts

@@ -1,5 +1,6 @@
 const Programs = require('./programs');
 const Translate = require('./translate');
+const Meme = require('./meme');
 
 module.exports = { 
     name: "help",
@@ -24,6 +25,10 @@ module.exports = {
                 name: "!p " + Translate.name + " <text>",
                 value: Translate.description,
             },
+            {
+                name: "!p" + Meme.name,
+                value: Meme.description,
+            }
         )
         .setTimestamp()
         .setFooter(

src/commands/meme.ts

@@ -0,0 +1,28 @@
+const { meme } = require('memejs');
+
+module.exports = {
+    name: "meme",
+    description: "Generates a meme",
+    run(message :any, Discord :any) {
+
+        meme('ProgrammerHumor', function(err: any, data: { title: String | null; url: String; }) {
+
+            if (err) 
+                return message.channel.send("I had an error :/");
+            
+            if (data.title == null)
+                data.title = "No title";
+
+            const msg = new Discord.MessageEmbed()
+            .setColor('#c7651a')
+            .setTitle(data.title)
+            .setImage(data.url)
+            .setTimestamp()
+            .setFooter(
+                'type "!p help" for more info!',
+                'https://i.imgur.com/ElCDWZb.png'
+            );
+            message.channel.send(msg)
+        });
+    }
+}

src/commands/scamLinkDetector.ts

@@ -1,11 +1,12 @@
 module.exports = {
     name: "scamLinkDetector",
     description: "Detects scam links",
-    run: (msg: any) => {
+    run: (msg :any) => {
 
         if (msg.content.toLowerCase().includes("nitro") || msg.content.toLowerCase().includes("i leave from cs:go")) {
+
+            msg.author.send("Word nitro is banned due to increase in scams. If you see multiple of these messages your account is probably infected.").catch(console.error);
             msg.delete();
-            msg.channel.send(`A suspicious message has been deleted!`);
         }
     }
-}
+}

src/server.ts

@@ -1,52 +1,60 @@
 //<> with ❤️ by Postman Student Leaders
 
 import dotenv from 'dotenv';
+import { meme } from 'memejs';
 dotenv.config();
 const Discord = require('discord.js');
-const Bot = new Discord.Client();
+const client = new Discord.Client();
 
 
 //commands
 const ScamDetector = require('./commands/scamLinkDetector');
 const Programs = require('./commands/programs');
 const Translate = require('./commands/translate');
 const Help = require('./commands/help');
+const Meme = require('./commands/meme');
 
 //Prefix
 const prefix = "!p" 
 
-Bot.on("ready", () => {
+client.on("ready", () => {
     console.log("I am ready!");
-    Bot.user.setActivity("<> with ❤️ by Postman Student Leaders");
+    client.user.setActivity("!p help");
 });
 
-Bot.on("message", (message: any) => {
-    ScamDetector.run(message);
+client.on("message", (message: any) => {
+
+    if (message.author.bot) return;
+    
+    ScamDetector.run(message, client);
+
+    if (!message.content.startsWith(prefix)) return;
 
-    if ((!message.content.startsWith(prefix)) || message.author.bot) return;
     const args = message.content.slice(prefix.length).trim().split(/ +/g);
     const command = args.shift().toLowerCase();
 
-    console.log(command);
 
     switch (command) {
         case "programs":
             Programs.run(message, Discord);
             break;
 
         case "translate":
-            //Translate.run(message, Discord, args);
-            message.channel.send("Translate command is under maintenance");
+            Translate.run(message, Discord, args);
             break;
 
         case "help":
             Help.run(message, Discord);
             break;
 
+        case "meme":
+            Meme.run(message, Discord);
+            break;
+
         default:
             message.channel.send("Command not found :/");
     }
 });
 
 
-Bot.login(process.env.DISCORD_TOKEN);
+client.login(process.env.DISCORD_TOKEN);