From f0454fbbfb6a4dbaf9cfef1de980efa106cb6134 Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 22:12:03 -0400 Subject: [PATCH 01/19] Add post check for channel postings --- bot/modules/releasenotes.js | 204 ++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 2fafa08..669ac31 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -5,111 +5,111 @@ let inPrivate = require('../helpers.js').inPrivate; let ChannelID = config.get('gitrelease').channel; exports.commands = [ - 'releasenotes' // command that is in this file, every command needs it own export as shown below + 'releasenotes' // command that is in this file, every command needs it own export as shown below ]; exports.releasenotes = { - usage: '', - description: 'gets current release notes from GitHub, for either Desktop or Android', - process: function(bot, msg, suffix) { - let releaseType = suffix.toLowerCase(); - let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); - if (releaseType !== 'android' && releaseType !== 'desktop') { - msg.reply('Please specify which release notes to display: "desktop" or "android".'); - return; - } - const headers = { - 'Content-Type': 'application/json', - 'User-Agent': 'Super Agent/0.0.1' - }; - // Configure the request - const options = { - url: 'https://api.github.com/repos/lbryio/lbry-' + releaseType + '/releases/latest', - method: 'GET', - headers: headers - }; - // Start the request - let message; - request(options, function(error, response, body) { - let json = JSON.parse(body); - let releasemessage = json.body; - let releasename = json.name || json.tag_name; - let releasedate = json.published_at; - let releaseurl = json.html_url; - if (releasemessage.length < 2000) { - message = { - embed: { - title: '*Download ' + releasename + ' here!*', - description: releasemessage.replace('###', ''), - url: releaseurl, - color: 7976557, - timestamp: releasedate, - author: { - name: 'LBRY ' + releaseTypeName + ' release notes for ' + releasename, - icon_url: 'https://spee.ch/b/Github-PNG-Image.png' - }, - footer: { - icon_url: 'https://spee.ch/2/pinkylbryheart.png', - text: 'LBRY ' + releaseTypeName + ' updated ' - } - } + usage: '', + description: 'gets current release notes from GitHub, for either Desktop or Android', + process: function(bot, msg, suffix) { + let releaseType = suffix.toLowerCase(); + let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); + if (releaseType !== 'android' && releaseType !== 'desktop') { + msg.reply('Please specify which release notes to display: "desktop" or "android".'); + return; + } + const headers = { + 'Content-Type': 'application/json', + 'User-Agent': 'Super Agent/0.0.1' }; - if (inPrivate(msg)) { - msg.channel.send(message); - return; - } - if (hasPerms(msg) && suffix === 'post') { - bot.channels.get(ChannelID).send(message); - } else { - msg.channel.send(msg.author + ' Release notes sent via DM'); - msg.author.send(message); - } - } else { - message = releasemessage - .trim() - .split('###') - .filter(function(n) { - return n !== ''; - }); - let embedmessages = []; - for (let i = 0; i < message.length; i++) { - if (message[i]) { - embedmessages.push({ - embed: { - description: message[i], - url: releaseurl, - color: 7976557, - timestamp: releasedate, - author: { - name: 'LBRY ' + releaseTypeName + ' release notes for ' + releasename, - icon_url: 'https://spee.ch/b/Github-PNG-Image.png' - }, - footer: { - icon_url: 'https://spee.ch/2/pinkylbryheart.png', - text: 'LBRY ' + releaseTypeName + ' updated ' + // Configure the request + const options = { + url: 'https://api.github.com/repos/lbryio/lbry-' + releaseType + '/releases/latest', + method: 'GET', + headers: headers + }; + // Start the request + let message; + request(options, function(error, response, body) { + let json = JSON.parse(body); + let releasemessage = json.body; + let releasename = json.name || json.tag_name; + let releasedate = json.published_at; + let releaseurl = json.html_url; + if (releasemessage.length < 2000) { + message = { + embed: { + title: '*Download ' + releasename + ' here!*', + description: releasemessage.replace('###', ''), + url: releaseurl, + color: 7976557, + timestamp: releasedate, + author: { + name: 'LBRY ' + releaseTypeName + ' release notes for ' + releasename, + icon_url: 'https://spee.ch/b/Github-PNG-Image.png' + }, + footer: { + icon_url: 'https://spee.ch/2/pinkylbryheart.png', + text: 'LBRY ' + releaseTypeName + ' updated ' + } + } + }; + if (inPrivate(msg)) { + msg.channel.send(message); + return; } - } - }); - if (i === 0) embedmessages[i].embed.title = '*Download ' + releasename + ' here!*'; - } - } - if (inPrivate(msg)) { - for (let i = 0; i < embedmessages.length; i++) { - msg.channel.send(embedmessages[i]); - } - return; - } - if (hasPerms(msg) && suffix === 'post') { - for (let i = 0; i < embedmessages.length; i++) { - bot.channels.get(ChannelID).send(embedmessages[i]); - } - } else { - msg.channel.send(msg.author + ' Release notes sent via DM'); - for (let i = 0; i < embedmessages.length; i++) { - msg.author.send(embedmessages[i]); - } - } - } - }); - } + if (hasPerms(msg) && suffix === ' android post' || 'desktop post') { + bot.channels.get(ChannelID).send(message); + } else { + msg.channel.send(msg.author + ' Release notes sent via DM'); + msg.author.send(message); + } + } else { + message = releasemessage + .trim() + .split('###') + .filter(function(n) { + return n !== ''; + }); + let embedmessages = []; + for (let i = 0; i < message.length; i++) { + if (message[i]) { + embedmessages.push({ + embed: { + description: message[i], + url: releaseurl, + color: 7976557, + timestamp: releasedate, + author: { + name: 'LBRY ' + releaseTypeName + ' release notes for ' + releasename, + icon_url: 'https://spee.ch/b/Github-PNG-Image.png' + }, + footer: { + icon_url: 'https://spee.ch/2/pinkylbryheart.png', + text: 'LBRY ' + releaseTypeName + ' updated ' + } + } + }); + if (i === 0) embedmessages[i].embed.title = '*Download ' + releasename + ' here!*'; + } + } + if (inPrivate(msg)) { + for (let i = 0; i < embedmessages.length; i++) { + msg.channel.send(embedmessages[i]); + } + return; + } + if (hasPerms(msg) && suffix === 'android post' || 'desktop post') { + for (let i = 0; i < embedmessages.length; i++) { + bot.channels.get(ChannelID).send(embedmessages[i]); + } + } else { + msg.channel.send(msg.author + ' Release notes sent via DM'); + for (let i = 0; i < embedmessages.length; i++) { + msg.author.send(embedmessages[i]); + } + } + } + }); + } }; From e37c4fcf2e5b1879236bde3a1230c68a3b8adaf5 Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 23:02:37 -0400 Subject: [PATCH 02/19] Update releasenotes.js --- bot/modules/releasenotes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 669ac31..bbef3f6 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -58,7 +58,7 @@ exports.releasenotes = { msg.channel.send(message); return; } - if (hasPerms(msg) && suffix === ' android post' || 'desktop post') { + if (hasPerms(msg) && suffix === releaseTypeName + ' post') { bot.channels.get(ChannelID).send(message); } else { msg.channel.send(msg.author + ' Release notes sent via DM'); @@ -99,7 +99,7 @@ exports.releasenotes = { } return; } - if (hasPerms(msg) && suffix === 'android post' || 'desktop post') { + if (hasPerms(msg) && suffix === releaseTypeName + ' post') { for (let i = 0; i < embedmessages.length; i++) { bot.channels.get(ChannelID).send(embedmessages[i]); } From 6dbddb68cf0234e725effe24196a56f41df8ed07 Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 23:12:31 -0400 Subject: [PATCH 03/19] Update releasenotes.js --- bot/modules/releasenotes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index bbef3f6..d25aca9 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -14,7 +14,7 @@ exports.releasenotes = { process: function(bot, msg, suffix) { let releaseType = suffix.toLowerCase(); let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); - if (releaseType !== 'android' && releaseType !== 'desktop') { + if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'android push' && releaseType !== 'desktop push') { msg.reply('Please specify which release notes to display: "desktop" or "android".'); return; } From bfd7569c5659e098519de1011bafef86a61d7fb2 Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 23:13:58 -0400 Subject: [PATCH 04/19] Update releasenotes.js --- bot/modules/releasenotes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index d25aca9..7b30af1 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -14,7 +14,7 @@ exports.releasenotes = { process: function(bot, msg, suffix) { let releaseType = suffix.toLowerCase(); let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); - if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'android push' && releaseType !== 'desktop push') { + if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'android post' && releaseType !== 'desktop post') { msg.reply('Please specify which release notes to display: "desktop" or "android".'); return; } From 205428f371bec560f2437782df1874f5f8a082c7 Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 23:18:13 -0400 Subject: [PATCH 05/19] Update releasenotes.js --- bot/modules/releasenotes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 7b30af1..2e6acc2 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -24,7 +24,7 @@ exports.releasenotes = { }; // Configure the request const options = { - url: 'https://api.github.com/repos/lbryio/lbry-' + releaseType + '/releases/latest', + url: 'https://api.github.com/repos/lbryio/lbry-' + releaseTypeName + '/releases/latest', method: 'GET', headers: headers }; From 4c01ff50f84fd7a79ccf1a26f690743dbc89975d Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 23:20:58 -0400 Subject: [PATCH 06/19] enable logging --- bot/modules/releasenotes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 2e6acc2..659b64f 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -33,6 +33,7 @@ exports.releasenotes = { request(options, function(error, response, body) { let json = JSON.parse(body); let releasemessage = json.body; + console.log(releasemessage); let releasename = json.name || json.tag_name; let releasedate = json.published_at; let releaseurl = json.html_url; From 933e6be92676f6093155b677309f984846170c79 Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 23:22:37 -0400 Subject: [PATCH 07/19] Update releasenotes.js --- bot/modules/releasenotes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 659b64f..4c3568f 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -24,6 +24,7 @@ exports.releasenotes = { }; // Configure the request const options = { + console.log('Release being sent: ' + releaseTypeName); url: 'https://api.github.com/repos/lbryio/lbry-' + releaseTypeName + '/releases/latest', method: 'GET', headers: headers From 26d554577b689e8813948a268ed53ad850b6034f Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 23:25:03 -0400 Subject: [PATCH 08/19] Update releasenotes.js --- bot/modules/releasenotes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 4c3568f..c18806a 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -23,8 +23,8 @@ exports.releasenotes = { 'User-Agent': 'Super Agent/0.0.1' }; // Configure the request + console.log('Release being sent: ' + releaseTypeName); const options = { - console.log('Release being sent: ' + releaseTypeName); url: 'https://api.github.com/repos/lbryio/lbry-' + releaseTypeName + '/releases/latest', method: 'GET', headers: headers From 18fd37134c197a7dfd5733fc4676c8f248164c79 Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 23:34:03 -0400 Subject: [PATCH 09/19] Update releasenotes.js --- bot/modules/releasenotes.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index c18806a..9404590 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -13,8 +13,8 @@ exports.releasenotes = { description: 'gets current release notes from GitHub, for either Desktop or Android', process: function(bot, msg, suffix) { let releaseType = suffix.toLowerCase(); - let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); - if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'android post' && releaseType !== 'desktop post') { + let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(5); + if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'post android' && releaseType !== 'post desktop') { msg.reply('Please specify which release notes to display: "desktop" or "android".'); return; } @@ -60,7 +60,7 @@ exports.releasenotes = { msg.channel.send(message); return; } - if (hasPerms(msg) && suffix === releaseTypeName + ' post') { + if (hasPerms(msg) && suffix === 'post ' + releaseTypeName) { bot.channels.get(ChannelID).send(message); } else { msg.channel.send(msg.author + ' Release notes sent via DM'); @@ -100,8 +100,8 @@ exports.releasenotes = { msg.channel.send(embedmessages[i]); } return; - } - if (hasPerms(msg) && suffix === releaseTypeName + ' post') { + } + if (hasPerms(msg) && suffix === 'post ' + releaseTypeName) { for (let i = 0; i < embedmessages.length; i++) { bot.channels.get(ChannelID).send(embedmessages[i]); } From ba963844d6dc9bef06b031b2ab298b8d146d804e Mon Sep 17 00:00:00 2001 From: Ralph Date: Thu, 17 Oct 2019 23:37:07 -0400 Subject: [PATCH 10/19] Update releasenotes.js --- bot/modules/releasenotes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 9404590..506d3ab 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -13,7 +13,7 @@ exports.releasenotes = { description: 'gets current release notes from GitHub, for either Desktop or Android', process: function(bot, msg, suffix) { let releaseType = suffix.toLowerCase(); - let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(5); + let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'post android' && releaseType !== 'post desktop') { msg.reply('Please specify which release notes to display: "desktop" or "android".'); return; From e69d4662accf2de093f16aeded496d9b826de79e Mon Sep 17 00:00:00 2001 From: Ralph Date: Fri, 18 Oct 2019 00:10:41 -0400 Subject: [PATCH 11/19] Update releasenotes.js --- bot/modules/releasenotes.js | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 506d3ab..6d83587 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -13,8 +13,13 @@ exports.releasenotes = { description: 'gets current release notes from GitHub, for either Desktop or Android', process: function(bot, msg, suffix) { let releaseType = suffix.toLowerCase(); + let releaseTypePost = null; + if (releaseType === 'android post' || 'desktop post') { + let releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(-5); + break; + } let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); - if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'post android' && releaseType !== 'post desktop') { + if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'android post' && releaseType !== 'desktop post') { msg.reply('Please specify which release notes to display: "desktop" or "android".'); return; } @@ -23,12 +28,20 @@ exports.releasenotes = { 'User-Agent': 'Super Agent/0.0.1' }; // Configure the request - console.log('Release being sent: ' + releaseTypeName); - const options = { - url: 'https://api.github.com/repos/lbryio/lbry-' + releaseTypeName + '/releases/latest', - method: 'GET', - headers: headers - }; + if (releaseTypePost !== null) { + const options = { + url: 'https://api.github.com/repos/lbryio/lbry-' + releaseTypePost + '/releases/latest', + method: 'GET', + headers: headers + }; + } else { + console.log('Release being sent: ' + releaseTypeName); + const options = { + url: 'https://api.github.com/repos/lbryio/lbry-' + releaseTypeName + '/releases/latest', + method: 'GET', + headers: headers + }; + } // Start the request let message; request(options, function(error, response, body) { @@ -47,12 +60,12 @@ exports.releasenotes = { color: 7976557, timestamp: releasedate, author: { - name: 'LBRY ' + releaseTypeName + ' release notes for ' + releasename, + name: 'LBRY ' + releaseType + ' release notes for ' + releasename, icon_url: 'https://spee.ch/b/Github-PNG-Image.png' }, footer: { icon_url: 'https://spee.ch/2/pinkylbryheart.png', - text: 'LBRY ' + releaseTypeName + ' updated ' + text: 'LBRY ' + releaseType + ' updated ' } } }; @@ -60,7 +73,7 @@ exports.releasenotes = { msg.channel.send(message); return; } - if (hasPerms(msg) && suffix === 'post ' + releaseTypeName) { + if (hasPerms(msg) && suffix === releaseTypeName + ' post') { bot.channels.get(ChannelID).send(message); } else { msg.channel.send(msg.author + ' Release notes sent via DM'); @@ -101,7 +114,7 @@ exports.releasenotes = { } return; } - if (hasPerms(msg) && suffix === 'post ' + releaseTypeName) { + if (hasPerms(msg) && suffix === releaseTypeName + ' post') { for (let i = 0; i < embedmessages.length; i++) { bot.channels.get(ChannelID).send(embedmessages[i]); } From 1d6cb510be2569c78e426ff3a879fc15eaab7862 Mon Sep 17 00:00:00 2001 From: Ralph Date: Fri, 18 Oct 2019 00:11:35 -0400 Subject: [PATCH 12/19] Update releasenotes.js --- bot/modules/releasenotes.js | 1 - 1 file changed, 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 6d83587..16a3a64 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -16,7 +16,6 @@ exports.releasenotes = { let releaseTypePost = null; if (releaseType === 'android post' || 'desktop post') { let releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(-5); - break; } let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'android post' && releaseType !== 'desktop post') { From 20cc8528e74fb9e86732167db00d0577c1950162 Mon Sep 17 00:00:00 2001 From: Ralph Date: Fri, 18 Oct 2019 00:27:43 -0400 Subject: [PATCH 13/19] Update releasenotes.js --- bot/modules/releasenotes.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 16a3a64..37f6877 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -27,15 +27,16 @@ exports.releasenotes = { 'User-Agent': 'Super Agent/0.0.1' }; // Configure the request + let options; if (releaseTypePost !== null) { - const options = { + options = { url: 'https://api.github.com/repos/lbryio/lbry-' + releaseTypePost + '/releases/latest', method: 'GET', headers: headers }; } else { console.log('Release being sent: ' + releaseTypeName); - const options = { + options = { url: 'https://api.github.com/repos/lbryio/lbry-' + releaseTypeName + '/releases/latest', method: 'GET', headers: headers From af31eacb8ef5d301ae168b88d76190869a95d4d5 Mon Sep 17 00:00:00 2001 From: Ralph Date: Fri, 18 Oct 2019 00:32:35 -0400 Subject: [PATCH 14/19] Update releasenotes.js --- bot/modules/releasenotes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 37f6877..b79d217 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -15,7 +15,7 @@ exports.releasenotes = { let releaseType = suffix.toLowerCase(); let releaseTypePost = null; if (releaseType === 'android post' || 'desktop post') { - let releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(-5); + releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(-5); } let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'android post' && releaseType !== 'desktop post') { From 4e7625ce6e286af548a8e442d92a5832e17b54ea Mon Sep 17 00:00:00 2001 From: Ralph Date: Fri, 18 Oct 2019 00:33:56 -0400 Subject: [PATCH 15/19] Update releasenotes.js --- bot/modules/releasenotes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index b79d217..04ff01a 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -16,6 +16,7 @@ exports.releasenotes = { let releaseTypePost = null; if (releaseType === 'android post' || 'desktop post') { releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(-5); + console.log('Post message detected ' + releaseTypePost); } let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); if (releaseType !== 'android' && releaseType !== 'desktop' && releaseType !== 'android post' && releaseType !== 'desktop post') { From fa6c92011eb6e749a2574a76a751e7092c9d60c9 Mon Sep 17 00:00:00 2001 From: Ralph Date: Fri, 18 Oct 2019 00:35:12 -0400 Subject: [PATCH 16/19] Update releasenotes.js --- bot/modules/releasenotes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 04ff01a..0535e56 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -15,7 +15,7 @@ exports.releasenotes = { let releaseType = suffix.toLowerCase(); let releaseTypePost = null; if (releaseType === 'android post' || 'desktop post') { - releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(-5); + releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(7); console.log('Post message detected ' + releaseTypePost); } let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); From a645070cdd03a5fd400b0be4aa374a1ed4895d2b Mon Sep 17 00:00:00 2001 From: Ralph Date: Fri, 18 Oct 2019 00:37:00 -0400 Subject: [PATCH 17/19] Update releasenotes.js --- bot/modules/releasenotes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index 0535e56..bda0a24 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -15,7 +15,7 @@ exports.releasenotes = { let releaseType = suffix.toLowerCase(); let releaseTypePost = null; if (releaseType === 'android post' || 'desktop post') { - releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(7); + releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(0,7); console.log('Post message detected ' + releaseTypePost); } let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); From 931bc0af8ed55a66cd3d6aba740bbb1e380c7f8a Mon Sep 17 00:00:00 2001 From: Ralph Date: Fri, 18 Oct 2019 00:38:30 -0400 Subject: [PATCH 18/19] Update releasenotes.js --- bot/modules/releasenotes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index bda0a24..bbe87ce 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -15,7 +15,7 @@ exports.releasenotes = { let releaseType = suffix.toLowerCase(); let releaseTypePost = null; if (releaseType === 'android post' || 'desktop post') { - releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(0,7); + releaseTypePost = releaseType.charAt(0).toUpperCase() + releaseType.slice(1,7); console.log('Post message detected ' + releaseTypePost); } let releaseTypeName = releaseType.charAt(0).toUpperCase() + releaseType.slice(1); From 3e3af97b433ab12b0009908af1aaac6bc971ff8d Mon Sep 17 00:00:00 2001 From: Ralph Date: Fri, 18 Oct 2019 00:45:44 -0400 Subject: [PATCH 19/19] Update releasenotes.js --- bot/modules/releasenotes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/modules/releasenotes.js b/bot/modules/releasenotes.js index bbe87ce..9910046 100644 --- a/bot/modules/releasenotes.js +++ b/bot/modules/releasenotes.js @@ -74,7 +74,7 @@ exports.releasenotes = { msg.channel.send(message); return; } - if (hasPerms(msg) && suffix === releaseTypeName + ' post') { + if (hasPerms(msg) && suffix === 'android post' || 'desktop post') { bot.channels.get(ChannelID).send(message); } else { msg.channel.send(msg.author + ' Release notes sent via DM'); @@ -115,7 +115,7 @@ exports.releasenotes = { } return; } - if (hasPerms(msg) && suffix === releaseTypeName + ' post') { + if (hasPerms(msg) && suffix === 'android post' || 'desktop post') { for (let i = 0; i < embedmessages.length; i++) { bot.channels.get(ChannelID).send(embedmessages[i]); }