Merge pull request #7 from MatteZ02/master

Base to Fork

commands/play.js

@@ -1,4 +1,5 @@
 const YouTube = require("simple-youtube-api");
+const he = require('he');
 
 module.exports = {
 	name: 'play',
@@ -42,7 +43,7 @@ module.exports = {
 					let index = 0;
 					const embed = new Discord.RichEmbed()
 						.setTitle("__Song Selection__")
-						.setDescription(`${videos.map(video2 => `**${++index}** ${video2.title} `).join('\n')}`)
+						.setDescription(`${videos.map(video2 => `**${++index}** ${he.decode(video2.title)} `).join('\n')}`)
 						.setFooter("Please provide a number ranging from 1-10 to select one of the search results.")
 						.setColor("#b50002")
 					message.channel.send(embed);
@@ -54,16 +55,16 @@ module.exports = {
 						});
 					} catch (err) {
 						console.error(err);
-						return message.channel.send(':x: Cancelling video selection or no results.');
+						return message.channel.send(':x: Cancelling video selection');
 					}
 					const videoIndex = parseInt(response.first().content);
 					var video = await youtube.getVideoByID(videos[videoIndex - 1].id);
 				} catch (err) {
 					console.error(err);
-					return message.channel.send(':x: Cancelling video selection or no results');
+					return message.channel.send(':x: I could not obtain any search results!');
 				}
 			}
 			return client.funcs.handleVideo(video, message, voiceChannel, client, false);
 		}
 	}
-};
+};

package-lock.json

@@ -861,6 +861,14 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "ffmpeg": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/ffmpeg/-/ffmpeg-0.0.4.tgz",
+      "integrity": "sha1-HEYN+OfaUSf2LO70v6BsWciWMMs=",
+      "requires": {
+        "when": ">= 0.0.1"
+      }
+    },
     "firebase": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/firebase/-/firebase-6.6.0.tgz",
@@ -1554,6 +1562,11 @@
         }
       }
     },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+    },
     "html-entities": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
@@ -2523,6 +2536,11 @@
       "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
       "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
     },
+    "when": {
+      "version": "3.7.8",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
+      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
+    },
     "window-size": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",

package.json

@@ -14,9 +14,11 @@
     "dblapi.js": "^2.3.0",
     "discord.js": "^11.5.1",
     "dotenv": "^8.1.0",
+    "ffmpeg": "0.0.4",
     "firebase": "^6.6.0",
     "firebase-admin": "^8.5.0",
     "fs": "0.0.1-security",
+    "he": "^1.2.0",
     "ms": "^2.1.1",
     "node-opus": "^0.3.2",
     "request": "^2.88.0",