Skip to content

Commit

Permalink
Merge pull request #7 from /issues/3
Browse files Browse the repository at this point in the history
Add eslint no-var check. Closes #3.
  • Loading branch information
jamesjong committed Sep 7, 2016
2 parents 5708561 + 072de0b commit e3f1823
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"single"
],
"max-len": 0,
"no-var": "error",
"semi": [
"error",
"always"
Expand Down
18 changes: 9 additions & 9 deletions src/scripts/logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ const _ = require('lodash');
module.exports = robot => {

function getAdapter() {
var adapter = _.isNil(robot.adapterName) ? 'unknown' : robot.adapterName;
let adapter = _.isNil(robot.adapterName) ? 'unknown' : robot.adapterName;
return adapter;
};

function getRobotName() {
var robotName = (_.isUndefined(robot.name) || _.isNull(robot.name)) ? 'unknown' : robot.name;
let robotName = (_.isUndefined(robot.name) || _.isNull(robot.name)) ? 'unknown' : robot.name;
return robotName;
};

function getRoomName() {
var roomName = 'unknown';
let roomName = 'unknown';
if (robot && robot.response && robot.response.message && robot.response.message.room) {
roomName = robot.response.message.room;
}
return roomName;
};

function getUserContext() {
var userContext = {};
let userContext = {};
if (robot && robot.response && robot.response.message && robot.response.message.user) {
userContext.id = robot.response.message.user.id;
userContext.name = robot.response.message.user.name;
Expand All @@ -59,11 +59,11 @@ module.exports = robot => {
};

function formatter(message) {
var logMessage = message;
var adapter = getAdapter();
var robotName = getRobotName();
var roomName = getRoomName();
var userContext = getUserContext();
let logMessage = message;
let adapter = getAdapter();
let robotName = getRobotName();
let roomName = getRoomName();
let userContext = getUserContext();

logMessage = constructLogMessage(logMessage, 'Adapter', adapter);
logMessage = constructLogMessage(logMessage, 'Robot', robotName);
Expand Down
4 changes: 2 additions & 2 deletions test/logger.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*/
'use strict';

var path = require('path');
var TAG = path.basename(__filename);
const path = require('path');
const TAG = path.basename(__filename);

const chai = require('chai');
const expect = chai.expect;
Expand Down

0 comments on commit e3f1823

Please sign in to comment.