Skip to content

Commit

Permalink
Merge branch 'release/v2.0.1'
Browse files Browse the repository at this point in the history 
* release/v2.0.1:
  Rename calling code's use of the ConnectionManager interface's connection
  Add commented out logging serialization code
  • Loading branch information
@joelpurra
joelpurra committed Jan 20, 2018
2 parents 88c63a2 + 4a510fe commit 4a9d348
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 22 deletions.
8 changes: 4 additions & 4 deletions src/twitch/irc/handler/greeting.js
View file
Expand Up @@ -24,12 +24,12 @@ const assert = require("assert");
const Promise = require("bluebird");

export default class GreetingIrcHandler extends IrcManager {
constructor(logger, ircConnection, username) {
super(logger, ircConnection);
constructor(logger, connection, username) {
super(logger, connection);

assert.strictEqual(arguments.length, 3);
assert.strictEqual(typeof logger, "object");
assert.strictEqual(typeof ircConnection, "object");
assert.strictEqual(typeof connection, "object");
assert.strictEqual(typeof username, "string");
assert(username.length > 0);

Expand Down Expand Up @@ -66,7 +66,7 @@ export default class GreetingIrcHandler extends IrcManager {
message = `PRIVMSG ${data.channel} :Hiya ${data.username}, how are you?`;
}

this._ircConnection._send(message);
this._connection._send(message);
}

_filter(data) {
Expand Down
8 changes: 4 additions & 4 deletions src/twitch/irc/handler/new-chatter.js
View file
Expand Up @@ -24,12 +24,12 @@ const assert = require("assert");
const Promise = require("bluebird");

export default class NewChatterIrcHandler extends IrcManager {
constructor(logger, ircConnection) {
super(logger, ircConnection);
constructor(logger, connection) {
super(logger, connection);

assert.strictEqual(arguments.length, 2);
assert.strictEqual(typeof logger, "object");
assert.strictEqual(typeof ircConnection, "object");
assert.strictEqual(typeof connection, "object");

this._logger = logger.child("NewChatterIrcHandler");
}
Expand All @@ -42,7 +42,7 @@ export default class NewChatterIrcHandler extends IrcManager {

// TODO: use a string templating system.
// TODO: configure message.
this._ircConnection._send(`PRIVMSG ${data.channel} :Hiya ${data.tags.login}, welcome! Have a question? Go ahead and ask, I'll answer as soon as I see it. I'd be happy if you hang out with us, and don't forget to follow 😀`);
this._connection._send(`PRIVMSG ${data.channel} :Hiya ${data.tags.login}, welcome! Have a question? Go ahead and ask, I'll answer as soon as I see it. I'd be happy if you hang out with us, and don't forget to follow 😀`);
}

_filter(data) {
Expand Down
8 changes: 4 additions & 4 deletions src/twitch/irc/handler/ping.js
View file
Expand Up @@ -24,12 +24,12 @@ const assert = require("assert");
const Promise = require("bluebird");

export default class PingIrcHandler extends IrcManager {
constructor(logger, ircConnection) {
super(logger, ircConnection);
constructor(logger, connection) {
super(logger, connection);

assert.strictEqual(arguments.length, 2);
assert.strictEqual(typeof logger, "object");
assert.strictEqual(typeof ircConnection, "object");
assert.strictEqual(typeof connection, "object");

this._logger = logger.child("PingIrcHandler");
}
Expand All @@ -40,7 +40,7 @@ export default class PingIrcHandler extends IrcManager {

this._logger.trace("Responding to PING.", "_dataHandler");

this._ircConnection._send("PONG :" + data.message);
this._connection._send("PONG :" + data.message);
}

_filter(data) {
Expand Down
8 changes: 4 additions & 4 deletions src/twitch/irc/handler/subscribing.js
View file
Expand Up @@ -24,12 +24,12 @@ const assert = require("assert");
const Promise = require("bluebird");

export default class SubscribingIrcHandler extends IrcManager {
constructor(logger, ircConnection) {
super(logger, ircConnection);
constructor(logger, connection) {
super(logger, connection);

assert.strictEqual(arguments.length, 2);
assert.strictEqual(typeof logger, "object");
assert.strictEqual(typeof ircConnection, "object");
assert.strictEqual(typeof connection, "object");

this._logger = logger.child("SubscribingIrcHandler");
}
Expand All @@ -50,7 +50,7 @@ export default class SubscribingIrcHandler extends IrcManager {
message = `PRIVMSG ${data.channel} :Wow, ${data.tags.login}, thanks for being my rubber ducky!`;
}

this._ircConnection._send(message);
this._connection._send(message);
}

_filter(data) {
Expand Down
6 changes: 3 additions & 3 deletions src/twitch/irc/irc-manager.js
View file
Expand Up @@ -23,12 +23,12 @@ import ConnectionManager from "../connection-manager";
const assert = require("assert");

export default class IrcManager extends ConnectionManager {
constructor(logger, ircConnection) {
super(logger, ircConnection);
constructor(logger, connection) {
super(logger, connection);

assert.strictEqual(arguments.length, 2);
assert.strictEqual(typeof logger, "object");
assert.strictEqual(typeof ircConnection, "object");
assert.strictEqual(typeof connection, "object");

this._logger = logger.child("IrcManager");
}
Expand Down
6 changes: 3 additions & 3 deletions src/twitch/polling/polling-manager.js
View file
Expand Up @@ -23,12 +23,12 @@ import ConnectionManager from "../connection-manager";
const assert = require("assert");

export default class PollingManager extends ConnectionManager {
constructor(logger, pollingConnection) {
super(logger, pollingConnection);
constructor(logger, connection) {
super(logger, connection);

assert.strictEqual(arguments.length, 2);
assert.strictEqual(typeof logger, "object");
assert.strictEqual(typeof pollingConnection, "object");
assert.strictEqual(typeof connection, "object");

this._logger = logger.child("PollingManager");
}
Expand Down
15 changes: 15 additions & 0 deletions src/util/pino-logger.js
View file
Expand Up @@ -41,6 +41,8 @@ export default class PinoLogger {
this._loggingMethods.forEach(
(loggingMethod) => {
this[loggingMethod] = (...args) => this._parentPinoLogger[loggingMethod]({
// TODO: serialize error objects etcetera.
// args: this._serialize(args),
args: args,
});
}
Expand All @@ -62,4 +64,17 @@ export default class PinoLogger {

return childLogger;
}

// _valueReplacer(/* eslint-disable no-unused-vars */key/* eslint-enable no-unused-vars */, value) {
// if (value !== null && typeof value === "object" && value.stack) {
// return value.toString();
// }
//
// return value;
// }
//
// _serialize(value) {
// // TODO: serialize error objects etcetera.
// return JSON.stringify(value, this._valueReplacer.bind(this), 2);
// }
}

0 comments on commit 4a9d348

Please sign in to comment.