From 2000b62b36d92f10f23faada661732ffa1b50c38 Mon Sep 17 00:00:00 2001
From: Amish Shah <amishshah.2k@gmail.com>
Date: Fri, 1 Jan 2016 18:27:08 +0000
Subject: [PATCH] fixed references to update items

---
 docs/docs_user.rst     | 2 ++
 lib/Structures/User.js | 5 +++++
 lib/Util/Cache.js      | 3 ++-
 src/Structures/User.js | 4 ++++
 src/Util/Cache.js      | 3 ++-
 test/msgbot.js         | 4 ++++
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/docs/docs_user.rst b/docs/docs_user.rst
index 3baa047bf..6702618b4 100644
--- a/docs/docs_user.rst
+++ b/docs/docs_user.rst
@@ -20,6 +20,8 @@ The Client_ that created the user.
 username
 ~~~~~~~~
 
+_Alias_ : ``name``
+
 `String`, username of the User.
 
 discriminator
diff --git a/lib/Structures/User.js b/lib/Structures/User.js
index 49733ed36..685ab6b49 100644
--- a/lib/Structures/User.js
+++ b/lib/Structures/User.js
@@ -104,6 +104,11 @@ var User = (function (_Equality) {
 				return _Constants.Endpoints.AVATAR(this.id, this.avatar);
 			}
 		}
+	}, {
+		key: "name",
+		get: function get() {
+			return this.username;
+		}
 	}]);
 
 	return User;
diff --git a/lib/Util/Cache.js b/lib/Util/Cache.js
index f2eeb711d..8374938e7 100644
--- a/lib/Util/Cache.js
+++ b/lib/Util/Cache.js
@@ -74,9 +74,10 @@ var Cache = (function (_Array) {
 
 	Cache.prototype.update = function update(old, data) {
 		var item = this.get(this[discrimS], old[this[discrimS]]);
+
 		if (item) {
 			var index = this.indexOf(item);
-			this[index] = data;
+			Object.assign(this[index], data);
 			this[discrimCacheS][data[this[discrimS]]] = this[index];
 			return this[index];
 		} else {
diff --git a/src/Structures/User.js b/src/Structures/User.js
index d18511233..732293d85 100644
--- a/src/Structures/User.js
+++ b/src/Structures/User.js
@@ -29,6 +29,10 @@ export default class User extends Equality{
 		}
 	}
 
+	get name() {
+		return this.username;
+	}
+
 	mention(){
 		return `<@${this.id}>`;
 	}
diff --git a/src/Util/Cache.js b/src/Util/Cache.js
index 68187d7e9..8791f3632 100644
--- a/src/Util/Cache.js
+++ b/src/Util/Cache.js
@@ -52,9 +52,10 @@ export default class Cache extends Array {
 
 	update(old, data) {
 		var item = this.get(this[discrimS], old[this[discrimS]]);
+
 		if (item) {
 			var index = this.indexOf(item);
-			this[index] = data;
+			Object.assign(this[index], data);
 			this[discrimCacheS][data[this[discrimS]]] = this[index];
 			return this[index];
 		} else {
diff --git a/test/msgbot.js b/test/msgbot.js
index 41e236890..d2116642a 100644
--- a/test/msgbot.js
+++ b/test/msgbot.js
@@ -48,6 +48,10 @@ client.on("message", msg => {
 		}
 	}
 
+	if (msg.content === "what is my name") {
+		msg.reply(msg.channel.server.members.get("id", msg.sender.id));
+	}
+
 	if(msg.content === "replyme"){
 		msg.reply("hi");
 	}