🔀 Merge branch 'dev'

Author: Vivien Mouret

.gitattributes

@@ -1 +1,4 @@
 *.csv filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.gif filter=lfs diff=lfs merge=lfs -text
+*.webp filter=lfs diff=lfs merge=lfs -text

README.md

@@ -28,6 +28,63 @@ npm install
 node main.js
 ```
 
+### Petit plus
+  
+Voici un petit lien [trello](https://trello.com/b/kdy25wXP/daftbot-mobbot) afin de suivre l'avancée des bots
+
+  
+## Prerequisites
+
+- Token of your Discord bot
+- Token of your Twitch bot (optional)
+- Nodejs and npm
+
+## Usage
+
+After cloning the repo, simply go to the root of the project and copy the `config.json.example` file to `config.json` and put in your secret discord bot token and the prefix you will use. 
+  
+You can then run the following commands:
+  
+```bash
+# To install the necessary packages
+npm install
+
+# To launch the bot
+node main.js
+```
+
+### Little extra
+  
+Here is a small link [trello](https://trello.com/b/kdy25wXP/daftbot-mobbot) to follow the progress of the bots
+
+### Petit plus
+  
+Voici un petit lien [trello](https://trello.com/b/kdy25wXP/daftbot-mobbot) afin de suivre l'avancée des bots
+
+  
+## Prerequisites
+
+- Token of your Discord bot
+- Token of your Twitch bot (optional)
+- Nodejs and npm
+
+## Usage
+
+After cloning the repo, simply go to the root of the project and copy the `config.json.example` file to `config.json` and put in your secret discord bot token and the prefix you will use. 
+  
+You can then run the following commands:
+  
+```bash
+# To install the necessary packages
+npm install
+
+# To launch the bot
+node main.js
+```
+
+### Little extra
+  
+Here is a small link [trello](https://trello.com/b/kdy25wXP/daftbot-mobbot) to follow the progress of the bots
 ## Prerequisites
 
 - Token of your Discord bot

appdata/command.js

@@ -16,8 +16,9 @@ module.exports = {
         description: 'a dynamic tchat',
         args: true,
         execute(message, args) {
-            var sayMessage = args.join(" ");
-            message.delete().catch(O_o => { })
+            var sayMessage = args.args.join(' ');
+
+            message.delete().catch(O_o => { });
             message.channel.send(sayMessage);
         }
     },
@@ -26,27 +27,28 @@ module.exports = {
         description: 'a dynamic prune',
         args: true,
         execute(message, args) {
-            if (message.author.id === owner) return message.channel.send(args.languageChoosen.restricted); // TODO: check this out
+            if (message.author.id === owner) return message.channel.send(args.language.restricted); // TODO: check this out
 
             var amount = parseInt(args.args[0]);
+
             if (isNaN(amount)) {
-                message.reply(args.languageChoosen.pruneInvalid);
+                message.reply(args.language.pruneInvalid);
             } else if (amount > 0 && amount < 101) {
                 message.channel.bulkDelete(amount, true).catch(err => {
                     console.error(err);
-                    message.channel.send(args.languageChoosen.pruneError);
+                    message.channel.send(args.language.pruneError);
                 });
             } else {
-                message.reply(args.languageChoosen.pruneOut);
+                message.reply(args.language.pruneOut);
             };
         }
     },
     ping: {
         name: 'ping',
         description: 'a dynamic ping',
         async execute(message, args) {
-            const wait = await message.channel.send(args.languageChoosen.pingWait);
-            wait.edit(`Bip. ${args.languageChoosen.pingEdit} ${wait.createdTimestamp - message.createdTimestamp}ms.. Bip Boup..`);
+            const wait = await message.channel.send(args.language.pingWait);
+            wait.edit(`Bip. ${args.language.pingEdit} ${wait.createdTimestamp - message.createdTimestamp}ms.. Bip Boup..`);
         }
     }
 };

appdata/openai.js

@@ -0,0 +1,27 @@
+'use.strict'
+
+const config = require("../config.json"),
+    { Configuration, OpenAIApi } = require("openai"),
+    configuration = new Configuration({ apiKey: config.openAI }),
+    openaiAPI = new OpenAIApi(configuration);
+
+module.exports = {
+    openai: {
+        name: 'openai',
+        description: 'a dynamic tchat bot from openai',
+        execute(message) {
+            const completion = openaiAPI.createCompletion({
+                model: "text-davinci-003",
+                prompt: message.content,
+                max_tokens: 1024,
+                n: 1,
+                stop: undefined,
+                temperature: 0.9
+            });
+
+            completion.then((result) => {
+                message.reply(result.data.choices[0].text);
+            });
+        }
+    }
+};

appdata/reply.js

@@ -8,7 +8,7 @@ module.exports = {
         description: 'a dynamic reply',
         execute(message, args) {
             let reply = new EmbedBuilder()
-                .setDescription(args.languageChoosen.replyBot)
+                .setDescription(args.language.replyBot)
                 .setImage('https://i.skyrock.net/7297/93457297/pics/3273728730_1_2_yrHEcA4w.gif');
 
             message.channel.send({ embeds: [reply] });
@@ -18,7 +18,7 @@ module.exports = {
         name: 'hahaha',
         description: 'a dynamic reply',
         execute(message, args) {
-            message.channel.send(args.languageChoosen.replyAgg);
+            message.channel.send(args.language.replyAgg);
         }
     },
     no: {
@@ -47,7 +47,7 @@ module.exports = {
         name: 'tqt',
         description: 'a dynamic reply',
         execute(message, args) {
-            message.reply(args.languageChoosen.replyWorried);
+            message.reply(args.language.replyWorried);
         }
     }
 };

config.json.example

@@ -1,5 +1,6 @@
 { 
-    "prefix" : "!",
-    "token"  : "YOUR-TOKEN-HERE",
-    "owner" : "your_discord_id"
+    "prefix" : "YOUR_PREFIX_HERE",
+    "token"  : "YOUR_TOKEN_HERE",
+    "owner" : "YOUR_DISCORD_HERE",
+    "openAI" : "YOUR_OPENAI_API_KEY_HERE",
 }