migan/discordmuffin
1
0
Fork 0
forked from pothtonswer/discordmuffin
Code Pull requests Activity

Make update status a little more idiomatic.

Browse source 
This also reduces the line count a smidge.
This commit is contained in:
Chris Rhodes 2015-12-28 19:05:42 -08:00
parent bb4f63775e
commit 974d5862a4
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
wsapi.go
View file

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