diff --git a/misc.go b/misc.go index 804724d7e..bb99f2c42 100644 --- a/misc.go +++ b/misc.go @@ -18,8 +18,6 @@ import ( "strconv" "strings" "time" - - "github.com/slack-go/slack/internal/misc" ) // SlackResponse handles parsing out errors from the web api. @@ -299,7 +297,7 @@ func checkStatusCode(resp *http.Response, d Debug) error { // Slack seems to send an HTML body along with 5xx error codes. Don't parse it. if resp.StatusCode != http.StatusOK { logResponse(resp, d) - return misc.StatusCodeError{Code: resp.StatusCode, Status: resp.Status} + return StatusCodeError{Code: resp.StatusCode, Status: resp.Status} } return nil diff --git a/misc_test.go b/misc_test.go index 4dd2a6378..637cb77fb 100644 --- a/misc_test.go +++ b/misc_test.go @@ -8,8 +8,6 @@ import ( "sync" "testing" - "github.com/slack-go/slack/internal/misc" - "github.com/slack-go/slack/slackutilsx" ) @@ -94,8 +92,8 @@ func TestParseResponseInvalidToken(t *testing.T) { func TestRetryable(t *testing.T) { for _, e := range []error{ &RateLimitedError{}, - misc.StatusCodeError{Code: http.StatusInternalServerError}, - misc.StatusCodeError{Code: http.StatusTooManyRequests}, + StatusCodeError{Code: http.StatusInternalServerError}, + StatusCodeError{Code: http.StatusTooManyRequests}, } { r, ok := e.(slackutilsx.Retryable) if !ok { diff --git a/socketmode/socket_mode_managed_conn.go b/socketmode/socket_mode_managed_conn.go index 7caad5b4f..428999732 100644 --- a/socketmode/socket_mode_managed_conn.go +++ b/socketmode/socket_mode_managed_conn.go @@ -15,7 +15,6 @@ import ( "github.com/slack-go/slack" "github.com/slack-go/slack/internal/backoff" - "github.com/slack-go/slack/internal/misc" "github.com/slack-go/slack/internal/timex" "github.com/slack-go/slack/slackevents" ) @@ -213,7 +212,7 @@ func (smc *Client) connect(ctx context.Context, connectionCount int, additionalP } switch actual := err.(type) { - case misc.StatusCodeError: + case slack.StatusCodeError: if actual.Code == http.StatusNotFound { smc.Debugf("invalid auth when connecting with Socket Mode: %s", err) smc.Events <- newEvent(EventTypeInvalidAuth, &slack.InvalidAuthEvent{}) diff --git a/internal/misc/misc.go b/status_code_error.go similarity index 97% rename from internal/misc/misc.go rename to status_code_error.go index eab8cdd8c..7347137aa 100644 --- a/internal/misc/misc.go +++ b/status_code_error.go @@ -1,4 +1,4 @@ -package misc +package slack import ( "fmt" diff --git a/websocket_managed_conn.go b/websocket_managed_conn.go index 92536171f..1da5c91b1 100644 --- a/websocket_managed_conn.go +++ b/websocket_managed_conn.go @@ -13,7 +13,6 @@ import ( "github.com/slack-go/slack/internal/backoff" "github.com/slack-go/slack/internal/errorsx" - "github.com/slack-go/slack/internal/misc" "github.com/slack-go/slack/internal/timex" ) @@ -127,7 +126,7 @@ func (rtm *RTM) connect(connectionCount int, useRTMStart bool) (*Info, *websocke } switch actual := err.(type) { - case misc.StatusCodeError: + case StatusCodeError: if actual.Code == http.StatusNotFound { rtm.Debugf("invalid auth when connecting with RTM: %s", err) rtm.IncomingEvents <- RTMEvent{"invalid_auth", &InvalidAuthEvent{}}