Suppor string game updates and better setStatus logic

ref/colours.js

@@ -28,13 +28,13 @@ exports.toDec = function (data) {
     var hextest = /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i;
 
     var num;
-    
+
     if(!data)
         return 0;
 
     if (hextest.test(data)) {
         // it's a hex number with a # in front
-        
+
         // there's a bug in discord as of 28/10/15, where any
         // hex colors beginning with a 0 do not render properly.
         // this is a temporary fix, and it does mean that you won't
@@ -44,7 +44,7 @@ exports.toDec = function (data) {
             tdata[1] = 1;
             data = tdata.join("");
         }
-        
+
         num = parseInt(data.substr(1), 16).toString(10);
     } else if (hextest.test("#" + data)) {
         // it's a hex number with no # in front
@@ -57,14 +57,14 @@ exports.toDec = function (data) {
     } else {
         num = data.toString(10);
     }
-    
+
     return parseInt(num);
 }
 
 exports.toHex = function (data) {
 
     var text = data.toString(16);
-    
+
     while(text.length < 6){
         text = "0" + text;
     }

src/Client/InternalClient.js

@@ -824,31 +824,33 @@ export default class InternalClient {
 	}
 
 	//def setStatus
-	setStatus(idleStatus, gameID) {
+	setStatus(idleStatus, game) {
 
-		this.idleStatus = idleStatus || this.idleStatus || null;
-		if(idleStatus){
-			if(idleStatus === "online" || idleStatus === "here" || idleStatus === "available"){
-				this.idleStatus = null;
-			}
+		if(idleStatus === "online" || idleStatus === "here" || idleStatus === "available"){
+			this.idleStatus = null;
 		}
-		this.gameID = this.resolver.resolveGameID(gameID) || this.gameID || null;
+		else if (this.idleStatus === "idle" || this.idleStatus === "away") {
+			packet.d.idle_since = Date.now();
+		}
+		else {
+			this.idleStatus = this.idleStatus || null; //undefineds
+		}
+
+		this.game = game === null ? null : game || this.game;
 
 		var packet = {
 			op: 3,
 			d: {
 				idle_since: this.idleStatus,
-				game_id: this.gameID
+				game: {
+					name: this.game
+				}
 			}
 		};
 
-		if (this.idleStatus === "idle" || this.idleStatus === "away") {
-			packet.d.idle_since = Date.now();
-		}
-
 		this.sendWS(packet);
 
-		return Promise.resolve();//why?
+		return Promise.resolve();
 
 	}
 

src/Client/Resolver/Resolver.js

@@ -12,28 +12,12 @@ import PMChannel from "../../Structures/PMChannel";
 import Server from "../../Structures/Server";
 import Message from "../../Structures/Message";
 import Invite from "../../Structures/Invite";
-import Games from "../../../ref/gameMap";
 
 export default class Resolver {
 	constructor(internal) {
 		this.internal = internal;
 	}
 
-	resolveGameID(resource) {
-		if (!isNaN(resource) && parseInt(resource) % 1 === 0) {
-			return resource;
-		}
-		if (typeof resource === "string" || resource instanceof String) {
-			var gameName = resource.toLowerCase();
-			var found = Games.find(game => game.name.toLowerCase() === gameName);
-			if(found) {
-				return found.id;
-			}
-		}
-
-		return null;
-	}
-
 	resolveToBase64(resource) {
 		if (resource instanceof Buffer) {
 			resource = resource.toString("base64");