From 32789bb6e23049b16bdd0fe86991dc75cddc975f Mon Sep 17 00:00:00 2001
From: Maximilian von Lindern <48887425+mavolin@users.noreply.github.com>
Date: Wed, 29 Jul 2020 22:10:48 +0200
Subject: [PATCH] *: Separate utils and internal (#129)

* Utils: move package utils/heart to internal/heart

* Utils: move package utils/moreatomic to internal/moreatomic

* Utils: move package utils/zlib to internal/zlib
---
 api/rate/rate.go                                | 3 ++-
 {utils => internal}/heart/heart.go              | 0
 {utils => internal}/moreatomic/bool.go          | 0
 {utils => internal}/moreatomic/guildid_set.go   | 0
 {utils => internal}/moreatomic/mutex.go         | 0
 {utils => internal}/moreatomic/serial.go        | 0
 {utils => internal}/moreatomic/snowflake.go     | 0
 {utils => internal}/moreatomic/snowflake_set.go | 0
 {utils => internal}/moreatomic/string.go        | 0
 {utils => internal}/moreatomic/time.go          | 0
 {utils => internal}/zlib/flate.go               | 0
 {utils => internal}/zlib/zlib.go                | 0
 state/state.go                                  | 2 +-
 utils/wsutil/heart.go                           | 5 +++--
 utils/wsutil/op.go                              | 5 +++--
 voice/session.go                                | 5 +++--
 voice/voicegateway/gateway.go                   | 9 +++++----
 17 files changed, 17 insertions(+), 12 deletions(-)
 rename {utils => internal}/heart/heart.go (100%)
 rename {utils => internal}/moreatomic/bool.go (100%)
 rename {utils => internal}/moreatomic/guildid_set.go (100%)
 rename {utils => internal}/moreatomic/mutex.go (100%)
 rename {utils => internal}/moreatomic/serial.go (100%)
 rename {utils => internal}/moreatomic/snowflake.go (100%)
 rename {utils => internal}/moreatomic/snowflake_set.go (100%)
 rename {utils => internal}/moreatomic/string.go (100%)
 rename {utils => internal}/moreatomic/time.go (100%)
 rename {utils => internal}/zlib/flate.go (100%)
 rename {utils => internal}/zlib/zlib.go (100%)

diff --git a/api/rate/rate.go b/api/rate/rate.go
index da1773d..7e950bf 100644
--- a/api/rate/rate.go
+++ b/api/rate/rate.go
@@ -9,8 +9,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/diamondburned/arikawa/utils/moreatomic"
 	"github.com/pkg/errors"
+
+	"github.com/diamondburned/arikawa/internal/moreatomic"
 )
 
 // ExtraDelay because Discord is trash. I've seen this in both litcord and
diff --git a/utils/heart/heart.go b/internal/heart/heart.go
similarity index 100%
rename from utils/heart/heart.go
rename to internal/heart/heart.go
diff --git a/utils/moreatomic/bool.go b/internal/moreatomic/bool.go
similarity index 100%
rename from utils/moreatomic/bool.go
rename to internal/moreatomic/bool.go
diff --git a/utils/moreatomic/guildid_set.go b/internal/moreatomic/guildid_set.go
similarity index 100%
rename from utils/moreatomic/guildid_set.go
rename to internal/moreatomic/guildid_set.go
diff --git a/utils/moreatomic/mutex.go b/internal/moreatomic/mutex.go
similarity index 100%
rename from utils/moreatomic/mutex.go
rename to internal/moreatomic/mutex.go
diff --git a/utils/moreatomic/serial.go b/internal/moreatomic/serial.go
similarity index 100%
rename from utils/moreatomic/serial.go
rename to internal/moreatomic/serial.go
diff --git a/utils/moreatomic/snowflake.go b/internal/moreatomic/snowflake.go
similarity index 100%
rename from utils/moreatomic/snowflake.go
rename to internal/moreatomic/snowflake.go
diff --git a/utils/moreatomic/snowflake_set.go b/internal/moreatomic/snowflake_set.go
similarity index 100%
rename from utils/moreatomic/snowflake_set.go
rename to internal/moreatomic/snowflake_set.go
diff --git a/utils/moreatomic/string.go b/internal/moreatomic/string.go
similarity index 100%
rename from utils/moreatomic/string.go
rename to internal/moreatomic/string.go
diff --git a/utils/moreatomic/time.go b/internal/moreatomic/time.go
similarity index 100%
rename from utils/moreatomic/time.go
rename to internal/moreatomic/time.go
diff --git a/utils/zlib/flate.go b/internal/zlib/flate.go
similarity index 100%
rename from utils/zlib/flate.go
rename to internal/zlib/flate.go
diff --git a/utils/zlib/zlib.go b/internal/zlib/zlib.go
similarity index 100%
rename from utils/zlib/zlib.go
rename to internal/zlib/zlib.go
diff --git a/state/state.go b/state/state.go
index 3e12c6e..c7f7e60 100644
--- a/state/state.go
+++ b/state/state.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/diamondburned/arikawa/discord"
 	"github.com/diamondburned/arikawa/gateway"
