Skip to content

Async #19

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

Open
wolfy1339 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Async #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3a9f2d
Make stuff async
wolfy1339 Mar 1, 2018
bce9f76
Async updates
wolfy1339 Mar 2, 2018
7f8653b
Make more stuff asnc functions
wolfy1339 Mar 26, 2018
2479a15
Fix some errors
wolfy1339 Mar 26, 2018
1f627f5
Async functions more stuff
wolfy1339 May 22, 2018
5d450fa
Make send async
wolfy1339 Jun 3, 2018
3d53cdb
async some of these functions
wolfy1339 Jun 8, 2018
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
22 changes: 11 additions & 11 deletions caps/sasl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Sasl {
* @param {object} bot
* @param {array} [args]
*/
run(bot, args) {
async run(bot, args) {
const mechanisms = args || ['EXTERNAL', 'PLAIN'];

if (!this.method) {
Expand All @@ -36,7 +36,7 @@ class Sasl {

if (mechanisms.includes(this.method.toUpperCase())) {
if (['plain', 'external'].includes(this.method)) {
bot.send(`AUTHENTICATE ${this.method.toUpperCase()}`);
await bot.send(`AUTHENTICATE ${this.method.toUpperCase()}`);
} else {
throw new Error('Not implemented yet');
}
Expand All @@ -49,7 +49,7 @@ class Sasl {
* @func
* @param {object} event
*/
on_authenticate(event) {
async on_authenticate(event) {
let password;

if (event.arguments[0] === '+') {
Expand All @@ -59,31 +59,31 @@ class Sasl {
password = '+';
}

this.bot.send(`AUTHENTICATE ${password}`);
await this.bot.send(`AUTHENTICATE ${password}`);
}
}

/**
* @func
* @param {object} event
*/
on_saslfailed(event) {
async on_saslfailed(event) {
this.retries += 1;

if (this.method === 'external') {
if (this.retries === 2) {
this.retries = 1;
this.method = 'plain';

this.bot.send('AUTHENTICATE PLAIN');
await this.bot.send('AUTHENTICATE PLAIN');
} else {
this.bot.send('AUTHENTICATE EXTERNAL');
await this.bot.send('AUTHENTICATE EXTERNAL');
}
} else if (this.method === 'plain') {
if (this.retries !== 2) {
this.bot.send('AUTHENTICATE PLAIN');
await this.bot.send('AUTHENTICATE PLAIN');
} else {
this.bot.send('AUTHENTICATE *');
await this.bot.send('AUTHENTICATE *');
throw new Error('SASL authentication failed!');
}
}
Expand All @@ -93,8 +93,8 @@ class Sasl {
* @func
* @param {object} event
*/
on_saslsuccess(event) {
this.bot.send('CAP END');
async on_saslsuccess(event) {
await this.bot.send('CAP END');
}

}
Expand Down
84 changes: 43 additions & 41 deletions core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,29 @@ class Core {
this.floodProtection = new FloodProtection(this);
this.plugins = new Plugins(this);

this.on_error = (irc, event) => {
this.on_error = async (irc, event) => {
if (event.arguments.join(' ').indexOf('Closing link') === -1)
irc.privmsg('##Athena', 'An error occured, check the console. !att-Athena-admins');
log.error(event.arguments.join(' '));
};

this.on_ping = irc => {
this.on_ping = async irc => {
// Respond to ping event
this.send('PONG');
await this.send('PONG');
};

this.on_nicknameinuse = (irc, event) => {
this.on_nicknameinuse = async (irc, event) => {
this.nickname = this.nickname.concat('_');
irc.nick(this.nickname);
};

this.on_welcome = (irc, event) => {
Object.keys(this.config.channels).forEach(channel => {
irc.join(channel, this.config.channels[channel].key);
this.on_welcome = async (irc, event) => {
Object.keys(this.config.channels).forEach(async channel => {
await irc.join(channel, this.config.channels[channel].key);
});
};

this.on_join = (irc, event) => {
this.on_join = async (irc, event) => {
let channel = event.target;
let args = event.arguments;

Expand All @@ -79,25 +79,25 @@ class Core {
});
}

this.send(`WHO ${event.target} nuhs%nhuacr`);
this.send(`NAMES ${event.target}`);
irc.mode(event.target, '', ''); // Get modes for the DB
await this.send(`WHO ${event.target} nuhs%nhuac`);
await this.send(`NAMES ${event.target}`);
await irc.mode(event.target, '', ''); // Get modes for the DB
} else {
// Extended join methods
if (args.length > 0) {
let nick = event.source.nick;
let hostmask = event.source.userhost;
let account = args[0] !== '*' ? args[0] : null;

this.state.channels.add_entry(channel, nick, hostmask, account);
await this.state.channels.add_entry(channel, nick, hostmask, account);
}

this.send(`WHO ${event.source.nick} nuhs%nhuacr`);
await this.send(`WHO ${event.source.nick} nuhs%nhuacr`);
this.nextWHOChannel = event.target;
}
};

this.on_name = (irc, event) => {
this.on_name = async (irc, event) => {
const channel = event.arguments[1];
const users = event.arguments[2].split(' ');

Expand All @@ -118,7 +118,7 @@ class Core {
}
};

this.on_whospcrpl = (irc, event) => {
this.on_whospcrpl = async (irc, event) => {
let nick = event.arguments[3];

if (nick !== 'ChanServ') {
Expand All @@ -132,11 +132,11 @@ class Core {
}
};

this.on_channelmodeis = (irc, event) => {
this.on_channelmodeis = async (irc, event) => {
this.state.channels[event.arguments[0]].modes.push(...event.arguments[1].slice(1).split(''));
};

this._update_user_modes = (irc, event, mode) => {
this._update_user_modes = async (irc, event, mode) => {
let [channel, user] = event.arguments.slice(0, 2);
// let [channel, user, setby, timestamp] = event.arguments;

Expand All @@ -154,17 +154,17 @@ class Core {
}
};

this.on_exceptlist = (irc, event) => this._update_user_modes(irc, event, 'e');
this.on_exceptlist = async (irc, event) => this._update_user_modes(irc, event, 'e');

this.on_banlist = (irc, event) => this._update_user_modes(irc, event, 'b');
this.on_banlist = async (irc, event) => this._update_user_modes(irc, event, 'b');

this.on_quietlist = (irc, event) => this._update_user_modes(irc, event, 'q');
this.on_quietlist = async (irc, event) => this._update_user_modes(irc, event, 'q');

this.on_account = (irc, event) => {
this.on_account = async (irc, event) => {
this.channels.change_attr(event.source.nick, 'account', event.target === '*' ? null : event.target);
};

this.on_chghost = (irc, event) => {
this.on_chghost = async (irc, event) => {
let args = event.arguments;

if (args.length) {
Expand All @@ -174,11 +174,11 @@ class Core {
this.channels.change_attr(event.source.nick, 'host', event.target);
};

this.on_cap = (irc, event) => this.caps.handler(event);
this.on_cap = async (irc, event) => this.caps.handler(event);

this.on_authenticate = (irc, event) => this.sasl.on_authenticate(event);
this.on_authenticate = async (irc, event) => await this.sasl.on_authenticate(event);

this.on_saslfailed = (irc, event) => this.sasl.on_saslfailed(event);
this.on_saslfailed = async (irc, event) => this.sasl.on_saslfailed(event);

this.on_saslsuccess = (irc, event) => this.sasl.on_saslsuccess(event);

Expand All @@ -192,28 +192,28 @@ class Core {
}
};

this.on_privmsg = (irc, event) => {
this.on_privmsg = async (irc, event) => {
let args = event.arguments.join(' ').split(' '); // Split arguments by spaces
let prefix = this.config.prefix || '';

if (args[0].startsWith(prefix)) {
args[0] = args[0].slice(prefix.length);
this.plugins.call_command(event, irc, args);
await this.plugins.call_command(event, irc, args);
} else if (event.target[0] !== '#') {
this.plugins.call_command(event, irc, args);
await this.plugins.call_command(event, irc, args);
} else if ( [this.nickname, this.nickname.concat(':'), this.nickname.concat(',')].includes(args[0])) {
args.shift(); // nickname[:/,] isn't the commmand
this.plugins.call_command(event, irc, args);
await this.plugins.call_command(event, irc, args);
}
if (event.target.startsWith('#'))
this._update_seen_db(event, irc, event.source.nick, args.join(' '));

this.plugins.hooks.call_regex(irc, event);
this.plugins.hooks.call_privmsg(irc, event);
this.plugins.hooks.call_includes(irc, event);
await this.plugins.hooks.call_regex(irc, event);
await this.plugins.hooks.call_privmsg(irc, event);
await this.plugins.hooks.call_includes(irc, event);
};

this._get_time = tags => {
this._get_time = async tags => {
let timestamp;

if (tags.length) {
Expand All @@ -231,7 +231,7 @@ class Core {
return timestamp;
};

this._update_seen_db = (event, irc, nick, str_args) => {
this._update_seen_db = async (event, irc, nick, str_args) => {
let timestamp = this._get_time(event.tags);
let udb = this.channels[event.target].users[nick];

Expand All @@ -243,11 +243,11 @@ class Core {
udb.seen.sort((a, b) => a.time > b.time);
udb.seen = udb.seen.slice(-5);
} else {
this.send(`WHO ${event.target} nuhs%nhuacr`);
await this.send(`WHO ${event.target} nuhs%nhuacr`);
}
};

this.on_ctcp = (irc, event) => {
this.on_ctcp = async (irc, event) => {
if (hasattr(this, 'ctcp')) {
let ctcp_message = ' '.join(event.arguments).toUpperCase();

Expand All @@ -260,12 +260,12 @@ class Core {
result = this.ctcp[ctcp_message];
}

irc.notice(event.source.nick, `${ctcp_message} ${result}`);
await irc.notice(event.source.nick, `${ctcp_message} ${result}`);
}
}
};

this.on_featurelist = (irc, event) => {
this.on_featurelist = async (irc, event) => {
for (let param of event.arguments.slice(0, -1)) {
let [name, , value] = partition(param, '=');

Expand Down Expand Up @@ -349,9 +349,11 @@ class Core {
* @func
* @param {string} message - The message you want to send
*/
immediateSend(message) {
this.socket.write(`${message}\r\n`);
log.debug('[SENT] %s', strip_formatting(message));
async immediateSend(message) {
const { promisify } = require('util');

await promisify(this.socket.write(`${message}\r\n`));
await log.debug('[SENT] %s', strip_formatting(message));
}

}
Expand Down
2 changes: 1 addition & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class Bot extends Core {
* Socket connection related stuff.
* @function
*/
connect() {
async connect() {
this.socket.once('connect', () => {
log.info('Connected');

Expand Down
10 changes: 5 additions & 5 deletions irc-caps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Caps {
* @func
* @param {Parser} event
*/
handler(event) {
async handler(event) {
// Main handling code for CAP
const servcaps = event.arguments[1] !== '*' ? event.arguments[1].split(' ') : event.arguments[2].split(' ');

Expand All @@ -47,16 +47,16 @@ class Caps {

if (event.arguments[1] !== '*') {
if (!this.availablecaps.length) {
this.bot.send('CAP END');
await this.bot.send('CAP END');
} else {
this.bot.send(`CAP REQ :${this.availablecaps.join(' ')}`);
await this.bot.send(`CAP REQ :${this.availablecaps.join(' ')}`);
}
}
} else if (event.arguments[0] === 'ACK') {
for (const cap of this.caps) { // Iterate over this.caps so we have access to classes
if (typeof cap !== 'string' && this.availablecaps.indexOf(cap.name) > -1) { // Check that the cap is in this.availablecaps
if (typeof cap.run === 'function') { // Check if the cap has the `run` property
cap.run(this.bot, this.args[cap.name]); // Run the cap with the arguments collected during CAP LS
await cap.run(this.bot, this.args[cap.name]); // Run the cap with the arguments collected during CAP LS
} else {
continue;
}
Expand All @@ -73,7 +73,7 @@ class Caps {
}

if (newcaps.length) {
this.bot.send(`CAP REQ :${newcaps.join(' ')}`); // Request the new CAP
await this.bot.send(`CAP REQ :${newcaps.join(' ')}`); // Request the new CAP
}
} else if (event.arguments[0] === 'DEL') {
for (const c of servcaps) {
Expand Down
10 changes: 5 additions & 5 deletions plugins/general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ const log = require('../utils/logging');
const util = require('util');

/* eslint-disable require-jsdoc */
function raw(bot,event,irc,args) {
async function raw(bot,event,irc,args) {
irc.send(args.join(" "))
};
raw.opts = {
perms: [false, true, true]
};

function flush(bot, event, irc, args) {
async function flush(bot, event, irc, args) {
if (args.length) {
bot.floodProtection.flushTarget(args[0])
} else {
Expand All @@ -23,8 +23,8 @@ flush.opts = {
aliases: ['flushq']
};

function todo(bot, event, irc, args) {
let has_perms = check_perms(bot.config, event.source.host, event.target, [true, false, false]);
async function todo(bot, event, irc, args) {
let has_perms = await check_perms(bot.config, event.source.host, event.target, [true, false, false]);

if (bot.todo === undefined) bot.todo = require('../todo.json');
if (args[0] === 'add' && has_perms) {
Expand Down Expand Up @@ -66,7 +66,7 @@ todo.opts = {
category: 'general'
};

function ping(bot, event, irc, args) {
async function ping(bot, event, irc, args) {
irc.reply(event, 'Pong');
}

Expand Down
Loading