Skip to content

Commit a5e5670

Browse files
MSFTserverMSFTserver
committed
slight fixes
1 parent 3bbd413 commit a5e5670

File tree

6 files changed

+279
-71
lines changed

6 files changed

+279
-71
lines changed

‎bot/bot.js

+12-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ var commands = {};
2828
var bot = new Discord.Client();
2929

3030
bot.on('ready', function() {
31-
console.log('Logged in! Serving in ' + bot.guilds.array().length + ' servers');
31+
console.log(
32+
'Logged in! Serving in ' + bot.guilds.array().length + ' servers'
33+
);
3234
require('./plugins.js').init();
3335
console.log('type ' + config.prefix + 'help in Discord for a commands list.');
3436
bot.user.setActivity(config.prefix + 'Intialized!');
@@ -53,13 +55,19 @@ bot.on('disconnected', function() {
5355
function checkMessageForCommand(msg, isEdit) {
5456
//check if message is a command
5557
if (msg.author.id != bot.user.id && msg.content.startsWith(config.prefix)) {
56-
console.log('treating ' + msg.content + ' from ' + msg.author + ' as command');
58+
console.log(
59+
'treating ' + msg.content + ' from ' + msg.author + ' as command'
60+
);
5761
var cmdTxt = msg.content.split(' ')[0].substring(config.prefix.length);
58-
var suffix = msg.content.substring(cmdTxt.length + config.prefix.length + 1); //add one for the ! and one for the space
62+
var suffix = msg.content.substring(
63+
cmdTxt.length + config.prefix.length + 1
64+
); //add one for the ! and one for the space
5965
if (msg.isMentioned(bot.user)) {
6066
try {
6167
cmdTxt = msg.content.split(' ')[1];
62-
suffix = msg.content.substring(bot.user.mention().length + cmdTxt.length + config.prefix.length + 1);
68+
suffix = msg.content.substring(
69+
bot.user.mention().length + cmdTxt.length + config.prefix.length + 1
70+
);
6371
} catch (e) {
6472
//no command
6573
msg.channel.send('Yes?');

‎bot/modules/dogeTipper.js

+87-21
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ exports.tipdoge = {
2525
helpmsg =
2626
'**!tipdoge** : Displays This Message\n **!tipdoge balance** : get your balance\n **!tipdoge deposit** : get address for your deposits\n **!tipdoge withdraw <ADDRESS> <AMOUNT>** : withdraw coins to specified address\n **!tipdoge <@user> <amount>** :mention a user with @ and then the amount to tip them\n **!tipdoge private <user> <amount>** : put private before Mentioning a user to tip them privately.\n\n**!multitipdoge** : Displays This Message Below\n' +
2727
' **!multitipdoge <@user1> <@user2> <amount>** : Mention one or more users, seperated by spaces, then an amount that each mentioned user will receive.\n **!multitipdoge private <@user1> <@user2> <amount>** : Put private before Mentioning one or more users to have each user tipped privately.\n\n**!roletipdoge** : Displays This Message Below\n **!roletipdoge <@role> <amount>** : Mention a single role, then an amount that each user in that role will receive.\n **!roletipdoge private <@role> <amount>** : Put private before the role to have each user tipped privately.\n **<> : Replace with appropriate value.**',
28-
channelwarning = 'Please use <#' + spamchannel + '> or DMs to talk to bots.',
28+
channelwarning =
29+
'Please use <#' + spamchannel + '> or DMs to talk to bots.',
2930
MultiorRole = false;
3031
switch (subcommand) {
3132
case 'help':
@@ -38,7 +39,11 @@ exports.tipdoge = {
3839
privateorSpamChannel(msg, channelwarning, doDeposit, [tipper]);
3940
break;
4041
case 'withdraw':
41-
privateorSpamChannel(msg, channelwarning, doWithdraw, [tipper, words, helpmsg]);
42+
privateorSpamChannel(msg, channelwarning, doWithdraw, [
43+
tipper,
44+
words,
45+
helpmsg
46+
]);
4247
break;
4348
default:
4449
doTip(bot, msg, tipper, words, helpmsg, MultiorRole);
@@ -61,7 +66,8 @@ exports.multitipdoge = {
6166
subcommand = words.length >= 2 ? words[1] : 'help',
6267
helpmsg =
6368
'**!multitipdoge** : Displays This Message\n **!multitipdoge <@user1> <@user2> <amount>** : Mention one or more users, seperated by spaces, then an amount that each mentioned user will receive.\n **!multitipdoge private <@user1> <@user2> <amount>** : Put private before Mentioning one or more users to have each user tipped privately.\n ** <> : Replace with appropriate value.**',
64-
channelwarning = 'Please use <#' + spamchannel + '> or DMs to talk to bots.',
69+
channelwarning =
70+
'Please use <#' + spamchannel + '> or DMs to talk to bots.',
6571
MultiorRole = true;
6672
switch (subcommand) {
6773
case 'help':
@@ -89,7 +95,8 @@ exports.roletipdoge = {
8995
subcommand = words.length >= 2 ? words[1] : 'help',
9096
helpmsg =
9197
'**!roletipdoge** : Displays This Message\n **!roletipdoge <@role> <amount>** : Mention a single role, then an amount that each user in that role will receive.\n **!roletipdoge private <@role> <amount>** : Put private before the role to have each user tipped privately.\n ** <> : Replace with appropriate value.**',
92-
channelwarning = 'Please use <#' + spamchannel + '> or DMs to talk to bots.',
98+
channelwarning =
99+
'Please use <#' + spamchannel + '> or DMs to talk to bots.',
93100
MultiorRole = true;
94101
switch (subcommand) {
95102
case 'help':
@@ -117,7 +124,9 @@ function doHelp(message, helpmsg) {
117124
function doBalance(message, tipper) {
118125
doge.getBalance(tipper, 1, function(err, balance) {
119126
if (err) {
120-
message.reply('Error getting Doge balance.').then(message => message.delete(10000));
127+
message
128+
.reply('Error getting Doge balance.')
129+
.then(message => message.delete(10000));
121130
} else {
122131
message.reply('You have *' + balance + '* DOGE');
123132
}
@@ -127,7 +136,9 @@ function doBalance(message, tipper) {
127136
function doDeposit(message, tipper) {
128137
getAddress(tipper, function(err, address) {
129138
if (err) {
130-
message.reply('Error getting your Doge deposit address.').then(message => message.delete(10000));
139+
message
140+
.reply('Error getting your Doge deposit address.')
141+
.then(message => message.delete(10000));
131142
} else {
132143
message.reply('Your Doge (DOGE) address is ' + address);
133144
}
@@ -144,15 +155,25 @@ function doWithdraw(message, tipper, words, helpmsg) {
144155
amount = getValidatedAmount(words[3]);
145156

146157
if (amount === null) {
147-
message.reply("I don't know how to withdraw that many Doge coins...").then(message => message.delete(10000));
158+
message
159+
.reply("I don't know how to withdraw that many Doge coins...")
160+
.then(message => message.delete(10000));
148161
return;
149162
}
150163

151164
doge.sendFrom(tipper, address, Number(amount), function(err, txId) {
152165
if (err) {
153166
message.reply(err.message).then(message => message.delete(10000));
154167
} else {
155-
message.reply('You withdrew ' + amount + ' DOGE to ' + address + '\n' + txLink(txId) + '\n');
168+
message.reply(
169+
'You withdrew ' +
170+
amount +
171+
' DOGE to ' +
172+
address +
173+
'\n' +
174+
txLink(txId) +
175+
'\n'
176+
);
156177
}
157178
});
158179
}
@@ -172,14 +193,26 @@ function doTip(bot, message, tipper, words, helpmsg, MultiorRole) {
172193
let amount = getValidatedAmount(words[amountOffset]);
173194

174195
if (amount === null) {
175-
message.reply("I don't know how to tip that many Doge coins...").then(message => message.delete(10000));
196+
message
197+
.reply("I don't know how to tip that many Doge coins...")
198+
.then(message => message.delete(10000));
176199
return;
177200
}
178201

179202
if (message.mentions.users.first().id) {
180-
sendDOGE(bot, message, tipper, message.mentions.users.first().id.replace('!', ''), amount, prv, MultiorRole);
203+
sendDOGE(
204+
bot,
205+
message,
206+
tipper,
207+
message.mentions.users.first().id.replace('!', ''),
208+
amount,
209+
prv,
210+
MultiorRole
211+
);
181212
} else {
182-
message.reply('Sorry, I could not find a user in your tip...').then(message => message.delete(10000));
213+
message
214+
.reply('Sorry, I could not find a user in your tip...')
215+
.then(message => message.delete(10000));
183216
}
184217
}
185218

@@ -198,15 +231,27 @@ function doMultiTip(bot, message, tipper, words, helpmsg, MultiorRole) {
198231
}
199232
let [userIDs, amount] = findUserIDsAndAmount(message, words, prv);
200233
if (amount == null) {
201-
message.reply("I don't know how to tip that many Doge coins...").then(message => message.delete(10000));
234+
message
235+
.reply("I don't know how to tip that many Doge coins...")
236+
.then(message => message.delete(10000));
202237
return;
203238
}
204239
if (!userIDs) {
205-
message.reply('Sorry, I could not find a user in your tip...').then(message => message.delete(10000));
240+
message
241+
.reply('Sorry, I could not find a user in your tip...')
242+
.then(message => message.delete(10000));
206243
return;
207244
}
208245
for (var i = 0; i < userIDs.length; i++) {
209-
sendDOGE(bot, message, tipper, userIDs[i].toString(), amount, prv, MultiorRole);
246+
sendDOGE(
247+
bot,
248+
message,
249+
tipper,
250+
userIDs[i].toString(),
251+
amount,
252+
prv,
253+
MultiorRole
254+
);
210255
}
211256
}
212257

@@ -223,21 +268,29 @@ function doRoleTip(bot, message, tipper, words, helpmsg, MultiorRole) {
223268
}
224269
let amount = getValidatedAmount(words[amountOffset]);
225270
if (amount == null) {
226-
message.reply("I don't know how to tip that many Doge coins...").then(message => message.delete(10000));
271+
message
272+
.reply("I don't know how to tip that many Doge coins...")
273+
.then(message => message.delete(10000));
227274
return;
228275
}
229276
if (message.mentions.roles.first().id) {
230277
if (message.mentions.roles.first().members.first().id) {
231-
let userIDs = message.mentions.roles.first().members.map(member => member.user.id.replace('!', ''));
278+
let userIDs = message.mentions.roles
279+
.first()
280+
.members.map(member => member.user.id.replace('!', ''));
232281
for (var i = 0; i < userIDs.length; i++) {
233282
sendDOGE(bot, message, tipper, userIDs[i], amount, prv, MultiorRole);
234283
}
235284
} else {
236-
message.reply('Sorry, I could not find any users to tip in that role...').then(message => message.delete(10000));
285+
message
286+
.reply('Sorry, I could not find any users to tip in that role...')
287+
.then(message => message.delete(10000));
237288
return;
238289
}
239290
} else {
240-
message.reply('Sorry, I could not find any roles in your tip...').then(message => message.delete(10000));
291+
message
292+
.reply('Sorry, I could not find any roles in your tip...')
293+
.then(message => message.delete(10000));
241294
return;
242295
}
243296
}
@@ -262,12 +315,23 @@ function findUserIDsAndAmount(message, words, prv) {
262315
return [idList, amount];
263316
}
264317

265-
function sendDOGE(bot, message, tipper, recipient, amount, privacyFlag, MultiorRole) {
318+
function sendDOGE(
319+
bot,
320+
message,
321+
tipper,
322+
recipient,
323+
amount,
324+
privacyFlag,
325+
MultiorRole
326+
) {
266327
getAddress(recipient.toString(), function(err, address) {
267328
if (err) {
268329
message.reply(err.message).then(message => message.delete(10000));
269330
} else {
270-
doge.sendFrom(tipper, address, Number(amount), 1, null, null, function(err, txId) {
331+
doge.sendFrom(tipper, address, Number(amount), 1, null, null, function(
332+
err,
333+
txId
334+
) {
271335
if (err) {
272336
message.reply(err.message).then(message => message.delete(10000));
273337
} else {
@@ -310,7 +374,9 @@ function sendDOGE(bot, message, tipper, recipient, amount, privacyFlag, MultiorR
310374
'\n' +
311375
'DM me `!tipdoge` for dogeTipper instructions.';
312376
if (MultiorRole) {
313-
bot.channels.get(spamchannel).send('<@' + tipper + '>,' + iiimessage);
377+
bot.channels
378+
.get(spamchannel)
379+
.send('<@' + tipper + '>,' + iiimessage);
314380
} else {
315381
message.reply(iiimessage);
316382
}

0 commit comments

Comments
 (0)