From 974d5862a448eee2c96a5aa012e8eb1557bf55a3 Mon Sep 17 00:00:00 2001
From: Chris Rhodes <iopred@gmail.com>
Date: Mon, 28 Dec 2015 19:05:42 -0800
Subject: [PATCH] Make update status a little more idiomatic.

This also reduces the line count a smidge.
---
 wsapi.go | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/wsapi.go b/wsapi.go
index 7fb5f9b..127080d 100644
--- a/wsapi.go
+++ b/wsapi.go
@@ -60,12 +60,12 @@ func (s *Session) Handshake() (err error) {
 }
 
 type updateStatusGame struct {
-	Name string `json:"name"`
+	Name *string `json:"name"`
 }
 
 type updateStatusData struct {
-	IdleSince json.Token  `json:"idle_since"`
-	Game      interface{} `json:"game"`
+	IdleSince *int             `json:"idle_since"`
+	Game      updateStatusGame `json:"game"`
 }
 
 type updateStatusOp struct {
@@ -80,17 +80,10 @@ func (s *Session) UpdateStatus(idle int, game string) (err error) {
 
 	var usd updateStatusData
 	if idle > 0 {
-		usd.IdleSince = idle
-	} else {
-		usd.IdleSince = nil
+		usd.IdleSince = &idle
 	}
-
-	var usg updateStatusGame
-	if game == "" {
-		usd.Game = nil
-	} else {
-		usg.Name = game
-		usd.Game = usg
+	if game != "" {
+		usd.Game.Name = &game
 	}
 
 	data := updateStatusOp{3, usd}