Skip to content

fix: file indentation #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2019
Merged

fix: file indentation #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 75 additions & 75 deletions astroBotDiscord.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,77 +6,77 @@ const stripIndent = require('strip-indent');
const NASA = new Discord.Client();

NASA.on('ready', () => {
console.log('Logged into Discord as ' + NASA.user.username);
console.log('You are in '+ NASA.guilds.size + ` guild${NASA.guilds.size == 1? '' : 's'}!`);
NASA.prefix = new RegExp('^<@!?' + NASA.user.id + '>');
console.log('Logged into Discord as ' + NASA.user.username);
console.log('You are in ' + NASA.guilds.size + ` guild${NASA.guilds.size == 1? '' : 's'}!`);
NASA.prefix = new RegExp('^<@!?' + NASA.user.id + '>');
});

const commands = {
'help': (message) => sendHelp(message),
'apod': (message, argument, dm) => {
let date;
switch (argument) {
case 'random':
const firstAPODDate = new Date(96, 6, 16);
const currentDate = new Date();
date = new Date(Math.floor(firstAPODDate.getTime() + Math.random() * (currentDate.getTime() - firstAPODDate.getTime())));
break;
case 'today':
date = new Date();
break;
case 'yesterday':
date = ((d) => new Date(d.setDate(d.getDate() - 1)))(new Date());
break;
default:
date = argument == undefined ? new Date() : new Date(argument);
if (date == 'Invalid Date') {
return message.channel.send('That date was invalid, try something like `Janary 30, 1995`, or `1995-1-30`');
}
break;
}
getAPODImage(date).then((data) => {
if (!dm) {
message.channel.startTyping();
message.channel.send('', new Discord.Attachment(data.url, 'APOD.jpg')).then(() => message.channel.stopTyping());
}
if (dm) {
message.author.send('', new Discord.Attachment(data.url, 'APOD.jpg'));
}
});
},
'help': (message) => sendHelp(message),
'apod': (message, argument, dm) => {
let date;
switch (argument) {
case 'random':
const firstAPODDate = new Date(96, 6, 16);
const currentDate = new Date();
date = new Date(Math.floor(firstAPODDate.getTime() + Math.random() * (currentDate.getTime() - firstAPODDate.getTime())));
break;
case 'today':
date = new Date();
break;
case 'yesterday':
date = ((d) => new Date(d.setDate(d.getDate() - 1)))(new Date());
break;
default:
date = argument == undefined ? new Date() : new Date(argument);
if (date == 'Invalid Date') {
return message.channel.send('That date was invalid, try something like `Janary 30, 1995`, or `1995-1-30`');
}
break;
}
getAPODImage(date).then((data) => {
if (!dm) {
message.channel.startTyping();
message.channel.send('', new Discord.Attachment(data.url, 'APOD.jpg')).then(() => message.channel.stopTyping());
}
if (dm) {
message.author.send('', new Discord.Attachment(data.url, 'APOD.jpg'));
}
});
},
};

NASA.on('message', (message) => {
if (!NASA.prefix.test(message.content)) return;
if (!NASA.prefix.test(message.content)) return;

// [0]: Command, [1] Argument
message.content = message.content.replace(/[ ]{2,}/, ' ');
const dm = message.content.includes('-dm');
const split = message.content.split(' ');
if (dm) split.splice(split.length-1, 1);
const command = split[1];
let argument;
if (split.length == 3) argument = split[2];
if (split.length > 3) argument = `${split[2]} ${parseInt(split[3].replace(/[a-z]/gi, ''))-1} ${split[4]}`;
// [0]: Command, [1] Argument
message.content = message.content.replace(/[ ]{2,}/, ' ');
const dm = message.content.includes('-dm');
const split = message.content.split(' ');
if (dm) split.splice(split.length - 1, 1);
const command = split[1];
let argument;
if (split.length == 3) argument = split[2];
if (split.length > 3) argument = `${split[2]} ${parseInt(split[3].replace(/[a-z]/gi, ''))-1} ${split[4]}`;

if (!command) return;
switch (command.toLowerCase()) {
case 'hi':
case 'hey':
case 'hello':
message.reply('Hi!');
return;
default:
if (command.toLowerCase() in commands) {
commands[command.toLowerCase()](message, argument, dm);
return;
}
}
if (!command) return;
switch (command.toLowerCase()) {
case 'hi':
case 'hey':
case 'hello':
message.reply('Hi!');
return;
default:
if (command.toLowerCase() in commands) {
commands[command.toLowerCase()](message, argument, dm);
return;
}
}
});

function sendHelp(message) {
if (message.channel.channel.type != 'dm') message.channel.send('Sending you a DM...').then((message) => message.delete(3000));
message.author.send(stripIndent(`
if (message.channel.channel.type != 'dm') message.channel.send('Sending you a DM...').then((message) => message.delete(3000));
message.author.send(stripIndent(`
Here's some information on how I can be used.

apod: Display an Astronomy Picture of the Day image.
Expand All @@ -91,25 +91,25 @@ function sendHelp(message) {
}

function getAPODImage(date) {
return new Promise((resolve, reject) => {
date = formatDate(date);
superagent.get(`https://api.nasa.gov/planetary/apod?concept_tags=false&api_key=${config.nasa.apiKey}&date=${date}`)
.end((err, res) => {
if (err) return reject(err);
return resolve(res.body);
});
});
return new Promise((resolve, reject) => {
date = formatDate(date);
superagent.get(`https://api.nasa.gov/planetary/apod?concept_tags=false&api_key=${config.nasa.apiKey}&date=${date}`)
.end((err, res) => {
if (err) return reject(err);
return resolve(res.body);
});
});
}


function formatDate(date) {
let d = new Date(date);
let month = '' + (d.getMonth() + 1);
let day = '' + d.getDate();
let year = d.getFullYear();
if (month.length < 2) month = '0' + month;
if (day.length < 2) day = '0' + day;
return [year, month, day].join('-');
let d = new Date(date);
let month = '' + (d.getMonth() + 1);
let day = '' + d.getDate();
let year = d.getFullYear();
if (month.length < 2) month = '0' + month;
if (day.length < 2) day = '0' + day;
return [year, month, day].join('-');
}

NASA.login(config.discord.token);