Merge branch 'master' of ssh://git.dtam.pw:2022/daniel/discord-bot-js into dalton-testing

This commit is contained in:
Dalton
2018-12-05 19:04:49 -08:00

33
bot.js
View File

@@ -41,7 +41,9 @@ function commandsHelp(requestedCommand) {
"yuru": "[NSFW] **yuri:** Post a picture of yuri (r/yuri)", "yuru": "[NSFW] **yuri:** Post a picture of yuri (r/yuri)",
"neko": "[NSFW] **neko:** Posts a picture of cat girls (r/nekomimi)", "neko": "[NSFW] **neko:** Posts a picture of cat girls (r/nekomimi)",
"pokeporn": "[NSFW] **pokeporn:** Posts a picture of pokemon hentai (r/pokeporn)", "pokeporn": "[NSFW] **pokeporn:** Posts a picture of pokemon hentai (r/pokeporn)",
"hgifs": "[NSFW] **hgifs:** Posts a gif of hentai (r/nsfwanimegifs)"}; "hgifs": "[NSFW] **hgifs:** Posts a gif of hentai (r/nsfwanimegifs)",
"hentaibondage": "[NSFW] **hentaibondage:** Posts a picture of hentai in bondage (r/hentaibondage)"};
if (commands[requestedCommand] === undefined) if (commands[requestedCommand] === undefined)
{ {
return "Command not found, try entering **b.commands** for a full list of commands"; return "Command not found, try entering **b.commands** for a full list of commands";
@@ -376,8 +378,8 @@ client.on('message', message => {
message.channel.send("BunnyBot's source code: https://git.dtam.pw/daniel/discord-bot-js"); message.channel.send("BunnyBot's source code: https://git.dtam.pw/daniel/discord-bot-js");
break; break;
/*case 'testcommand': /*case 'testcommand':
message.channel.send(subredditRequest('Nekomimi', 5)); break;
break;*/ */
// SFW Anime Image commands // SFW Anime Image commands
case 'meirl': case 'meirl':
@@ -396,10 +398,20 @@ client.on('message', message => {
message.channel.send((Math.floor(Math.random() * 2) == 0) ? redditbooruRequest('bishounen') : subredditRequest('bishounen')); message.channel.send((Math.floor(Math.random() * 2) == 0) ? redditbooruRequest('bishounen') : subredditRequest('bishounen'));
break; break;
case 'kgirls': case 'kgirls':
message.channel.send((Math.floor(Math.random() * 2) == 0) ? redditbooruRequest('kpics') : ((Math.floor(Math.random() * 2) == 0) ? imgurRequest('kpics', 5) : subredditRequest('kpopfap'))); var availableRequests = [
redditbooruRequest('kpics'),
imgurRequest('kpics', 5),
subredditRequest('kpopfap')
];
message.channel.send(availableRequests[Math.floor(Math.random() * availableRequests.length)]);
break; break;
case 'kboys': case 'kboys':
message.channel.send((Math.floor(Math.random() * 2) == 0) ? imgurRequest('kfanservice',1) : ((Math.floor(Math.random() * 2) == 0) ? imgurRequest('kpecs',1) : imgurRequest('cutekboys', 1))); var availableRequests = [
imgurRequest('kfanservice',1),
imgurRequest('kpecs',1),
imgurRequest('cutekboys', 1)
];
message.channel.send(availableRequests[Math.floor(Math.random() * availableRequests.length)]);
break; break;
// NSFW // NSFW
@@ -407,7 +419,13 @@ client.on('message', message => {
message.channel.send(redditbooruRequest('pantsu')); message.channel.send(redditbooruRequest('pantsu'));
break; break;
case 'ecchi': case 'ecchi':
message.channel.send((Math.floor(Math.random() * 2) == 0) ? subredditRequest('ecchi') : ((Math.floor(Math.random() * 2) == 0) ? redditbooruRequest('ecchi') : ((Math.floor(Math.random() * 2) == 0) ? redditbooruRequest('Sukebei') : imgurRequest('ecchi', 5)))); var availableRequests = [
subredditRequest('ecchi'),
redditbooruRequest('ecchi'),
redditbooruRequest('Sukebei'),
imgurRequest('ecchi', 5)
];
message.channel.send(availableRequests[Math.floor(Math.random() * availableRequests.length)]);
break; break;
case 'hentai': case 'hentai':
message.channel.send((Math.floor(Math.random() * 2) == 0) ? imgurRequest('hentai', 5) : subredditRequest('hentai', 5)); message.channel.send((Math.floor(Math.random() * 2) == 0) ? imgurRequest('hentai', 5) : subredditRequest('hentai', 5));
@@ -427,6 +445,9 @@ client.on('message', message => {
case 'hgifs': case 'hgifs':
message.channel.send(subredditRequest('nsfwanimegifs', 5)); message.channel.send(subredditRequest('nsfwanimegifs', 5));
break; break;
case 'hentaibondage':
message.channel.send((Math.floor(Math.random() * 2) == 0) ? subredditRequest('hentaibondage') : imgurRequest('hentaibondage', 5));
break;
// Voice commands // Voice commands
case 'join': case 'join':