Changed internal/ to utils/, allowing external imports

api/api.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/diamondburned/arikawa/api/rate"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 )
 
 const (

api/channel.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
-	"github.com/diamondburned/arikawa/internal/json"
+	"github.com/diamondburned/arikawa/utils/httputil"
+	"github.com/diamondburned/arikawa/utils/json"
 )
 
 const EndpointChannels = Endpoint + "channels/"

api/emoji.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 )
 
 // EmojiAPI is a special format that the API wants.

api/guild.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/diamondburned/arikawa/discord" // for clarity
 	d "github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 )
 
 const EndpointGuilds = Endpoint + "guilds/"

api/invite.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 )
 
 const EndpointInvites = Endpoint + "invites/"

api/login.go

@@ -1,6 +1,6 @@
 package api
 
-import "github.com/diamondburned/arikawa/internal/httputil"
+import "github.com/diamondburned/arikawa/utils/httputil"
 
 const (
 	EndpointAuth  = Endpoint + "auth/"

api/member.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 )
 
 func (c *Client) Member(

api/message.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 )
 
 // Messages gets all mesesages, automatically paginating. Use with care, as

api/message_reaction.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 )
 
 // React adds a reaction to the message. This requires READ_MESSAGE_HISTORY (and

api/message_send.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
-	"github.com/diamondburned/arikawa/internal/json"
+	"github.com/diamondburned/arikawa/utils/httputil"
+	"github.com/diamondburned/arikawa/utils/json"
 	"github.com/pkg/errors"
 )
 

api/role.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 )
 
 func (c *Client) AddRole(guildID, userID, roleID discord.Snowflake) error {

api/user.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 )
 
 const EndpointUsers = Endpoint + "users/"

api/webhook.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 
 	"github.com/diamondburned/arikawa/discord"
-	"github.com/diamondburned/arikawa/internal/httputil"
+	"github.com/diamondburned/arikawa/utils/httputil"
 	"github.com/pkg/errors"
 )
 

gateway/gateway.go

@@ -15,9 +15,9 @@ import (
 	"time"
 
 	"github.com/diamondburned/arikawa/api"
-	"github.com/diamondburned/arikawa/internal/httputil"
-	"github.com/diamondburned/arikawa/internal/json"
-	"github.com/diamondburned/arikawa/internal/wsutil"
+	"github.com/diamondburned/arikawa/utils/httputil"
+	"github.com/diamondburned/arikawa/utils/json"
+	"github.com/diamondburned/arikawa/utils/wsutil"
 	"github.com/pkg/errors"
 )
 

gateway/op.go

@@ -5,8 +5,8 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/diamondburned/arikawa/internal/json"
-	"github.com/diamondburned/arikawa/internal/wsutil"
+	"github.com/diamondburned/arikawa/utils/json"
+	"github.com/diamondburned/arikawa/utils/wsutil"
 	"github.com/pkg/errors"
 )
 

utils/httputil/client.go

@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/diamondburned/arikawa/internal/json"
+	"github.com/diamondburned/arikawa/utils/json"
 )
 
 // Retries is the default attempts to retry if the API returns an error before

utils/httputil/options.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/diamondburned/arikawa/internal/json"
+	"github.com/diamondburned/arikawa/utils/json"
 )
 
 type RequestOption func(*http.Request) error

utils/wsutil/conn.go

@@ -11,7 +11,7 @@ import (
 
 	stderr "errors"
 
-	"github.com/diamondburned/arikawa/internal/json"
+	"github.com/diamondburned/arikawa/utils/json"
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 )

utils/wsutil/ws.go

@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/diamondburned/arikawa/internal/json"
+	"github.com/diamondburned/arikawa/utils/json"
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 	"golang.org/x/time/rate"