From 3905b7569c53fc8052e8103b7ba97d976db008ae Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:10:13 -0400 Subject: [PATCH 01/14] Added setVolume --- basicBot.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/basicBot.js b/basicBot.js index 0054ea87..a6234d8c 100644 --- a/basicBot.js +++ b/basicBot.js @@ -236,9 +236,9 @@ var botCreatorIDs = ["3851534", "4105209"]; var basicBot = { - version: "2.8.17", + version: "1.0.1", status: false, - name: "basicBot", + name: "Plexius", loggedInID: null, scriptLink: "https://rawgit.com/basicBot/source/master/basicBot.js", cmdLink: "http://git.io/245Ppg", @@ -248,7 +248,7 @@ retrieveSettings: retrieveSettings, retrieveFromStorage: retrieveFromStorage, settings: { - botName: "basicBot", + botName: "Plexius", language: "english", chatLink: "https://rawgit.com/basicBot/source/master/lang/en.json", scriptLink: "https://rawgit.com/basicBot/source/master/basicBot.js", @@ -1422,7 +1422,7 @@ basicBot.loggedInID = API.getUser().id; basicBot.status = true; API.sendChat('/cap ' + basicBot.settings.startupCap); - API.setVolume(basicBot.settings.startupVolume); + API.setVolume(34); if (basicBot.settings.autowoot) { $("#woot").click(); } @@ -1442,6 +1442,7 @@ } API.chatLog('Avatars capped at ' + basicBot.settings.startupCap); API.chatLog('Volume set to ' + basicBot.settings.startupVolume); + API.chatLog('OVERRIDE: Volume has been set to 34%, as set by "API.setVolume" integer.') //socket(); loadChat(API.sendChat(subChat(basicBot.chat.online, {botname: basicBot.settings.botName, version: basicBot.version}))); }, From 53cdc348bdb9b084abcb2611562c9e1e5672b670 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:11:28 -0400 Subject: [PATCH 02/14] from basicBot to Plexius --- basicBot.js => Plexius.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename basicBot.js => Plexius.js (100%) diff --git a/basicBot.js b/Plexius.js similarity index 100% rename from basicBot.js rename to Plexius.js From 0a42ca2cfb37324ca253dcb496f57096c6e0f2c5 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:13:51 -0400 Subject: [PATCH 03/14] Update README.md --- README.md | 69 ++++--------------------------------------------------- 1 file changed, 4 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index afeea0c1..b53e3cf7 100644 --- a/README.md +++ b/README.md @@ -1,75 +1,14 @@ -# basicBot (source) - -[![Slack](https://basicbot.herokuapp.com/badge.svg)](https://basicbot.herokuapp.com/) [![facebook group](https://img.shields.io/badge/facebook-group-3b5998.svg?style=flat)](https://facebook.com/groups/basicBot) [![twitter](https://img.shields.io/twitter/follow/bscbt.svg?style=social)](https://twitter.com/bscbt) - - +# Plexius Usage ----- Bookmark the following code. To run the bot, run the bookmark. -`javascript:(function(){$.getScript('https://rawgit.com/basicBot/source/master/basicBot.js');})();` +`javascript:(function(){$.getScript('https://rawgit.com/plexius/source/master/Plexius.js');})();` -If this does not work, go to https://raw.githubusercontent.com/basicBot/source/master/basicBot.js and copy paste its content into your console (accessible in chrome by pressing F12) when on plug.dj in your community. +If this does not work, go to https://raw.githubusercontent.com/plexius/source/master/Plexius.js and copy paste its content into your console (accessible in chrome by pressing F12) when on plug.dj in your community. Commands -------- -These can be found in [the commands file](https://github.com/basicBot/source/blob/master/commands.md). - - -Blacklists ----------- -Examples of blacklists can be found in [the customization repository](https://github.com/basicBot/custom/tree/master/blacklists). -You can add blacklists in the settings of the bot via the methods given in that same repository. See below for more information. - - -Extending functionality and custom default settings ---------------------------------------------------- -basicBot can be customized to fit your needs. Please refer to [the customization repository](https://github.com/basicBot/custom) for more info. -Please do not try to if you are not confident in your javascript capabilities. - - -basicBot Chrome Extension -------------------------- -[Get the Official basicBot Chrome Extension](https://chrome.google.com/webstore/detail/basicbot/bjinmbkeneigmkkkpcmcokphbjkepeie) - - -Developers ----------- - - [Benzi](https://github.com/Benzi) __(Maintainer)__ - - -Credits --------- - -I would like to thank the following people: - -- Fungus: His Tastybot has been a source of inspiration for most of the features, and his help with coding problems has been invaluable to make this bot. -- TAT, Origin and other Litebot contributors: Their Litebot has inspired features like Roulette. -- Henchman: Never knew this undertaking would give me a friend too. - -|Language | Translator| -|:------:|:---------:| -|Portuguese|[Motel Bible](https://github.com/motelbible)| -|French|[NDA](https://github.com/NDAthereal)| - -__I would also like to thank everyone who contributed in translating the bot via the [translation centre](https://basicbot.oneskyapp.com/admin/collaborators)__ - - -### Copyright - -Copyright © 2014-2016 basicBot - -Modifications (including forks) of the code to fit personal needs are allowed only for personal use and should refer back to the original source. -This software is not for profit, any extension, or unauthorised person providing this software is not authorised to be in a position of any monetary gain from this use of this software. Any and all money gained under the use of the software (which includes donations) must be passed on to the original author. - - -Disclaimer ----------- +These can be found in [the commands file](https://github.com/plexius/source/blob/master/commands.md). -This bot is developed independently. Changes may be made without notice. There is no guarantee for the bot to be functioning perfectly. -plug.dj admins have the right to request changes. -By using this chatbot you agree to not use it for violating plug.dj's Terms of Service. -You also agree not to alter the bot's code, unless in the cases explicitly stated above, for personal use, or for the sole purpose of submitting a pull request with a bug fix or a feature update, at which point it will be looked at and decided by the authors of the project. -Please refer to the original author/repository at all times, even on personal forks that are not private. -Any requests for changes can be requested via email, through github or via plug.dj. From a008bc846c099d23d3d06b0ddb1d3c320b4edf91 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:15:32 -0400 Subject: [PATCH 04/14] Added pemissions. --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index a6234d8c..78f27576 100644 --- a/Plexius.js +++ b/Plexius.js @@ -1345,7 +1345,7 @@ return 'Function.' }; var u = API.getUser(); - if (basicBot.userUtilities.getPermission(u) < 2) return API.chatLog(basicBot.chat.greyuser); + if (basicBot.userUtilities.getPermission(u) < 0) return API.chatLog(basicBot.chat.greyuser); if (basicBot.userUtilities.getPermission(u) === 2) API.chatLog(basicBot.chat.bouncer); basicBot.connectAPI(); API.moderateDeleteChat = function (cid) { From 8832ce8a6e2ee861c2643af27a09543ed6fead6b Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:17:37 -0400 Subject: [PATCH 05/14] 0 --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index 78f27576..cdeea241 100644 --- a/Plexius.js +++ b/Plexius.js @@ -1346,7 +1346,7 @@ }; var u = API.getUser(); if (basicBot.userUtilities.getPermission(u) < 0) return API.chatLog(basicBot.chat.greyuser); - if (basicBot.userUtilities.getPermission(u) === 2) API.chatLog(basicBot.chat.bouncer); + if (basicBot.userUtilities.getPermission(u) === 0) API.chatLog(basicBot.chat.bouncer); basicBot.connectAPI(); API.moderateDeleteChat = function (cid) { $.ajax({ From f655ce97ad05c24cc77fb4d7bbd64497960322e4 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:19:44 -0400 Subject: [PATCH 06/14] 22222 pls --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index cdeea241..78f27576 100644 --- a/Plexius.js +++ b/Plexius.js @@ -1346,7 +1346,7 @@ }; var u = API.getUser(); if (basicBot.userUtilities.getPermission(u) < 0) return API.chatLog(basicBot.chat.greyuser); - if (basicBot.userUtilities.getPermission(u) === 0) API.chatLog(basicBot.chat.bouncer); + if (basicBot.userUtilities.getPermission(u) === 2) API.chatLog(basicBot.chat.bouncer); basicBot.connectAPI(); API.moderateDeleteChat = function (cid) { $.ajax({ From da5d55b1b661c6e3d627d52e9b18be91e0d231e7 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:25:38 -0400 Subject: [PATCH 07/14] Yes --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index 78f27576..d350b9dd 100644 --- a/Plexius.js +++ b/Plexius.js @@ -2984,7 +2984,7 @@ var woots = basicBot.room.roomstats.totalWoots; var mehs = basicBot.room.roomstats.totalMehs; var grabs = basicBot.room.roomstats.totalCurates; - API.sendChat(subChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs})); + API.sendChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs}); } } }, From 90f9e059f8993c512bf7a4407f354113cf1dbad6 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:26:38 -0400 Subject: [PATCH 08/14] Revert "Yes" This reverts commit da5d55b1b661c6e3d627d52e9b18be91e0d231e7. --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index d350b9dd..78f27576 100644 --- a/Plexius.js +++ b/Plexius.js @@ -2984,7 +2984,7 @@ var woots = basicBot.room.roomstats.totalWoots; var mehs = basicBot.room.roomstats.totalMehs; var grabs = basicBot.room.roomstats.totalCurates; - API.sendChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs}); + API.sendChat(subChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs})); } } }, From 9bf8d36fc5dbdf785d6b7f092a6549278108b1e3 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:27:47 -0400 Subject: [PATCH 09/14] ??? --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index 78f27576..d350b9dd 100644 --- a/Plexius.js +++ b/Plexius.js @@ -2984,7 +2984,7 @@ var woots = basicBot.room.roomstats.totalWoots; var mehs = basicBot.room.roomstats.totalMehs; var grabs = basicBot.room.roomstats.totalCurates; - API.sendChat(subChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs})); + API.sendChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs}); } } }, From 05261b307dbdc12e3898103c221bbc7ea6587293 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:32:46 -0400 Subject: [PATCH 10/14] Changed sendChat to chatLog --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index d350b9dd..5e6ea49b 100644 --- a/Plexius.js +++ b/Plexius.js @@ -2984,7 +2984,7 @@ var woots = basicBot.room.roomstats.totalWoots; var mehs = basicBot.room.roomstats.totalMehs; var grabs = basicBot.room.roomstats.totalCurates; - API.sendChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs}); + API.chatLog(subChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs})); } } }, From 71126a95122fc3b72c5a4b658e189c5383ce625b Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:33:55 -0400 Subject: [PATCH 11/14] oops --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index 5e6ea49b..81532c3a 100644 --- a/Plexius.js +++ b/Plexius.js @@ -2984,7 +2984,7 @@ var woots = basicBot.room.roomstats.totalWoots; var mehs = basicBot.room.roomstats.totalMehs; var grabs = basicBot.room.roomstats.totalCurates; - API.chatLog(subChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs})); + API.chatLog(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs}); } } }, From 86d9ecbd5e0e91609da0af352c06ab4d37274201 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 12:35:16 -0400 Subject: [PATCH 12/14] screw ut --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index 81532c3a..78f27576 100644 --- a/Plexius.js +++ b/Plexius.js @@ -2984,7 +2984,7 @@ var woots = basicBot.room.roomstats.totalWoots; var mehs = basicBot.room.roomstats.totalMehs; var grabs = basicBot.room.roomstats.totalCurates; - API.chatLog(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs}); + API.sendChat(subChat(basicBot.chat.sessionstats, {name: from, woots: woots, mehs: mehs, grabs: grabs})); } } }, From 910747f13fd08235aa0d8bff186f54f8fc517e69 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 14:18:04 -0400 Subject: [PATCH 13/14] Stuff --- Plexius.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plexius.js b/Plexius.js index 78f27576..30de916b 100644 --- a/Plexius.js +++ b/Plexius.js @@ -231,8 +231,8 @@ return str; }; - var botCreator = "Yemasthui"; - var botMaintainer = "Benzi" + var botCreator = "WolfiiYT"; + var botMaintainer = "WolfiiYT" var botCreatorIDs = ["3851534", "4105209"]; var basicBot = { @@ -253,7 +253,7 @@ chatLink: "https://rawgit.com/basicBot/source/master/lang/en.json", scriptLink: "https://rawgit.com/basicBot/source/master/basicBot.js", roomLock: false, // Requires an extension to re-load the script - startupCap: 1, // 1-200 + startupCap: 10, // 1-200 startupVolume: 0, // 0-100 startupEmoji: false, // true or false autowoot: true, From 769fabdc396d5a9817fa3ac6d2cb05bd2cfc2626 Mon Sep 17 00:00:00 2001 From: plexius Date: Sat, 25 Jun 2016 14:46:34 -0400 Subject: [PATCH 14/14] omg plexius --- Plexius.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plexius.js b/Plexius.js index 30de916b..1e4cbd2d 100644 --- a/Plexius.js +++ b/Plexius.js @@ -236,7 +236,7 @@ var botCreatorIDs = ["3851534", "4105209"]; var basicBot = { - version: "1.0.1", + version: "1.0.4", status: false, name: "Plexius", loggedInID: null,