From 3125654ddec13de0385e6997c43fb26620044825 Mon Sep 17 00:00:00 2001
From: 3urobeat <35304405+HerrEurobeat@users.noreply.github.com>
Date: Tue, 11 Aug 2020 12:15:32 +0200
Subject: [PATCH] Version 2.8.1 (read commit description)

Added whatsnew message to update confirmation. Bot should now be able to change the terminal title on Linux. Added quotes multi-line support. Added more default quotes. Added status codes to all webserver responses. Corrected proxyShift behaviour. A private profile check error won't stop the comment process anymore. Fixed wrong proxy number when logging in with proxy x message.
---
 quotes.txt        | 25 ++++++++++++++++---------
 src/bot.js        | 44 ++++++++++++++++++++++----------------------
 src/controller.js | 27 +++++++++++++++------------
 src/data.json     |  4 ++--
 src/updater.js    |  1 +
 5 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/quotes.txt b/quotes.txt
index 4af73802..f5911dcf 100644
--- a/quotes.txt
+++ b/quotes.txt
@@ -22,16 +22,23 @@ Have a lovely week
 Your profile looks really good!
 Nice profile!
 +rep great profile
-What did the late tomato say to the early tomato? I’ll ketch up
-What do you call a fish with no eyes? A fsh.
-What did the dog say to the two trees? Bark bark.
-Shout out to my grandma, that's the only way she can hear.
 What's blue and not very heavy?  Light blue.
 Why did Sweden start painting barcodes on the sides of their battleships? So they could Scandinavian.
-What do you call a guy lying on your doorstep? Matt.
-What do you call someone with no nose? Nobody knows.
 What do you call a dictionary on drugs? High definition.
-To be Frank, I'd have to change my name.
-Want to hear a joke about construction? Nah, I'm still working on it.
 I'm not that good at jokes so I'm just gonna wish you a nice day!
-+rep ʕっ•ᴥ•ʔっ°
\ No newline at end of file
++rep ʕっ•ᴥ•ʔっ°
+𝓗𝓪𝓿𝓮 𝓪 𝓵𝓸𝓿𝓮𝓵𝔂 𝓭𝓪𝔂 💖
+𝓗𝓪𝓿𝓮 𝓪 𝓷𝓲𝓬𝓮 𝓭𝓪𝔂 ❤️
++rep friendly :) 
+Nice to meet you! <3
++rep good teammate
++rep
+Nice to play with
++rep global elite 2
+Sick looking profile you got there
+(⌐■_■)
+(☞ﾟヮﾟ)☞ ☜(ﾟヮﾟ☜)
+Enjoy the day! ^_^
++rep always learning new things
++rep cs:go god
+╔═╗\n║╦╬═╦╦╦═╦╦╗\n║╩╣║║╠╣█║║║\n╚═╩╩╦╝╠═╬╗║\n────╚═╝─╚═╝\n╔═╦╗──────\n╚╗║╠═╦╦╦╦╗\n╔╩╗║█║║║╔╝\n╚══╩═╩═╩╝─\n╔╦═╦╗───╔╗\n║║║║╠═╦═╣╠╗\n║║║║║╩╣╩╣═╣\n╚═╩═╩═╩═╩╩╝
\ No newline at end of file
diff --git a/src/bot.js b/src/bot.js
index 8687bd05..f4f2f36b 100644
--- a/src/bot.js
+++ b/src/bot.js
@@ -28,8 +28,8 @@ module.exports.run = async (logOnOptions, loginindex) => {
 
   //Get proxy of this bot account
   if (controller.proxyShift >= controller.proxies.length) controller.proxyShift = 0; //reset proxy counter
-  controller.proxyShift++ //switch to next proxy
   var thisproxy = controller.proxies[controller.proxyShift]
+  controller.proxyShift++ //switch to next proxy
 
   const bot = new SteamUser({ httpProxy: thisproxy });
   const community = new SteamCommunity();
@@ -80,7 +80,7 @@ module.exports.run = async (logOnOptions, loginindex) => {
       clearInterval(loggedininterval) //stop interval
       controller.accisloggedin = false; //set to false again
       if (thisproxy == null) logger(`[${thisbot}] Trying to log in without proxy...`, false, true)
-        else logger(`[${thisbot}] Trying to log in with proxy ${controller.proxyShift}...`, false, true)
+        else logger(`[${thisbot}] Trying to log in with proxy ${controller.proxyShift - 1}...`, false, true)
       bot.logOn(logOnOptions)
     }
   }, 250);
