Always fire messageUpdated, reset on login (#294,#295)

lib/Client/InternalClient.js

@@ -213,8 +213,10 @@ var InternalClient = (function () {
 		this.messageAwaits = {};
 		this.retryAfters = {};
 
+		if (!this.tokenCacher) {
 			this.tokenCacher = new _UtilTokenCacher2["default"](this.client);
 			this.tokenCacher.init(0);
+		}
 	};
 
 	InternalClient.prototype.cleanIntervals = function cleanIntervals() {
@@ -255,7 +257,6 @@ var InternalClient = (function () {
 				if (!_this2.email && !_this2.token) {
 					return;
 				}
-				_this2.setup();
 
 				// Check whether the email is set (if not, only a token has been used for login)
 				_this2.loginWithToken(_this2.token, _this2.email, _this2.password)["catch"](function () {
@@ -588,6 +589,8 @@ var InternalClient = (function () {
 	InternalClient.prototype.loginWithToken = function loginWithToken(token, email, password) {
 		var _this10 = this;
 
+		this.setup();
+
 		this.state = _ConnectionState2["default"].LOGGED_IN;
 		this.token = token;
 		this.email = email;
@@ -1819,8 +1822,11 @@ var InternalClient = (function () {
 							data.content = data.content || msg.content;
 							data.mentions = data.mentions || msg.mentions;
 							data.author = data.author || msg.author;
+							msg = new _StructuresMessage2["default"](msg, channel, client);
+						}
 						var nmsg = new _StructuresMessage2["default"](data, channel, client);
-							client.emit("messageUpdated", new _StructuresMessage2["default"](msg, channel, client), nmsg);
+						client.emit("messageUpdated", msg, nmsg);
+						if (msg) {
 							channel.messages.update(msg, nmsg);
 						}
 					} else {

lib/Structures/Server.js

@@ -133,12 +133,10 @@ var Server = (function (_Equality) {
 				var presence = _ref;
 
 				var user = client.internal.users.get("id", presence.user.id);
-				if (user) {
 				user.status = presence.status;
 				user.game = presence.game;
 			}
 		}
-		}
 
 		if (data.voice_states) {
 			for (var _iterator2 = data.voice_states, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {

src/Client/InternalClient.js

@@ -150,9 +150,11 @@ export default class InternalClient {
 		this.messageAwaits = {};
 		this.retryAfters = {};
 
+		if (!this.tokenCacher) {
 			this.tokenCacher = new TokenCacher(this.client);
 			this.tokenCacher.init(0);
 		}
+	}
 
 	cleanIntervals() {
 		for (let interval of this.intervals.typing.concat(this.intervals.misc).concat(this.intervals.kai)) {
@@ -176,7 +178,6 @@ export default class InternalClient {
 				if (!this.email && !this.token) {
 					return;
 				}
-				this.setup();
 
 				// Check whether the email is set (if not, only a token has been used for login)
 				this.loginWithToken(this.token, this.email, this.password).catch(() => this.disconnected(true));
@@ -489,6 +490,8 @@ export default class InternalClient {
 	// def loginWithToken
 	// email and password are optional
 	loginWithToken(token, email, password) {
+		this.setup();
+
 		this.state = ConnectionState.LOGGED_IN;
 		this.token = token;
 		this.email = email;
@@ -1591,8 +1594,11 @@ export default class InternalClient {
 							data.content = data.content || msg.content;
 							data.mentions = data.mentions || msg.mentions;
 							data.author = data.author || msg.author;
+							msg = new Message(msg, channel, client);
+						}
 						var nmsg = new Message(data, channel, client);
-							client.emit("messageUpdated", new Message(msg, channel, client), nmsg);
+						client.emit("messageUpdated", msg, nmsg);
+						if (msg) {
 							channel.messages.update(msg, nmsg);
 						}
 					} else {

src/Structures/Server.js

@@ -83,12 +83,10 @@ export default class Server extends Equality {
 		if (data.presences) {
 			for (var presence of data.presences) {
 				var user = client.internal.users.get("id", presence.user.id);
-				if (user) {
 				user.status = presence.status;
 				user.game = presence.game;
 			}
 		}
-		}
 
 		if (data.voice_states) {
 			for (var voiceState of data.voice_states) {