Merge branch 'Voice'

src/webpage/message.ts

@@ -429,6 +429,11 @@ class Message extends SnowFlake{
 				author.bind(minipfp, this.guild);
 				username.textContent = author.username;
 				author.bind(username, this.guild);
+				Member.resolveMember(author, this.guild).then(_=>{
+					if(_){
+						username.textContent=_.name;
+					}
+				})
 			});
 			reply.onclick = _=>{
 				// TODO: FIX this
@@ -467,6 +472,11 @@ class Message extends SnowFlake{
 				const username = document.createElement("span");
 				username.classList.add("username");
 				this.author.bind(username, this.guild);
+				Member.resolveMember(this.author, this.guild).then(_=>{
+					if(_){
+						username.textContent=_.name;
+					}
+				})
 				div.classList.add("topMessage");
 				username.textContent = this.author.username;
 				const userwrap = document.createElement("div");

src/webpage/user.ts

@@ -449,6 +449,7 @@ class User extends SnowFlake{
 		if(guild){
 			Member.resolveMember(this, guild).then(member=>{
 				if(!member)return;
+				usernamehtml.textContent=member.name;
 				const roles = document.createElement("div");
 				roles.classList.add("flexltr","rolesbox");
 				for(const role of member.roles){