@@ -182,10 +182,10 @@ module.exports.run = async (logOnOptions, loginindex) => {
       commentcmd = function commentcmd(steamID, args, res) {
         var requesterSteamID = new SteamID(String(steamID)).getSteamID64() //save steamID of comment requesting user so that messages are being send to the requesting user and not to the reciever if a profileid has been provided
 
-        function respondmethod(msg) { //we need a function to get each response back to the user (web request & steam chat)
+        function respondmethod(rescode, msg) { //we need a function to get each response back to the user (web request & steam chat)
           if (res) {
             logger("Web Comment Request response: " + msg)
-            res.send(msg + "</br></br>The log will contain further information and errors (if one should occur). You can display it by visiting: /output")
+            res.status(rescode).send(msg + "</br></br>The log will contain further information and errors (if one should occur). You can display it by visiting: /output")
           } else {
             bot.chat.sendFriendMessage(requesterSteamID, msg)
           } }
@@ -195,13 +195,13 @@ module.exports.run = async (logOnOptions, loginindex) => {
 
         /* --------- Check for cmd spamming --------- */
         if (Date.now() - lastcommentrequestmsg[requesterSteamID] < 2500) {
-          return bot.chat.sendFriendMessage(steamID, "Please don't spam this command.") }
+          return respondmethod(403, "Please don't spam this command.") }
 
         lastcommentrequestmsg[requesterSteamID] = Date.now()
 
         /* --------- Check for disabled comment cmd or if update is queued --------- */
-        if (updater.activeupdate) return respondmethod("The bot is currently waiting for the last requested comment to be finished in order to download an update!\nPlease wait a moment and try again.");
-        if (config.allowcommentcmdusage === false && !config.ownerid.includes(steam64id)) return respondmethod("The bot owner set this command to owners only.\nType !owner to get information who the owner is.\nType !about to get a link to the bot creator.") 
+        if (updater.activeupdate) return respondmethod(403, "The bot is currently waiting for the last requested comment to be finished in order to download an update!\nPlease wait a moment and try again.");
+        if (config.allowcommentcmdusage === false && !config.ownerid.includes(steam64id)) return respondmethod(403, "The bot owner set this command to owners only.\nType !owner to get information who the owner is.\nType !about to get a link to the bot creator.") 
 
 
         /* --------- Define command usage messages for each user's priviliges --------- */ //Note: Web Comment Requests always use config.ownerid[0]
@@ -222,11 +222,11 @@ module.exports.run = async (logOnOptions, loginindex) => {
             if (remainingcooldown > 120) { var remainingcooldown = remainingcooldown / 60; var remainingcooldownunit = "minutes" }
             if (remainingcooldown > 120) { var remainingcooldown = remainingcooldown / 60; var remainingcooldownunit = "hours" }
 
-            respondmethod(`You requested a comment in the last ${config.commentcooldown} minutes. Please wait the remaining ${controller.round(remainingcooldown, 2)} ${remainingcooldownunit}.`) //send error message
+            respondmethod(403, `You requested a comment in the last ${config.commentcooldown} minutes. Please wait the remaining ${controller.round(remainingcooldown, 2)} ${remainingcooldownunit}.`) //send error message
             return; }
           } else {
             if (controller.activecommentprocess.indexOf(String(steam64id)) !== -1) { //is the user already getting comments? (-1 means not included)
-              return respondmethod("You are currently recieving previously requested comments. Please wait for them to be completed.") }}
+              return respondmethod(403, "You are currently recieving previously requested comments. Please wait for them to be completed.") }}
 
         if (config.globalcommentcooldown != 0) { //check for global cooldown
           if ((Date.now() - commentedrecently) < config.globalcommentcooldown) { 
@@ -235,7 +235,7 @@ module.exports.run = async (logOnOptions, loginindex) => {
             if (remainingglobalcooldown > 120) { var remainingglobalcooldown = remainingglobalcooldown / 60; var remainingglobalcooldownunit = "minutes" }
             if (remainingglobalcooldown > 120) { var remainingglobalcooldown = remainingglobalcooldown / 60; var remainingglobalcooldownunit = "hours" }
 
-            respondmethod(`Someone else requested a comment in the last ${controller.round(remainingglobalcooldown, 2)} ${remainingglobalcooldownunit} or a cooldown error occurred. Please wait a moment before trying again.`) //send error message
+            respondmethod(403, `Someone else requested a comment in the last ${controller.round(remainingglobalcooldown, 2)} ${remainingglobalcooldownunit} or a cooldown error occurred. Please wait a moment before trying again.`) //send error message
             return; }}
 
         /* --------- Check numberofcomments argument if it was provided --------- */
@@ -244,12 +244,12 @@ module.exports.run = async (logOnOptions, loginindex) => {
             if (args[0].toLowerCase() == "all") {
               args[0] = Object.keys(controller.communityobject).length * config.repeatedComments //replace the argument with the max amount of comments
             } else {
-              return respondmethod(`This is not a valid number!\nCommand usage: ${commentcmdusage}`) 
+              return respondmethod(400, `This is not a valid number!\nCommand usage: ${commentcmdusage}`) 
             }
           }
 
           if (args[0] > Object.keys(controller.communityobject).length * config.repeatedComments) { //number is greater than accounts * repeatedComments?
-            return respondmethod(`You can request max. ${Object.keys(controller.communityobject).length * config.repeatedComments} comments.\nCommand usage: ${commentcmdusage}`) }
+            return respondmethod(403, `You can request max. ${Object.keys(controller.communityobject).length * config.repeatedComments} comments.\nCommand usage: ${commentcmdusage}`) }
           var numberofcomments = args[0]
 
           //Code by: https://github.com/HerrEurobeat/ 
