move private pkgs to internal pkg

scott-mitchell · Oct 6, 2019 · f6973fc · f6973fc
1 parent e1e489c
commit f6973fc
Show file tree

Hide file tree

Showing 110 changed files with 248 additions and 248 deletions.
diff --git a/auditlog.go b/auditlog.go
@@ -3,10 +3,10 @@ package disgord
 import (
 	"net/http"
 
-	"github.com/andersfylling/disgord/constant"
-	"github.com/andersfylling/disgord/endpoint"
-	"github.com/andersfylling/disgord/httd"
-	"github.com/andersfylling/disgord/ratelimit"
+	"github.com/andersfylling/disgord/internal/constant"
+	"github.com/andersfylling/disgord/internal/endpoint"
+	"github.com/andersfylling/disgord/internal/httd"
+	"github.com/andersfylling/disgord/internal/ratelimit"
 )
 
 type AuditLogEvt uint

diff --git a/auditlog_test.go b/auditlog_test.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/andersfylling/disgord/endpoint"
-	"github.com/andersfylling/disgord/httd"
-	"github.com/andersfylling/disgord/ratelimit"
+	"github.com/andersfylling/disgord/internal/endpoint"
+	"github.com/andersfylling/disgord/internal/httd"
+	"github.com/andersfylling/disgord/internal/ratelimit"
 )
 
 func TestAuditLogConvertAuditLogParamsToStr(t *testing.T) {

diff --git a/cache.go b/cache.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"time"
 
-	"github.com/andersfylling/disgord/crs"
+	"github.com/andersfylling/disgord/internal/crs"
 
-	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/disgord/internal/httd"
 )
 
 type cacheRegistry uint

diff --git a/channel.go b/channel.go
@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/andersfylling/disgord/endpoint"
-	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/disgord/internal/endpoint"
+	"github.com/andersfylling/disgord/internal/httd"
 
-	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/internal/constant"
 )
 
 // Channel types

diff --git a/channel_test.go b/channel_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/disgord/internal/httd"
 )
 
 func TestChannel_DeepCopy(t *testing.T) {

diff --git a/client.go b/client.go
@@ -12,14 +12,14 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/andersfylling/disgord/logger"
-	"github.com/andersfylling/disgord/websocket"
+	"github.com/andersfylling/disgord/internal/logger"
+	"github.com/andersfylling/disgord/internal/websocket"
 
-	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/internal/constant"
 	"golang.org/x/net/proxy"
 
-	"github.com/andersfylling/disgord/event"
-	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/disgord/internal/event"
+	"github.com/andersfylling/disgord/internal/httd"
 )
 
 // NewRESTClient creates a Client for sending and handling Discord protocols such as rate limiting

diff --git a/client_test.go b/client_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/andersfylling/disgord/websocket"
+	"github.com/andersfylling/disgord/internal/websocket"
 )
 
 //////////////////////////////////////////////////////

diff --git a/cmd/bot-REST-tester/main.go b/cmd/bot-REST-tester/main.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/internal/constant"
 
 	"github.com/andersfylling/disgord"
 )

diff --git a/cmd/bots/middleware/middleware.go b/cmd/bots/middleware/middleware.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/andersfylling/disgord"
-	"github.com/andersfylling/disgord/event"
+	"github.com/andersfylling/disgord/internal/event"
 )
 
 func filterTestPrefix(evt interface{}) (ret interface{}) {

diff --git a/cmd/bots/reaction-ratelimit/main.go b/cmd/bots/reaction-ratelimit/main.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/andersfylling/disgord"
-	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/internal/constant"
 )
 
 type keys struct {

diff --git a/disgord.go b/disgord.go
@@ -186,9 +186,9 @@ package disgord
 import (
 	"fmt"
 
-	"github.com/andersfylling/disgord/depalias"
+	"github.com/andersfylling/disgord/internal/depalias"
 
-	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/internal/constant"
 )
 
 // LibraryInfo returns name + version

diff --git a/disgord_test.go b/disgord_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/andersfylling/disgord/websocket"
+	"github.com/andersfylling/disgord/internal/websocket"
 )
 
 func injectRandomEvents(t *testing.T, callback func(name string, evt interface{}) error) {

diff --git a/embed.go b/embed.go
@@ -1,7 +1,7 @@
 package disgord
 
 import (
-	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/internal/constant"
 )
 
 // limitations: https://discordapp.com/developers/docs/resources/channel#embed-limits

diff --git a/emoji.go b/emoji.go
@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/andersfylling/disgord/constant"
-	"github.com/andersfylling/disgord/endpoint"
-	"github.com/andersfylling/disgord/httd"
-	"github.com/andersfylling/disgord/ratelimit"
+	"github.com/andersfylling/disgord/internal/constant"
+	"github.com/andersfylling/disgord/internal/endpoint"
+	"github.com/andersfylling/disgord/internal/httd"
+	"github.com/andersfylling/disgord/internal/ratelimit"
 )
 
 func validEmojiName(name string) bool {

diff --git a/events.go b/events.go
@@ -9,7 +9,7 @@ import (
 	"encoding/json"
 	"sync"
 
-	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/disgord/internal/httd"
 )
 
 // Resource represents a discord event.

diff --git a/events_gen.go b/events_gen.go
diff --git a/gateway_commands.go b/gateway_commands.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/andersfylling/disgord/websocket"
+	"github.com/andersfylling/disgord/internal/websocket"
 
-	"github.com/andersfylling/disgord/websocket/cmd"
+	"github.com/andersfylling/disgord/internal/websocket/cmd"
 )
 
 // gatewayCmdName is the gateway command name for the payload to be sent to Discord over a websocket connection.