+	"github.com/diamondburned/arikawa/internal/moreatomic"
 	"github.com/diamondburned/arikawa/session"
 	"github.com/diamondburned/arikawa/utils/handler"
-	"github.com/diamondburned/arikawa/utils/moreatomic"
 
 	"github.com/pkg/errors"
 )
diff --git a/utils/wsutil/heart.go b/utils/wsutil/heart.go
index 0a782b9..348e1ba 100644
--- a/utils/wsutil/heart.go
+++ b/utils/wsutil/heart.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/diamondburned/arikawa/utils/heart"
-	"github.com/diamondburned/arikawa/utils/moreatomic"
 	"github.com/pkg/errors"
+
+	"github.com/diamondburned/arikawa/internal/heart"
+	"github.com/diamondburned/arikawa/internal/moreatomic"
 )
 
 // TODO API
diff --git a/utils/wsutil/op.go b/utils/wsutil/op.go
index 6ccb31a..510cef1 100644
--- a/utils/wsutil/op.go
+++ b/utils/wsutil/op.go
@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/diamondburned/arikawa/utils/json"
-	"github.com/diamondburned/arikawa/utils/moreatomic"
 	"github.com/pkg/errors"
+
+	"github.com/diamondburned/arikawa/internal/moreatomic"
+	"github.com/diamondburned/arikawa/utils/json"
 )
 
 var ErrEmptyPayload = errors.New("empty payload")
diff --git a/voice/session.go b/voice/session.go
index 264c86f..59a2b3a 100644
--- a/voice/session.go
+++ b/voice/session.go
@@ -5,14 +5,15 @@ import (
 	"sync"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/diamondburned/arikawa/discord"
 	"github.com/diamondburned/arikawa/gateway"
+	"github.com/diamondburned/arikawa/internal/moreatomic"
 	"github.com/diamondburned/arikawa/session"
-	"github.com/diamondburned/arikawa/utils/moreatomic"
 	"github.com/diamondburned/arikawa/utils/wsutil"
 	"github.com/diamondburned/arikawa/voice/udp"
 	"github.com/diamondburned/arikawa/voice/voicegateway"
-	"github.com/pkg/errors"
 )
 
 const Protocol = "xsalsa20_poly1305"
diff --git a/voice/voicegateway/gateway.go b/voice/voicegateway/gateway.go
index a786965..76dac4b 100644
--- a/voice/voicegateway/gateway.go
+++ b/voice/voicegateway/gateway.go
@@ -15,11 +15,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/utils/json"
-	"github.com/diamondburned/arikawa/utils/moreatomic"
-	"github.com/diamondburned/arikawa/utils/wsutil"
 	"github.com/pkg/errors"
+
+	"github.com/diamondburned/arikawa/discord"
+	"github.com/diamondburned/arikawa/internal/moreatomic"
+	"github.com/diamondburned/arikawa/utils/json"
+	"github.com/diamondburned/arikawa/utils/wsutil"
 )
 
 const (