From be12849668c0508d9286cb035603d502b9f81640 Mon Sep 17 00:00:00 2001 From: "diamondburned (Forefront)" Date: Wed, 8 Apr 2020 19:28:40 -0700 Subject: [PATCH] Changed internal/ to utils/, allowing external imports --- api/api.go | 2 +- api/channel.go | 4 ++-- api/emoji.go | 2 +- api/guild.go | 2 +- api/invite.go | 2 +- api/login.go | 2 +- api/member.go | 2 +- api/message.go | 2 +- api/message_reaction.go | 2 +- api/message_send.go | 4 ++-- api/role.go | 2 +- api/user.go | 2 +- api/webhook.go | 2 +- gateway/gateway.go | 6 +++--- gateway/op.go | 4 ++-- {internal => utils}/httputil/client.go | 2 +- {internal => utils}/httputil/errors.go | 0 {internal => utils}/httputil/http.go | 0 {internal => utils}/httputil/options.go | 2 +- {internal => utils}/httputil/schema.go | 0 {internal => utils}/json/json.go | 0 {internal => utils}/wsutil/conn.go | 2 +- {internal => utils}/wsutil/throttler.go | 0 {internal => utils}/wsutil/ws.go | 2 +- {internal => utils}/zlib/flate.go | 0 {internal => utils}/zlib/zlib.go | 0 26 files changed, 24 insertions(+), 24 deletions(-) rename {internal => utils}/httputil/client.go (98%) rename {internal => utils}/httputil/errors.go (100%) rename {internal => utils}/httputil/http.go (100%) rename {internal => utils}/httputil/options.go (96%) rename {internal => utils}/httputil/schema.go (100%) rename {internal => utils}/json/json.go (100%) rename {internal => utils}/wsutil/conn.go (99%) rename {internal => utils}/wsutil/throttler.go (100%) rename {internal => utils}/wsutil/ws.go (97%) rename {internal => utils}/zlib/flate.go (100%) rename {internal => utils}/zlib/zlib.go (100%) diff --git a/api/api.go b/api/api.go index d7d7ac7..aa1f9ab 100644 --- a/api/api.go +++ b/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 ( diff --git a/api/channel.go b/api/channel.go index 183adc8..e2c6364 100644 --- a/api/channel.go +++ b/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/" diff --git a/api/emoji.go b/api/emoji.go index 696049e..1cd3782 100644 --- a/api/emoji.go +++ b/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. diff --git a/api/guild.go b/api/guild.go index 46ef9ff..4797dc9 100644 --- a/api/guild.go +++ b/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/" diff --git a/api/invite.go b/api/invite.go index e869fac..0bc3189 100644 --- a/api/invite.go +++ b/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/" diff --git a/api/login.go b/api/login.go index ad72071..b28415e 100644 --- a/api/login.go +++ b/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/" diff --git a/api/member.go b/api/member.go index 6209773..4ec4401 100644 --- a/api/member.go +++ b/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( diff --git a/api/message.go b/api/message.go index 197e7b5..cdec488 100644 --- a/api/message.go +++ b/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 diff --git a/api/message_reaction.go b/api/message_reaction.go index 953e656..81c3342 100644 --- a/api/message_reaction.go +++ b/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 diff --git a/api/message_send.go b/api/message_send.go index 613a4ba..a532dbe 100644 --- a/api/message_send.go +++ b/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" ) diff --git a/api/role.go b/api/role.go index 28a2f75..54dcaea 100644 --- a/api/role.go +++ b/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 { diff --git a/api/user.go b/api/user.go index c0694bc..243b942 100644 --- a/api/user.go +++ b/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/" diff --git a/api/webhook.go b/api/webhook.go index 2939867..df63e2c 100644 --- a/api/webhook.go +++ b/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" ) diff --git a/gateway/gateway.go b/gateway/gateway.go index 1865c7a..2d545e0 100644 --- a/gateway/gateway.go +++ b/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" ) diff --git a/gateway/op.go b/gateway/op.go index 3e6c8ef..3a625eb 100644 --- a/gateway/op.go +++ b/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" ) diff --git a/internal/httputil/client.go b/utils/httputil/client.go similarity index 98% rename from internal/httputil/client.go rename to utils/httputil/client.go index bd9460c..73653bd 100644 --- a/internal/httputil/client.go +++ b/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 diff --git a/internal/httputil/errors.go b/utils/httputil/errors.go similarity index 100% rename from internal/httputil/errors.go rename to utils/httputil/errors.go diff --git a/internal/httputil/http.go b/utils/httputil/http.go similarity index 100% rename from internal/httputil/http.go rename to utils/httputil/http.go diff --git a/internal/httputil/options.go b/utils/httputil/options.go similarity index 96% rename from internal/httputil/options.go rename to utils/httputil/options.go index bb86ba8..7d93b0c 100644 --- a/internal/httputil/options.go +++ b/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 diff --git a/internal/httputil/schema.go b/utils/httputil/schema.go similarity index 100% rename from internal/httputil/schema.go rename to utils/httputil/schema.go diff --git a/internal/json/json.go b/utils/json/json.go similarity index 100% rename from internal/json/json.go rename to utils/json/json.go diff --git a/internal/wsutil/conn.go b/utils/wsutil/conn.go similarity index 99% rename from internal/wsutil/conn.go rename to utils/wsutil/conn.go index 1f8df41..524d48f 100644 --- a/internal/wsutil/conn.go +++ b/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" ) diff --git a/internal/wsutil/throttler.go b/utils/wsutil/throttler.go similarity index 100% rename from internal/wsutil/throttler.go rename to utils/wsutil/throttler.go diff --git a/internal/wsutil/ws.go b/utils/wsutil/ws.go similarity index 97% rename from internal/wsutil/ws.go rename to utils/wsutil/ws.go index 2677c6c..41f30ef 100644 --- a/internal/wsutil/ws.go +++ b/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" diff --git a/internal/zlib/flate.go b/utils/zlib/flate.go similarity index 100% rename from internal/zlib/flate.go rename to utils/zlib/flate.go diff --git a/internal/zlib/zlib.go b/utils/zlib/zlib.go similarity index 100% rename from internal/zlib/zlib.go rename to utils/zlib/zlib.go