diff --git a/generate/discorddocs/main.go b/generate/discorddocs/main.go
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/internal/constant"
 
 	"github.com/gocolly/colly"
 )

diff --git a/guild.go b/guild.go
@@ -9,10 +9,10 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/andersfylling/disgord/endpoint"
-	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/disgord/internal/endpoint"
+	"github.com/andersfylling/disgord/internal/httd"
 
-	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/internal/constant"
 )
 
 // NOTE! Credit for defining the Permission consts in a clean way goes to DiscordGo.

diff --git a/guild_test.go b/guild_test.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/disgord/internal/httd"
 )
 
 func TestGuildMarshal(t *testing.T) {

diff --git a/constant/communication.go → internal/constant/communication.go b/constant/communication.go → internal/constant/communication.go
diff --git a/constant/disgord.go → internal/constant/disgord.go b/constant/disgord.go → internal/constant/disgord.go
diff --git a/constant/locking.go → internal/constant/locking.go b/constant/locking.go → internal/constant/locking.go
diff --git a/constant/locking_parallelism.go → internal/constant/locking_parallelism.go b/constant/locking_parallelism.go → internal/constant/locking_parallelism.go
diff --git a/constant/testing.go → internal/constant/testing.go b/constant/testing.go → internal/constant/testing.go
diff --git a/constant/version.go → internal/constant/version.go b/constant/version.go → internal/constant/version.go
diff --git a/crs/benchmarks_test.go → internal/crs/benchmarks_test.go b/crs/benchmarks_test.go → internal/crs/benchmarks_test.go
diff --git a/crs/crs.go → internal/crs/crs.go b/crs/crs.go → internal/crs/crs.go
@@ -2,6 +2,6 @@
 
 package crs
 
-import "github.com/andersfylling/disgord/depalias"
+import "github.com/andersfylling/disgord/internal/depalias"
 
 type Snowflake = depalias.Snowflake
diff --git a/crs/diff-go1.12-to-go1.13.txt → internal/crs/diff-go1.12-to-go1.13.txt b/crs/diff-go1.12-to-go1.13.txt → internal/crs/diff-go1.12-to-go1.13.txt
diff --git a/crs/diff-interface-to-native-go1.12.txt → ...l/crs/diff-interface-to-native-go1.12.txt b/crs/diff-interface-to-native-go1.12.txt → ...l/crs/diff-interface-to-native-go1.12.txt
diff --git a/crs/lfu.go → internal/crs/lfu.go b/crs/lfu.go → internal/crs/lfu.go
diff --git a/crs/lfu_item.go → internal/crs/lfu_item.go b/crs/lfu_item.go → internal/crs/lfu_item.go
diff --git a/crs/lfu_test.go → internal/crs/lfu_test.go b/crs/lfu_test.go → internal/crs/lfu_test.go
diff --git a/crs/results-interface.txt → internal/crs/results-interface.txt b/crs/results-interface.txt → internal/crs/results-interface.txt
diff --git a/crs/results-native-go1.12.txt → internal/crs/results-native-go1.12.txt b/crs/results-native-go1.12.txt → internal/crs/results-native-go1.12.txt
diff --git a/crs/results-native-go1.13.txt → internal/crs/results-native-go1.13.txt b/crs/results-native-go1.13.txt → internal/crs/results-native-go1.13.txt
diff --git a/crs/run-benchmarks.sh → internal/crs/run-benchmarks.sh b/crs/run-benchmarks.sh → internal/crs/run-benchmarks.sh
diff --git a/depalias/snowflake.go → internal/depalias/snowflake.go b/depalias/snowflake.go → internal/depalias/snowflake.go
diff --git a/endpoint/auditlog.go → internal/endpoint/auditlog.go b/endpoint/auditlog.go → internal/endpoint/auditlog.go
diff --git a/endpoint/channels.go → internal/endpoint/channels.go b/endpoint/channels.go → internal/endpoint/channels.go
diff --git a/endpoint/emoji.go → internal/endpoint/emoji.go b/endpoint/emoji.go → internal/endpoint/emoji.go
diff --git a/endpoint/endpoint.go → internal/endpoint/endpoint.go b/endpoint/endpoint.go → internal/endpoint/endpoint.go
diff --git a/endpoint/guild.go → internal/endpoint/guild.go b/endpoint/guild.go → internal/endpoint/guild.go
diff --git a/endpoint/invites.go → internal/endpoint/invites.go b/endpoint/invites.go → internal/endpoint/invites.go
diff --git a/endpoint/user.go → internal/endpoint/user.go b/endpoint/user.go → internal/endpoint/user.go
diff --git a/endpoint/voice.go → internal/endpoint/voice.go b/endpoint/voice.go → internal/endpoint/voice.go
diff --git a/endpoint/webhook.go → internal/endpoint/webhook.go b/endpoint/webhook.go → internal/endpoint/webhook.go
diff --git a/endpoint/websocket.go → internal/endpoint/websocket.go b/endpoint/websocket.go → internal/endpoint/websocket.go
diff --git a/event/events.go → internal/event/events.go b/event/events.go → internal/event/events.go
diff --git a/httd/client.go → internal/httd/client.go b/httd/client.go → internal/httd/client.go
diff --git a/httd/client_test.go → internal/httd/client_test.go b/httd/client_test.go → internal/httd/client_test.go
diff --git a/httd/json_iter.go → internal/httd/json_iter.go b/httd/json_iter.go → internal/httd/json_iter.go
diff --git a/httd/json_std.go → internal/httd/json_std.go b/httd/json_std.go → internal/httd/json_std.go
diff --git a/httd/ratelimit.go → internal/httd/ratelimit.go b/httd/ratelimit.go → internal/httd/ratelimit.go
diff --git a/httd/ratelimit_test.go → internal/httd/ratelimit_test.go b/httd/ratelimit_test.go → internal/httd/ratelimit_test.go
diff --git a/logger/logger.go → internal/logger/logger.go b/logger/logger.go → internal/logger/logger.go
diff --git a/logger/zapwrap.go → internal/logger/zapwrap.go b/logger/zapwrap.go → internal/logger/zapwrap.go
@@ -3,7 +3,7 @@ package logger
 import (
 	"fmt"
 
-	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/internal/constant"
 	"go.uber.org/zap"
 )
 

diff --git a/ratelimit/ratelimits.go → internal/ratelimit/ratelimits.go b/ratelimit/ratelimits.go → internal/ratelimit/ratelimits.go
@@ -1,10 +1,10 @@
 package ratelimit
 
 import (
-	"github.com/andersfylling/disgord/depalias"
+	depalias2 "github.com/andersfylling/disgord/internal/depalias"
 )
 
-type Snowflake = depalias.Snowflake
+type Snowflake = depalias2.Snowflake
 
 func GetB() *b {
 	return &b{}

diff --git a/websocket/client.go → internal/websocket/client.go b/websocket/client.go → internal/websocket/client.go
@@ -10,13 +10,13 @@ import (
 	"sync"
 	"time"
 
-	"go.uber.org/atomic"
+	httd2 "github.com/andersfylling/disgord/internal/httd"
+	opcode2 "github.com/andersfylling/disgord/internal/websocket/opcode"
 
-	"github.com/andersfylling/disgord/httd"
+	"go.uber.org/atomic"
 
-	"github.com/andersfylling/disgord/logger"
+	"github.com/andersfylling/disgord/internal/logger"
 
-	"github.com/andersfylling/disgord/websocket/opcode"
 	"golang.org/x/net/proxy"
 )
 
@@ -405,7 +405,7 @@ func (c *client) queueRequest(command string, data CmdPayload) (err error) {
 	}
 
 	op := CmdNameToOpCode(command, c.clientType)
-	if op == opcode.None {
+	if op == opcode2.None {
 		return errors.New("unsupported command: " + command)
 	}
 
@@ -583,7 +583,7 @@ func (c *client) receiver(ctx context.Context) {
 		evt := c.poolDiscordPkt.Get().(*DiscordPacket)
 		evt.reset()
 		//err = evt.UnmarshalJSON(packet) // custom unmarshal
-		if err = httd.Unmarshal(packet, evt); err != nil {
+		if err = httd2.Unmarshal(packet, evt); err != nil {
 			c.log.Error(c.getLogPrefix(), err, "ERRONEOUS PACKET CONTENT:", string(packet))
 			cancel() // sometimes a CDN or some VPN might send a HTML string..
 			continue

diff --git a/websocket/cmd/event.go → internal/websocket/cmd/event.go b/websocket/cmd/event.go → internal/websocket/cmd/event.go
diff --git a/websocket/cmd/voice.go → internal/websocket/cmd/voice.go b/websocket/cmd/voice.go → internal/websocket/cmd/voice.go
diff --git a/websocket/diagnose_false.go → internal/websocket/diagnose_false.go b/websocket/diagnose_false.go → internal/websocket/diagnose_false.go
diff --git a/websocket/diagnose_true.go → internal/websocket/diagnose_true.go b/websocket/diagnose_true.go → internal/websocket/diagnose_true.go
diff --git a/websocket/event/event.go → internal/websocket/event/event.go b/websocket/event/event.go → internal/websocket/event/event.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ import ( @@
     	"sync"
     	"time"
-    	"github.com/andersfylling/disgord/constant"
+    	"github.com/andersfylling/disgord/internal/constant"
     	"github.com/gocolly/colly"
     )
@@ Expand Down @@