Move heartbeat into gateway

1 files changed, 1 insertions, 17 deletions

diff --git a/pkg/discord/discord.go b/pkg/discord/discord.go
index 837101a..d0f1ad9 100644
--- a/pkg/discord/discord.go
+++ b/pkg/discord/discord.go
@@ -10,7 +10,6 @@ type Discord struct {
 	token        string
 	logger       *zerolog.Logger
 	gateway      Gateway
-	heartbeat    Heartbeat
 	eventHandler EventHandler
 	rest         REST
 }
@@ -21,13 +20,11 @@ func NewClient(token string, logger *zerolog.Logger) *Discord {
 	eventHandler := NewEventHandler()
 	rest := NewREST(token)
 	gateway := NewGateway(logger, eventHandler)
-	heartbeat := NewHeartbeat(logger, gateway)
 
 	return &Discord{
 		token:        token,
 		logger:       logger,
 		gateway:      gateway,
-		heartbeat:    heartbeat,
 		eventHandler: eventHandler,
 		rest:         rest,
 	}
@@ -39,24 +36,11 @@ func (d *Discord) Connect(ctx context.Context) error {
 		return err
 	}
 
-	err = d.gateway.Start(ctx, gatewayURL)
+	err = d.gateway.Start(ctx, gatewayURL, d.token)
 	if err != nil {
 		return err
 	}
 
-	hello, err := d.gateway.Hello()
-	if err != nil {
-		return err
-	}
-
-	d.heartbeat.Start(ctx, hello.HeartbeatInterval)
-
-	if err = d.gateway.Identify(d.token); err != nil {
-		return err
-	}
-
-	go d.gateway.Listen()
-
 	// We are ready!
 	d.eventHandler.Fire(DISCORD_EVENT_READY, nil)