Skip to content

Commit 41fd33e

Browse files
xDefconxDefcon
committed
Merge remote-tracking branch 'origin/master'
2 parents 45314dc + 141781c commit 41fd33e

File tree

3 files changed

+83
-53
lines changed

3 files changed

+83
-53
lines changed

‎scripts/animatedChannel.js‎

Lines changed: 66 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
registerPlugin({
2323
name: 'Animated Channel',
24-
version: '1.0',
24+
version: '2.0beta',
2525
description: 'This scripts allows you to have a custom animated channel name/description, ',
2626
author: 'Luigi M. - xDefcon (luigi@xdefcon.com)',
2727
vars: {
@@ -35,18 +35,26 @@ registerPlugin({
3535
title: "Name/Desc changer delay [milliseconds]",
3636
type: "number",
3737
placeholder: "Change name/description every... (Default: 1000ms)."
38-
}, animatedChannel: {
39-
title: "Channel that will be AnImAtEd!",
40-
type: "channel",
41-
placeholder: "Select a channel where you want to kick some fun in :)"
42-
}, customNames: {
43-
title: "Channel names list",
44-
type: "string",
45-
placeholder: "A comma separated list of channel names (e.g: CHANNEL 1, CHANNEL 2, CHANNEL 3)."
46-
}, customDescs: {
47-
title: "Channel descriptions list",
48-
type: "string",
49-
placeholder: "A comma separated list of channel descriptions (e.g: [IMG]link[/IMG],[IMG]link2[/IMG],text3)."
38+
}, animatedChannels: {
39+
title: "Channels that will be AnImAtEd!",
40+
type: "array",
41+
vars: [{
42+
name: 'channel',
43+
indent: 1,
44+
title: 'Channel to be animated',
45+
type: 'channel'
46+
}, {
47+
name: 'names',
48+
indent: 1,
49+
title: 'A comma separated list of channel names (e.g: CHANNEL 1, CHANNEL 2, CHANNEL 3).',
50+
type: 'string'
51+
}, {
52+
name: 'descs',
53+
indent: 1,
54+
title: 'A comma separated list of channel descriptions (e.g: [IMG]link[/IMG],[IMG]link2[/IMG],text3).',
55+
type: 'string'
56+
}],
57+
placeholder: "Select the channels where you want to kick some fun in :)"
5058
}, adminUUID: {
5159
title: "Command admin UUIDs",
5260
type: "string",
@@ -59,9 +67,14 @@ registerPlugin({
5967
var engine = require("engine");
6068
var event = require("event");
6169
var backend = require("backend");
62-
var minimumDelay = 100, i = 0, j = 0, chanObj = backend.getChannelByID(config.animatedChannel), initialChanName = chanObj.name();
63-
70+
var minimumDelay = 100, i = 0, j = 0;
6471
var adminUUID = [];
72+
var chanObj = [];
73+
var initialChanName = [];
74+
for (var k = 0; k < config.animatedChannels.length; k++) {
75+
chanObj[k] = backend.getChannelByID(config.animatedChannels[k].channel);
76+
initialChanName[k] = chanObj[k].name();
77+
}
6578

6679
if (typeof config.enableSwitch == "undefined") {
6780
config.enableSwitch = false;
@@ -89,7 +102,7 @@ registerPlugin({
89102
} else {
90103
debug("Name/Desc changer delay set to " + config.delayTime + ".");
91104
}
92-
if (typeof config.customNames == config.customDescs == "undefined") {
105+
if (typeof config.animatedChannels == "undefined") {
93106
debug("[WARN] In order to run the script, please fill channel names or channel descriptions list. SCRIPT STOPPED.");
94107
return;
95108
}
@@ -106,11 +119,21 @@ registerPlugin({
106119
case "!animatedchan off":
107120
config.enableSwitch = 0;
108121
debug("Disabling script by command.");
109-
if (config.animatedMode == 0) chanObj.setName(initialChanName);
110-
if (config.animatedMode == 1) chanObj.setDescription(" ");
122+
if (config.animatedMode == 0) {
123+
for (var k = 0; k < config.animatedChannels.length; k++) {
124+
chanObj[k].setName(initialChanName[k]);
125+
}
126+
}
127+
if (config.animatedMode == 1) {
128+
for (var l = 0; l < config.animatedChannels.length; l++) {
129+
chanObj[l].setDescription(" ");
130+
}
131+
}
111132
if (config.animatedMode == 2) {
112-
chanObj.setDescription(" ");
113-
chanObj.setName(initialChanName);
133+
for (var m = 0; m < config.animatedChannels.length; m++) {
134+
chanObj[m].setName(initialChanName[m]);
135+
chanObj[m].setDescription(" ");
136+
}
114137
}
115138
break;
116139
default:
@@ -158,27 +181,30 @@ registerPlugin({
158181

159182
function chanChange() {
160183
if (!config.enableSwitch) return;
161-
var chanArr = {
162-
names: config.customNames.split(","), descs: config.customDescs.split(",")
163-
}
164-
debug("Found " + chanArr["names"].length + " channel names.");
165-
debug("Found " + chanArr["descs"].length + " channel descriptions.");
166-
if (i >= chanArr["names"].length) {
167-
i = 1;
168-
if (config.animatedMode != 1) chanObj.setName(chanArr["names"][0]);
169-
debug("Reset counter.");
170-
} else {
171-
if (config.animatedMode != 1) chanObj.setName(chanArr["names"][i]);
172-
i++;
173-
}
174-
if (j >= chanArr["descs"].length) {
175-
j = 1;
176-
if (config.animatedMode != 0) chanObj.setDescription(chanArr["descs"][0]);
177-
debug("Reset counter 2.");
178-
} else {
179-
if (config.animatedMode != 0) chanObj.setDescription(chanArr["descs"][j]);
180-
j++;
184+
for (var c = 0; c < config.animatedChannels.length; c++) {
185+
var chanArr = {
186+
names: config.animatedChannels[c].names.split(","), descs: config.animatedChannels[c].descs.split(",")
187+
};
188+
debug("Found " + chanArr["names"].length + " channel names for channel " + chanObj[c]);
189+
debug("Found " + chanArr["descs"].length + " channel descriptions for channel " + chanObj[c]);
190+
if (i >= chanArr["names"].length) {
191+
i = 1;
192+
if (config.animatedMode != 1) chanObj[c].setName(chanArr["names"][0]);
193+
debug("Reset counter.");
194+
} else {
195+
if (config.animatedMode != 1) chanObj[c].setName(chanArr["names"][i]);
196+
i++;
197+
}
198+
if (j >= chanArr["descs"].length) {
199+
j = 1;
200+
if (config.animatedMode != 0) chanObj[c].setDescription(chanArr["descs"][0]);
201+
debug("Reset counter 2.");
202+
} else {
203+
if (config.animatedMode != 0) chanObj[c].setDescription(chanArr["descs"][j]);
204+
j++;
205+
}
181206
}
207+
182208
}
183209

184210
function debug(msg) {

‎scripts/animatedNick.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
registerPlugin({
2323
name: "Animated Nickname",
24-
version: "1.5",
24+
version: "1.6",
2525
engine: '>= 0.9.16',
2626
description: "This scripts kicks some fun in your bot, you can set a custom animated nickname or description.",
2727
author: "Luigi M. - xDefcon (luigi@xdefcon.com)",
@@ -50,6 +50,7 @@ registerPlugin({
5050
}
5151
}, function (sinusbot, config) {
5252
var engine = require('engine');
53+
var backend = require('backend');
5354
var event = require('event');
5455
var minimumDelay = 100;
5556
var i = 0;
@@ -99,9 +100,9 @@ registerPlugin({
99100
config.enableSwitch = 0;
100101
debug("Disabling script by command.");
101102
if (config.animatedMode == 0) engine.setNick(initialNick);
102-
if (config.animatedMode == 1) sinusbot.setDescription(" "); //no setDescription method in engine
103+
if (config.animatedMode == 1) backend.getBotClient().setDescription(" "); //no setDescription method in engine
103104
if (config.animatedMode == 2) {
104-
sinusbot.setDescription(" ");
105+
backend.getBotClient().setDescription(" ");
105106
engine.setNick(initialNick);
106107
}
107108
break;
@@ -162,18 +163,18 @@ registerPlugin({
162163
if (i >= nickArr.length) {
163164
i = 1;
164165
if (config.animatedMode == 0) engine.setNick(nickArr[0]);
165-
if (config.animatedMode == 1) sinusbot.setDescription(nickArr[0]);
166+
if (config.animatedMode == 1) backend.getBotClient().setDescription(nickArr[0]);
166167
if (config.animatedMode == 2) {
167168
engine.setNick(nickArr[0]);
168-
sinusbot.setDescription(nickArr[0]);
169+
backend.getBotClient().setDescription(nickArr[0]);
169170
}
170171
debug("Reset counter.");
171172
} else {
172173
if (config.animatedMode == 0) engine.setNick(nickArr[i]);
173-
if (config.animatedMode == 1) sinusbot.setDescription(nickArr[i]);
174+
if (config.animatedMode == 1) backend.getBotClient().setDescription(nickArr[i]);
174175
if (config.animatedMode == 2) {
175176
engine.setNick(nickArr[i]);
176-
sinusbot.setDescription(nickArr[i]);
177+
backend.getBotClient().setDescription(nickArr[i]);
177178
}
178179
i++;
179180
}

‎scripts/nickCrashHelper.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
registerPlugin({
2323
name: 'Nick Crash Helper',
24-
version: '1.3',
24+
version: '1.4',
2525
description: 'This script removes the awful "1" after the nickname (This can happen when the bot crashes) - Sinusbot version 0.9.12.2-58b509d or higher needed.',
2626
author: 'Luigi M. - xDefcon (xdefconhd@gmail.com)',
2727
vars: {
@@ -45,6 +45,9 @@ registerPlugin({
4545

4646

4747
function (sinusbot, config) {
48+
var engine = require('engine');
49+
var backend = require('backend');
50+
4851
if (typeof config.checkTime == 'undefined') {
4952
config.checkTime = 60;
5053
debug("Check Time set to 60 seconds.");
@@ -55,18 +58,18 @@ registerPlugin({
5558

5659
function debug(msg) {
5760
if (config.debugSwitch == 1) {
58-
sinusbot.log("[DEBUG] " + msg);
61+
engine.log("[DEBUG] " + msg);
5962
}
6063
}
6164

6265
setInterval(nickCheck, config.checkTime * 1000);
6366

6467
function nickCheck() {
65-
var nick = sinusbot.getNick(),
66-
realNick = sinusbot.getActualNick();
68+
var nick = backend.getNick(),
69+
realNick = backend.getBotClient().nick();
6770
if (nick != realNick) {
68-
sinusbot.setNick(nick);
69-
debug("Nick changed from " + realNick + " to " + nick);
71+
engine.setNick(nick);
72+
debug("Nick changed from '" + realNick + "' to '" + nick + "'");
7073
} else {
7174
debug("Nick not modified, all seems normal.");
7275
}

0 commit comments

Comments
 (0)