From 94f0aacc0a19de3484040de8ab9ff8daf1b53531 Mon Sep 17 00:00:00 2001
From: Bruce Marriner <bruce@sqls.net>
Date: Sat, 20 Feb 2016 15:19:55 -0600
Subject: [PATCH] websocket heartbeat is now simplier. Closes #121

---
 wsapi.go | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/wsapi.go b/wsapi.go
index 7dc320a..2337916 100644
--- a/wsapi.go
+++ b/wsapi.go
@@ -170,14 +170,11 @@ type heartbeatOp struct {
 	Data int `json:"d"`
 }
 
-func (s *Session) sendHeartbeat(wsConn *websocket.Conn) error {
-	return wsConn.WriteJSON(heartbeatOp{1, int(time.Now().Unix())})
-}
-
 // heartbeat sends regular heartbeats to Discord so it knows the client
 // is still connected.  If you do not send these heartbeats Discord will
 // disconnect the websocket connection after a few seconds.
 func (s *Session) heartbeat(wsConn *websocket.Conn, listening <-chan interface{}, i time.Duration) {
+
 	if listening == nil || wsConn == nil {
 		return
 	}
@@ -186,23 +183,18 @@ func (s *Session) heartbeat(wsConn *websocket.Conn, listening <-chan interface{}
 	s.DataReady = true
 	s.Unlock()
 
-	// Send first heartbeat immediately because lag could put the
-	// first heartbeat outside the required heartbeat interval window.
-	err := s.sendHeartbeat(wsConn)
-	if err != nil {
-		fmt.Println("Error sending initial heartbeat:", err)
-		return
-	}
-
+	var err error
 	ticker := time.NewTicker(i * time.Millisecond)
 	for {
+		err = wsConn.WriteJSON(heartbeatOp{1, int(time.Now().Unix())})
+		if err != nil {
+			fmt.Println("Error sending heartbeat:", err)
+			return
+		}
+
 		select {
 		case <-ticker.C:
-			err := s.sendHeartbeat(wsConn)
-			if err != nil {
-				fmt.Println("Error sending heartbeat:", err)
-				return
-			}
+			// continue loop and send heartbeat
 		case <-listening:
 			return
 		}