From 1bb83de279f78ea26e777534c32bef80605d718b Mon Sep 17 00:00:00 2001 From: Jiiks Date: Fri, 4 Nov 2016 06:51:56 +0200 Subject: [PATCH] Reformatted logs --- v2/dist/js/main.js | 47 ++++++++++++++++++++++++++++++++++++++++------ v2/src/js/utils.js | 6 +++--- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/v2/dist/js/main.js b/v2/dist/js/main.js index 1168491..211da45 100644 --- a/v2/dist/js/main.js +++ b/v2/dist/js/main.js @@ -55,9 +55,44 @@ return modules; }(src_js_modules_observermodule); src_js_utils = function () { - var Utils = function Utils() { - _classCallCheck(this, Utils); - }; + var Utils = function () { + function Utils() { + _classCallCheck(this, Utils); + } + _createClass(Utils, [ + { + key: 'log', + value: function log(msg) { + console.log('[' + this.timeString + ']%c[%cBetterDiscord%c] %c' + msg, 'color: #000;', 'color: green; font-weight:#000;', 'color:#00;', ''); + } + }, + { + key: 'warn', + value: function warn(msg) { + console.log('[' + this.timeString + ']%c[%cBetterDiscord%c] %c' + msg, 'color: #000;', 'color: orange; font-weight:700;', 'color:#000;', ''); + } + }, + { + key: 'err', + value: function err(msg) { + console.log('[' + this.timeString + ']%c[%cBetterDiscord%c] %c' + msg, 'color: #000;', 'color: red; font-weight:700;', 'color:#000;', ''); + } + }, + { + key: 'dateString', + get: function get() { + return new Date().toLocaleString('en-GB'); + } + }, + { + key: 'timeString', + get: function get() { + return new Date().toTimeString().split(' ')[0]; + } + } + ]); + return Utils; + }(); return new Utils(); }(); src_js_api = function () { @@ -97,7 +132,7 @@ return Plugin; }(); src_js_event = function () { - var EventEmitter = events.EventEmitter; + var EventEmitter = new require('events').EventEmitter; var Event = function () { function Event() { _classCallCheck(this, Event); @@ -126,7 +161,7 @@ var Core = function () { function Core(args) { _classCallCheck(this, Core); - console.log(event); + this.utils = utils; this.event = event; this.modules = modules; this.beta = true; @@ -137,7 +172,7 @@ { key: 'init', value: function init() { - console.log('Initialized'); + utils.log(this.__versionString + ' Initializing'); } }, { diff --git a/v2/src/js/utils.js b/v2/src/js/utils.js index ad17037..82dd9d9 100644 --- a/v2/src/js/utils.js +++ b/v2/src/js/utils.js @@ -18,15 +18,15 @@ define(() => { } log(msg) { - console.log(`[${this.timeString}]%c[%cBetterDiscord|INF%c] %c${msg}`, 'color: #000;', 'color: green; font-weight:#000;', 'color:#00;', ''); + console.log(`[${this.timeString}]%c[%cBetterDiscord%c] %c${msg}`, 'color: #000;', 'color: green; font-weight:#000;', 'color:#00;', ''); } warn(msg) { - console.log(`[${this.timeString}]%c[%cBetterDiscord|WRN%c] %c${msg}`, 'color: #000;', 'color: orange; font-weight:700;', 'color:#000;', ''); + console.log(`[${this.timeString}]%c[%cBetterDiscord%c] %c${msg}`, 'color: #000;', 'color: orange; font-weight:700;', 'color:#000;', ''); } err(msg) { - console.log(`[${this.timeString}]%c[%cBetterDiscord|ERR%c] %c${msg}`, 'color: #000;', 'color: red; font-weight:700;', 'color:#000;', ''); + console.log(`[${this.timeString}]%c[%cBetterDiscord%c] %c${msg}`, 'color: #000;', 'color: red; font-weight:700;', 'color:#000;', ''); } get dateString() {