From 20fdf7139faa61c2113f74fcb3a1eca70a836440 Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 12:14:26 -0700 Subject: [PATCH 01/16] fix speech bot crashing issue --- bot/modules/speech.js | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/bot/modules/speech.js b/bot/modules/speech.js index 2696f28..3c129ff 100644 --- a/bot/modules/speech.js +++ b/bot/modules/speech.js @@ -6,7 +6,7 @@ var fs = require('fs') //some have more info on file details of error var FullDebug = "true" //outputs response from speech, very bulk reply -var ResponseDebug = "true" +var ResponseDebug = "false" exports.commands = [ @@ -18,7 +18,7 @@ exports.speech = { description: "gets top claim from spee.ch, coming soon post to spee.ch", process: function(bot,msg,suffix){ - var ChannelID = "363085078403874823" + var ChannelID = "373251793498406912" var command = "!speech" words = suffix.trim().split(' ').filter( function(n){return n !== "";} ); @@ -80,12 +80,10 @@ exports.speech = { var message = '`error not a valid url, please start with http or https`' console.log('invalid url provided: ' + filepath); msg.channel.send(message); - doHelp(bot,msg,suffix); return } else { var message = '`error not a valid url, please start with http or https`' msg.channel.send(message); - doHelp(bot,msg,suffix); return; }} @@ -113,13 +111,11 @@ if (isUriImage(url) === false) { var message = '`error not a valid image url, be sure the link includes a file type`' console.log('invalid url provided: ' + url); msg.channel.send(message); - doHelp(bot,msg,suffix); - return; + return } else { var message = '`error not a valid image url, be sure the link includes a file type`' msg.channel.send(message); - doHelp(bot,msg,suffix); - return; + return } } //set third word to nsfw, with it being an optional functionality @@ -173,7 +169,7 @@ function doHelp(bot,msg,suffix) { "description": '**!speech ``** : *displays top claim on speech* \n\n\n' + "**COMING SOON POSTING TO SPEECH** \n\n" + '**!speech ` `** : *Uploads Image URL to Spee.ch* \n' + - '**NOTE : dont include spaces in name (NSFW is optional true/false, if left blank will default to false)** \n' + + '**NOTE : dont include spaces in name (NSFW is optional true/false, if left blank will defualt to false)** \n' + 'EXAMPLE : `!speech my-image-name https://url/to/image.png false`', "color": 7976557, "author": { @@ -206,11 +202,11 @@ request.post( if (body.message === "no files found in request") { if (FullDebug === "true") { console.log("no file found: " + fullpath); - var message = '`Failed to upload file internally!!`\n please contact @MSFTserver#2901 or another moderator if the issue persists'; + var message = '`Failed to upload file internally!!`\n please contact <@244245498746241025> or another moderator if the issue persists'; msg.channel.send(message); return } else { - var message = '`Failed to upload file internally!!`\n please contact @MSFTserver#2901 or another moderator if the issue persists'; + var message = '`Failed to upload file internally!!`\n please contact <@244245498746241025> or another moderator if the issue persists'; msg.channel.send(message); return } @@ -220,11 +216,11 @@ request.post( if (body.message === "no name field found in request") { if (FullDebug === "true") { console.log("no name field found: " + imagename); - var message = '`Failed to upload file internally!!`\n please contact @MSFTserver#2901 or another moderator if the issue persists'; + var message = '`Failed to upload file internally!!`\n please contact <#244245498746241025> or another moderator if the issue persists'; msg.channel.send(message); return } else { - var message = '`Failed to upload file internally!!`\n please contact @MSFTserver#2901 or another moderator if the issue persists'; + var message = '`Failed to upload file internally!!`\n please contact <#244245498746241025> or another moderator if the issue persists'; msg.channel.send(message); return } From 3c2efb4b8c15a0cc4b55f48834b866301beed1f2 Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 12:15:16 -0700 Subject: [PATCH 02/16] fix channel id --- bot/modules/speech.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/speech.js b/bot/modules/speech.js index 3c129ff..d3f55b6 100644 --- a/bot/modules/speech.js +++ b/bot/modules/speech.js @@ -18,7 +18,7 @@ exports.speech = { description: "gets top claim from spee.ch, coming soon post to spee.ch", process: function(bot,msg,suffix){ - var ChannelID = "373251793498406912" + var ChannelID = "363085078403874823" var command = "!speech" words = suffix.trim().split(' ').filter( function(n){return n !== "";} ); From 51333e30d581f343e9f1db59299b064417c46dfd Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 12:16:01 -0700 Subject: [PATCH 03/16] fix spelling mistake --- bot/modules/speech.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/speech.js b/bot/modules/speech.js index d3f55b6..9edc8b2 100644 --- a/bot/modules/speech.js +++ b/bot/modules/speech.js @@ -169,7 +169,7 @@ function doHelp(bot,msg,suffix) { "description": '**!speech ``** : *displays top claim on speech* \n\n\n' + "**COMING SOON POSTING TO SPEECH** \n\n" + '**!speech ` `** : *Uploads Image URL to Spee.ch* \n' + - '**NOTE : dont include spaces in name (NSFW is optional true/false, if left blank will defualt to false)** \n' + + '**NOTE : dont include spaces in name (NSFW is optional true/false, if left blank will default to false)** \n' + 'EXAMPLE : `!speech my-image-name https://url/to/image.png false`', "color": 7976557, "author": { From d87936379b766ad8f7db0961d4c68c83139799a0 Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 12:32:29 -0700 Subject: [PATCH 04/16] update bot to work in multiple channels added to work in channels: #speech, #design, #meme, #random, #random-nsfw, #bot-sandbox --- bot/modules/speech.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bot/modules/speech.js b/bot/modules/speech.js index 9edc8b2..d988c55 100644 --- a/bot/modules/speech.js +++ b/bot/modules/speech.js @@ -18,7 +18,12 @@ exports.speech = { description: "gets top claim from spee.ch, coming soon post to spee.ch", process: function(bot,msg,suffix){ - var ChannelID = "363085078403874823" + var ChannelID1 = "363085078403874823" + var ChannelID2 = "363086945976320010" + var ChannelID3 = "363088045366312962" + var ChannelID4 = "363084262028607488" + var ChannelID5 = "369896313082478594" + var ChannelID6 = "363084227518136322" var command = "!speech" words = suffix.trim().split(' ').filter( function(n){return n !== "";} ); @@ -239,7 +244,7 @@ request.post( }; function inPrivateOrBotSandbox(msg){ - if((msg.channel.type == 'dm') || (msg.channel.id === ChannelID)){ + if((msg.channel.type == 'dm') || (msg.channel.id === ChannelID1) || (msg.channel.id === ChannelID2) || (msg.channel.id === ChannelID3) || (msg.channel.id === ChannelID4) || (msg.channel.id === ChannelID5) || (msg.channel.id === ChannelID6)){ return true; }else{ return false; From e9a398f7213c019fdaaac222ef2eea6d8c5d69fc Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 12:45:08 -0700 Subject: [PATCH 05/16] uploads folder --- speech-uploads/uploads.folder.intial.post.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 speech-uploads/uploads.folder.intial.post.txt diff --git a/speech-uploads/uploads.folder.intial.post.txt b/speech-uploads/uploads.folder.intial.post.txt new file mode 100644 index 0000000..e69de29 From aeba21d40ed522a126e6d75c52c7847b3ec3b790 Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 12:45:30 -0700 Subject: [PATCH 06/16] delete file --- speech-uploads/uploads.folder.intial.post.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 speech-uploads/uploads.folder.intial.post.txt diff --git a/speech-uploads/uploads.folder.intial.post.txt b/speech-uploads/uploads.folder.intial.post.txt deleted file mode 100644 index e69de29..0000000 From 32ab70491350bca07720e7e042b8746990eb5ffa Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 12:47:10 -0700 Subject: [PATCH 07/16] upload speech-uploads folder --- speech-uploads/lbry-heart-v7.png | Bin 0 -> 37598 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 speech-uploads/lbry-heart-v7.png diff --git a/speech-uploads/lbry-heart-v7.png b/speech-uploads/lbry-heart-v7.png new file mode 100644 index 0000000000000000000000000000000000000000..99a6d72d4c5dafadc4f49e6472c3a13f97c6af05 GIT binary patch literal 37598 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≪EmwNsGgkW`gX>=a{39$G=@J6ouy% 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 Date: Fri, 27 Oct 2017 13:55:49 -0700 Subject: [PATCH 08/16] Update speech.js --- bot/modules/speech.js | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/bot/modules/speech.js b/bot/modules/speech.js index d988c55..a3b84fc 100644 --- a/bot/modules/speech.js +++ b/bot/modules/speech.js @@ -1,6 +1,7 @@ var request = require('request'); var wget = require('wget'); var fs = require('fs') +let hasSpeechChannels = require('../helpers.js').hasSpeechChannels; //debug output "true/false" outputs same error as slack message in console if set to true //if set to false console will be left blank like normal //some have more info on file details of error @@ -17,22 +18,13 @@ exports.speech = { usage: "", description: "gets top claim from spee.ch, coming soon post to spee.ch", process: function(bot,msg,suffix){ - - var ChannelID1 = "363085078403874823" - var ChannelID2 = "363086945976320010" - var ChannelID3 = "363088045366312962" - var ChannelID4 = "363084262028607488" - var ChannelID5 = "369896313082478594" - var ChannelID6 = "363084227518136322" - - var command = "!speech" - words = suffix.trim().split(' ').filter( function(n){return n !== "";} ); - var imagename = words[0]; - - if(!inPrivateOrBotSandbox(msg)){ + if(hasSpeechChannels(msg) === false){ msg.channel.send('Please use <#' + ChannelID + '> or DMs to talk to speech bot.'); return; } + var command = "!speech" + words = suffix.trim().split(' ').filter( function(n){return n !== "";} ); + var imagename = words[0]; //check if image name is help, if it is then do help message if (imagename == "help") { @@ -242,14 +234,6 @@ request.post( } ); }; - -function inPrivateOrBotSandbox(msg){ - if((msg.channel.type == 'dm') || (msg.channel.id === ChannelID1) || (msg.channel.id === ChannelID2) || (msg.channel.id === ChannelID3) || (msg.channel.id === ChannelID4) || (msg.channel.id === ChannelID5) || (msg.channel.id === ChannelID6)){ - return true; - }else{ - return false; - } -} } } From 841c974dba10d4bb93201e7584a105c44c4185bd Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 13:56:11 -0700 Subject: [PATCH 09/16] Update helpers.js --- bot/helpers.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bot/helpers.js b/bot/helpers.js index e631e62..a3aba00 100644 --- a/bot/helpers.js +++ b/bot/helpers.js @@ -8,4 +8,12 @@ if(message.member.roles.some(r=>permRanks.perms.includes(r.name)) ) { } else { return false; } -} \ No newline at end of file +} + +exports.hasSpeechChannels = function(msg){ +if(msg.channel.id.some(r=>speechChannels.channelsIDs.includes(r.id)) ) { + return true; +} else { + return false; +} +} From 10f2cbcfea973e0ec2f6213fb3b4ed39e524d277 Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 13:56:25 -0700 Subject: [PATCH 10/16] Update default.json.example --- config/default.json.example | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/default.json.example b/config/default.json.example index c5d4fb5..ee183b6 100644 --- a/config/default.json.example +++ b/config/default.json.example @@ -17,4 +17,7 @@ "perms": ["LBRY MODS","LBRY TEAM"], // Roles that have access to all commands. "logchannel": "371620338263523328" // Channel to log the bots moderation.. } -} \ No newline at end of file + "speechbot":{ + channelIDs: ["363085078403874823","363086945976320010","363088045366312962","363084262028607488","369896313082478594","363084227518136322"] + } +} From 0b5fedf8f7cbb87644b109817696d18425f8a4ee Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 14:03:00 -0700 Subject: [PATCH 11/16] Update helpers.js --- bot/helpers.js | 1 + 1 file changed, 1 insertion(+) diff --git a/bot/helpers.js b/bot/helpers.js index a3aba00..35a79c8 100644 --- a/bot/helpers.js +++ b/bot/helpers.js @@ -1,5 +1,6 @@ let config = require('config'); let permRanks = config.get('moderation'); +let speechChannels = config.get('speech'); // Checks if user is allowed to use a command only for mods/team members exports.hasPerms = function(msg){ From 8cf5b30549e1464d5e42931d2a82145f62cf3665 Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 14:36:07 -0700 Subject: [PATCH 12/16] Update helpers.js --- bot/helpers.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bot/helpers.js b/bot/helpers.js index 35a79c8..80d1a92 100644 --- a/bot/helpers.js +++ b/bot/helpers.js @@ -1,10 +1,10 @@ let config = require('config'); let permRanks = config.get('moderation'); -let speechChannels = config.get('speech'); +let speechChannels = config.get('speechbot'); // Checks if user is allowed to use a command only for mods/team members exports.hasPerms = function(msg){ -if(message.member.roles.some(r=>permRanks.perms.includes(r.name)) ) { +if(msg.member.roles.some(r=>permRanks.perms.includes(r.name)) ) { return true; } else { return false; @@ -12,7 +12,9 @@ if(message.member.roles.some(r=>permRanks.perms.includes(r.name)) ) { } exports.hasSpeechChannels = function(msg){ -if(msg.channel.id.some(r=>speechChannels.channelsIDs.includes(r.id)) ) { +console.log(msg.channel.id) +console.log(msg) +if(speechChannels.channelsIDs.includes(msg.channel.id) ) { return true; } else { return false; From c5e52fb356acb5308986d5013a26985eea7e3429 Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 14:36:25 -0700 Subject: [PATCH 13/16] Update speech.js --- bot/modules/speech.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bot/modules/speech.js b/bot/modules/speech.js index a3b84fc..36bba00 100644 --- a/bot/modules/speech.js +++ b/bot/modules/speech.js @@ -18,14 +18,19 @@ exports.speech = { usage: "", description: "gets top claim from spee.ch, coming soon post to spee.ch", process: function(bot,msg,suffix){ - if(hasSpeechChannels(msg) === false){ + var ChannelID = "373251793498406912" + if(hasSpeechChannels(msg) === false){ msg.channel.send('Please use <#' + ChannelID + '> or DMs to talk to speech bot.'); return; } + + var command = "!speech" words = suffix.trim().split(' ').filter( function(n){return n !== "";} ); var imagename = words[0]; + + //check if image name is help, if it is then do help message if (imagename == "help") { doHelp(bot,msg,suffix) @@ -166,7 +171,7 @@ function doHelp(bot,msg,suffix) { "description": '**!speech ``** : *displays top claim on speech* \n\n\n' + "**COMING SOON POSTING TO SPEECH** \n\n" + '**!speech ` `** : *Uploads Image URL to Spee.ch* \n' + - '**NOTE : dont include spaces in name (NSFW is optional true/false, if left blank will default to false)** \n' + + '**NOTE : dont include spaces in name (NSFW is optional true/false, if left blank will defualt to false)** \n' + 'EXAMPLE : `!speech my-image-name https://url/to/image.png false`', "color": 7976557, "author": { From ba9e95945ce156afe0b2020ac9b7f2894684b16e Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 14:37:16 -0700 Subject: [PATCH 14/16] Update default.json.example --- config/default.json.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/default.json.example b/config/default.json.example index ee183b6..d895bb8 100644 --- a/config/default.json.example +++ b/config/default.json.example @@ -16,8 +16,8 @@ "moderation":{ "perms": ["LBRY MODS","LBRY TEAM"], // Roles that have access to all commands. "logchannel": "371620338263523328" // Channel to log the bots moderation.. - } - "speechbot":{ - channelIDs: ["363085078403874823","363086945976320010","363088045366312962","363084262028607488","369896313082478594","363084227518136322"] + }, + "speechbot":{ + "channelIDs": ["363085078403874823","363086945976320010","363088045366312962","363084262028607488","369896313082478594","363084227518136322"] } } From 13b67c5fac9012a38170033a5f6cf34f34fcd6b9 Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 27 Oct 2017 14:38:46 -0700 Subject: [PATCH 15/16] Update speech.js --- bot/modules/speech.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/speech.js b/bot/modules/speech.js index 36bba00..2461b02 100644 --- a/bot/modules/speech.js +++ b/bot/modules/speech.js @@ -19,7 +19,7 @@ exports.speech = { description: "gets top claim from spee.ch, coming soon post to spee.ch", process: function(bot,msg,suffix){ var ChannelID = "373251793498406912" - if(hasSpeechChannels(msg) === false){ + if(!hasSpeechChannels(msg)){ msg.channel.send('Please use <#' + ChannelID + '> or DMs to talk to speech bot.'); return; } From 9891dbf7c994254a7fccd9202d18196a5a8d9040 Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Sat, 28 Oct 2017 14:47:46 -0700 Subject: [PATCH 16/16] Update speech.js --- bot/modules/speech.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bot/modules/speech.js b/bot/modules/speech.js index 2461b02..6abfa68 100644 --- a/bot/modules/speech.js +++ b/bot/modules/speech.js @@ -19,10 +19,10 @@ exports.speech = { description: "gets top claim from spee.ch, coming soon post to spee.ch", process: function(bot,msg,suffix){ var ChannelID = "373251793498406912" - if(!hasSpeechChannels(msg)){ - msg.channel.send('Please use <#' + ChannelID + '> or DMs to talk to speech bot.'); - return; - } + if(!hasSpeechChannels(msg) && !inPrivate(msg)){ + msg.channel.send('Please use <#' + ChannelID + '> or DMs to talk to speech bot.'); + return; + } var command = "!speech"