@@ -258,19 +258,19 @@ module.exports.run = async (logOnOptions, loginindex) => {
           /* --------- Check profileid argument if it was provided --------- */
           if (args[1] !== undefined) {
             if (config.ownerid.includes(new SteamID(String(steamID)).getSteamID64()) || args[1] == new SteamID(String(steamID)).getSteamID64()) { //check if user is a bot owner or if he provided his own profile id
-              if (isNaN(args[1])) return respondmethod(`This is not a valid profileid! A profile id must look like this: 76561198260031749\nCommand usage: ${commentcmdusage}`)
-              if (new SteamID(args[1]).isValid() == false) return respondmethod(`This is not a valid profileid! A profile id must look like this: 76561198260031749\nCommand usage: ${commentcmdusage}`)
+              if (isNaN(args[1])) return respondmethod(400, `This is not a valid profileid! A profile id must look like this: 76561198260031749\nCommand usage: ${commentcmdusage}`)
+              if (new SteamID(args[1]).isValid() == false) return respondmethod(400, `This is not a valid profileid! A profile id must look like this: 76561198260031749\nCommand usage: ${commentcmdusage}`)
 
               steamID.accountid = parseInt(new SteamID(args[1]).accountid) //edit accountid value of steamID parameter of friendMessage event and replace requester's accountid with the new one
             } else {
-              respondmethod("Specifying a profileid is only allowed for bot owners.\nIf you are a bot owner, make sure you added your ownerid to the config.json.")
+              respondmethod(403, "Specifying a profileid is only allowed for bot owners.\nIf you are a bot owner, make sure you added your ownerid to the config.json.")
               return; }} } //arg[0] if statement ends here
 
 
         /* --------- Check if user did not provide numberofcomments --------- */
         if (numberofcomments === undefined) { //no numberofcomments given? ask again
           if (Object.keys(controller.botobject).length == 1 && config.repeatedComments == 1) { var numberofcomments = 1 } else { //if only one account is active, set 1 automatically
-            respondmethod(`Please specify how many comments out of ${Object.keys(controller.communityobject).length * config.repeatedComments} you would like to request.\nCommand usage: ${commentcmdusage}`)
+            respondmethod(400, `Please specify how many comments out of ${Object.keys(controller.communityobject).length * config.repeatedComments} you would like to request.\nCommand usage: ${commentcmdusage}`)
             return; }}
 
 
@@ -288,12 +288,12 @@ module.exports.run = async (logOnOptions, loginindex) => {
 
 
           if (Number(i) + 1 == numberofcomments && accstoadd[requesterSteamID].length > 0 || Number(i) + 1 == Object.keys(controller.botobject).length && accstoadd[requesterSteamID].length > 0) {
-            respondmethod(`In order to request ${numberofcomments} comments you/the recieving user will first need to add this/these accounts: (limited bot accounts)\n` + accstoadd[requesterSteamID])
+            respondmethod(403, `In order to request ${numberofcomments} comments you/the recieving user will first need to add this/these accounts: (limited bot accounts)\n` + accstoadd[requesterSteamID])
             return; } } //stop right here criminal
 
         community.getSteamUser(steamID, (err, user) => { //check if profile is private
-          if (err) return logger(`[${thisbot}] comment check for private account error: ${err}`)
-          if (user.privacyState != "public") return respondmethod("Your/the recieving profile seems to be private. Please edit your/the privacy settings on your/the recieving profile and try again!")
+          if (err) logger(`[${thisbot}] comment check for private account error: ${err}\nTrying to comment anyway and hoping no error occurs...`)
+          if (user.privacyState != "public") return respondmethod(403, "Your/the recieving profile seems to be private. Please edit your/the privacy settings on your/the recieving profile and try again!")
 
           /* --------- Actually start the commenting process --------- */
           var randomstring = arr => arr[Math.floor(Math.random() * arr.length)]; 
@@ -301,20 +301,20 @@ module.exports.run = async (logOnOptions, loginindex) => {
 
           community.postUserComment(steamID, comment, (error) => { //post comment
             if(error) {
-              respondmethod(`Oops, an error occurred! Details: \n[${thisbot}] postUserComment error: ${error}\nPlease try again in a moment!`); 
+              respondmethod(500, `Oops, an error occurred! Details: \n[${thisbot}] postUserComment error: ${error}\nPlease try again in a moment!`); 
               logger(`[${thisbot}] postUserComment error: ${error}`); 
 
               if (error == "Error: HTTP error 429" || error == "Error: You've been posting too frequently, and can't make another post right now") commentedrecently = Date.now() + 300000 //add 5 minutes to commentedrecently if cooldown error
               return; }
 
             logger(`\x1b[32m[${thisbot}] ${numberofcomments} Comment(s) requested. Comment on ${steam64id}: ${comment}\x1b[0m`)
-            if (numberofcomments == 1) respondmethod('Okay I commented on your/the recieving profile! If you are a nice person then leave a +rep on my profile!')
+            if (numberofcomments == 1) respondmethod(200, 'Okay I commented on your/the recieving profile! If you are a nice person then leave a +rep on my profile!')
               else {
                 var waittime = ((numberofcomments - 1) * config.commentdelay) / 1000 //calculate estimated wait time (first comment is instant -> remove 1 from numberofcomments)
                 var waittimeunit = "seconds"
                 if (waittime > 120) { var waittime = waittime / 60; var waittimeunit = "minutes" }
                 if (waittime > 120) { var waittime = waittime / 60; var waittimeunit = "hours" }
-                respondmethod(`Estimated wait time for ${numberofcomments} comments: ${Number(Math.round(waittime+'e'+3)+'e-'+3)} ${waittimeunit}.`)
+                respondmethod(200, `Estimated wait time for ${numberofcomments} comments: ${Number(Math.round(waittime+'e'+3)+'e-'+3)} ${waittimeunit}.`)
 
                 controller.commenteverywhere(steamID, numberofcomments, requesterSteamID, res) } //Let all other accounts comment
 
diff --git a/src/controller.js b/src/controller.js
index 42767091..f8434b09 100644
--- a/src/controller.js
+++ b/src/controller.js
@@ -15,16 +15,16 @@ var logininfo = require('../logininfo.json');
 var config = require('../config.json');
 var extdata = require('./data.json');
 
-var communityobject = new Object();
-var botobject = new Object();
-var readyafterlogs = new Array();
-var failedcomments = new Array();
-var accstoadd = new Array();
+var communityobject = {}
+var botobject = {}
+var readyafterlogs = []
+var failedcomments = []
+var accstoadd = []
 var bootstart = 0
 var bootstart = new Date();
 var steamGuardInputTime = 0
 var readyafter = 0
-var activecommentprocess = new Array();
+var activecommentprocess = []
 var logindelay = 2500
 var proxyShift = 0
 skippednow = [] //array to track which accounts have been skipped
@@ -33,7 +33,8 @@ stoplogin = false;
 if (process.platform == "win32") { //set node process name to find it in task manager etc.
     process.title = `${extdata.mestr}'s Steam Comment Service Bot v${extdata.version} | ${process.platform}` //Windows allows long terminal/process names
 } else {
-    process.title = `CommentBot` } //Linux has a length limit of 10
+    process.title = `CommentBot` //sets process title in task manager etc.
+    process.stdout.write(`${String.fromCharCode(27)}]0;${extdata.mestr}'s Steam Comment Service Bot v${extdata.version} | ${process.platform}${String.fromCharCode(7)}`) } //sets terminal title (thanks: https://stackoverflow.com/a/30360821/12934162)
 
 /* ------------ Functions: ------------ */
 var logger = (str, nodate, remove) => { //Custom logger
@@ -61,9 +62,10 @@ var steamGuardInputTimeFunc = (arg) => { steamGuardInputTime += arg } //small fu
 process.on('unhandledRejection', (reason, p) => {
     logger(`Unhandled Rejection Error! Reason: ${reason.stack}`, true) });
 
-var quotes = new Array();
-var quotes = fs.readFileSync('quotes.txt', 'utf8').split("\n"); //get all quotes from the quotes.txt file into an array
+var quotes = []
+var quotes = fs.readFileSync('quotes.txt', 'utf8').split("\n") //get all quotes from the quotes.txt file into an array
 var quotes = quotes.filter(str => str != "") //remove empty quotes as empty comments will not work/make no sense
+quotes.forEach((e, i) => { quotes[i] = e.replace(/\\n/g, "\n").replace("\\n", "\n") }) //mult line strings that contain \n will get splitted to \\n -> remove second \ so that node-steamcommunity understands the quote when commenting
 
 //Please don't change this message as it gives credit to me; the person who put really much of his free time into this project. The bot will still refer to you - the operator of this instance.
 if (config.owner.length > 1) var ownertext = config.owner; else var ownertext = "anonymous (no owner link provided)"; 
@@ -548,18 +550,18 @@ var readyinterval = setInterval(() => { //log startup to console
             var app = express()
             
             app.get('/', (req, res) => {
-                res.send("<title>Comment Bot Web Request</title><b>3urobeat's Comment Bot | Comment Web Request</b></br>Please use /comment?n=123&id=123&key=123 to request n comments on id profile with your secret key.</br>If you forgot your secret key you can see it in your 'data.json' file in the 'src' folder.</br></br>Visit /output to see the complete output.txt in your browser!</b></br></br>https://github.com/HerrEurobeat/steam-comment-service-bot") })
+                res.status(200).send("<title>Comment Bot Web Request</title><b>3urobeat's Comment Bot | Comment Web Request</b></br>Please use /comment?n=123&id=123&key=123 to request n comments on id profile with your secret key.</br>If you forgot your secret key you can see it in your 'data.json' file in the 'src' folder.</br></br>Visit /output to see the complete output.txt in your browser!</b></br></br>https://github.com/HerrEurobeat/steam-comment-service-bot") })
             
             app.get('/comment', (req, res) => {
                 logger("Web Comment Request recieved by: " + req.ip)
             
                 if (req.query.n == undefined) {
                     logger("Web Request denied. Reason: numberofcomments (n) is not specified.")
-                    return res.send("You have to provide an amount of comments.</br>Usage: /comment?n=123&id=123&key=123 to request n comments on id profile with your secret key.</br>If you forgot your secret key you can see it in your 'data.json' file in the 'src' folder.") }
+                    return res.status(400).send("You have to provide an amount of comments.</br>Usage: /comment?n=123&id=123&key=123 to request n comments on id profile with your secret key.</br>If you forgot your secret key you can see it in your 'data.json' file in the 'src' folder.") }
             
                 if (req.query.id == undefined) {
                     logger("Web Request denied. Reason: Steam profileid (id) is not specified.")
-                    return res.send("You have to provide a profile id where I should comment.</br>Usage: /comment?n=123&id=123&key=123 to request n comments on id profile with your secret key.</br>If you forgot your secret key you can see it in your 'data.json' file in the 'src' folder.") }
+                    return res.status(400).send("You have to provide a profile id where I should comment.</br>Usage: /comment?n=123&id=123&key=123 to request n comments on id profile with your secret key.</br>If you forgot your secret key you can see it in your 'data.json' file in the 'src' folder.") }
             
                 if (req.query.key == undefined || req.query.key != extdata.urlrequestsecretkey) {
                     logger("Web Request denied. Reason: Invalid secret key.")
@@ -578,6 +580,7 @@ var readyinterval = setInterval(() => { //log startup to console
                     if(err) logger("urltocomment: error reading output.txt: " + err)
                 
                     res.write(String(data))
+                    res.status(200)
                     res.end()
                 }) })
             
diff --git a/src/data.json b/src/data.json
index 228a7950..417407f9 100644
--- a/src/data.json
+++ b/src/data.json
@@ -1,5 +1,5 @@
 {
-    "version": "2.8",
+    "version": "2.8.1",
     "branch": "master",
     "filetostart": "./src/updater.js",
     "filetostarturl": "https://raw.githubusercontent.com/HerrEurobeat/steam-comment-service-bot/master/src/updater.js",
@@ -8,7 +8,7 @@
     "aboutstr": "This bot was created by 3urobeat.\nGitHub: https://github.com/HerrEurobeat/steam-comment-service-bot \nSteam: https://steamcommunity.com/id/3urobeat \nIf you like my work, any donation would be appreciated! https://paypal.me/3urobeat",
     "firststart": true,
     "compatibilityfeaturedone": false,
-    "whatsnew": "Added proxy support. Added webserver to request comments with URL. Fixed a lot of bugs and made other changes. (see more on GitHub)",
+    "whatsnew": "Added multi-line support for quotes. Added more default quotes. Fixed a few bugs (see GitHub commit description for more detail).",
     "urlrequestsecretkey": "",
     "timesloggedin": 0,
     "totallogintime": 0
diff --git a/src/updater.js b/src/updater.js
index a9ad7a0f..74dad752 100644
--- a/src/updater.js
+++ b/src/updater.js
@@ -61,6 +61,7 @@ var checkforupdate = (forceupdate, responseSteamID, compatibilityfeaturedone) =>
                         startupdate();
                     } else { //user has it disabled, ask for confirmation
                         if (botisloggedin == false || responseSteamID) { //only ask on start, otherwise this will annoy the user
+                            logger(`What's new: ${JSON.parse(chunk).whatsnew}\n`, true)
                             process.stdout.write(`You have disabled the automatic updater.\nWould you like to update now? [y/n] `)
                             var stdin = process.openStdin();