From 40e1a3757d5187d6ea2736233440ad0187cd5ecf Mon Sep 17 00:00:00 2001 From: Samuel Hernandez Date: Tue, 1 Jun 2021 22:53:19 -0400 Subject: [PATCH] *: Migrated Go Modules to v3 --- README.md | 20 ++++++++++---------- _example/advanced_bot/bot.go | 10 +++++----- _example/advanced_bot/debug.go | 6 +++--- _example/advanced_bot/main.go | 2 +- _example/buttons/main.go | 10 +++++----- _example/commands/main.go | 8 ++++---- _example/simple/main.go | 4 ++-- _example/undeleter/main.go | 6 +++--- api/api.go | 6 +++--- api/application.go | 4 ++-- api/channel.go | 6 +++--- api/emoji.go | 4 ++-- api/guild.go | 8 ++++---- api/image.go | 2 +- api/integration_test.go | 4 ++-- api/interaction.go | 6 +++--- api/invite.go | 6 +++--- api/login.go | 2 +- api/member.go | 8 ++++---- api/message.go | 8 ++++---- api/message_reaction.go | 6 +++--- api/rate/rate.go | 2 +- api/role.go | 6 +++--- api/send.go | 6 +++--- api/send_test.go | 4 ++-- api/stage.go | 4 ++-- api/user.go | 6 +++--- api/webhook.go | 6 +++--- api/webhook/webhook.go | 14 +++++++------- arikawa.go | 12 ++++++------ bot/command.go | 2 +- bot/ctx.go | 8 ++++---- bot/ctx_call.go | 8 ++++---- bot/ctx_plumb_test.go | 8 ++++---- bot/ctx_test.go | 10 +++++----- bot/extras/arguments/arguments.go | 2 +- bot/extras/arguments/emoji.go | 4 ++-- bot/extras/arguments/link.go | 2 +- bot/extras/arguments/mention.go | 2 +- bot/extras/arguments/mention_test.go | 2 +- bot/extras/infer/infer.go | 2 +- bot/extras/infer/infer_test.go | 2 +- bot/extras/middlewares/middlewares.go | 6 +++--- bot/extras/middlewares/middlewares_test.go | 12 ++++++------ bot/subcommand.go | 2 +- discord/auditlog.go | 2 +- discord/channel.go | 2 +- discord/component.go | 2 +- discord/guild_consts.go | 2 +- discord/message.go | 2 +- gateway/commands.go | 2 +- gateway/events.go | 2 +- gateway/gateway.go | 12 ++++++------ gateway/integration_test.go | 6 +++--- gateway/intents.go | 2 +- gateway/op.go | 4 ++-- gateway/perseverance_test.go | 2 +- gateway/ready.go | 2 +- go.mod | 2 +- internal/handleloop/handleloop.go | 2 +- internal/moreatomic/snowflake.go | 2 +- internal/moreatomic/snowflake_set.go | 2 +- internal/moreatomic/syncmap.go | 2 +- internal/testenv/testenv.go | 2 +- session/session.go | 8 ++++---- state/event_dispatcher.go | 2 +- state/events.go | 2 +- state/state.go | 12 ++++++------ state/state_events.go | 6 +++--- state/store/defaultstore/channel.go | 4 ++-- state/store/defaultstore/defaultstore.go | 2 +- state/store/defaultstore/emoji.go | 6 +++--- state/store/defaultstore/guild.go | 4 ++-- state/store/defaultstore/me.go | 4 ++-- state/store/defaultstore/member.go | 6 +++--- state/store/defaultstore/message.go | 6 +++--- state/store/defaultstore/message_test.go | 2 +- state/store/defaultstore/presence.go | 8 ++++---- state/store/defaultstore/role.go | 6 +++--- state/store/defaultstore/voicestate.go | 6 +++--- state/store/store.go | 4 ++-- utils/handler/handler_test.go | 4 ++-- utils/httputil/client.go | 4 ++-- utils/httputil/driverwrap.go | 2 +- utils/httputil/options.go | 4 ++-- utils/json/option/custom.go | 2 +- utils/sendpart/sendpart.go | 4 ++-- utils/wsutil/heart.go | 2 +- utils/wsutil/op.go | 4 ++-- voice/session.go | 20 ++++++++++---------- voice/session_example_test.go | 8 ++++---- voice/session_test.go | 10 +++++----- voice/voice.go | 2 +- voice/voicegateway/commands.go | 2 +- voice/voicegateway/events.go | 2 +- voice/voicegateway/gateway.go | 8 ++++---- voice/voicegateway/op.go | 4 ++-- 97 files changed, 246 insertions(+), 246 deletions(-) diff --git a/README.md b/README.md index ddf6916..4538bad 100644 --- a/README.md +++ b/README.md @@ -13,15 +13,15 @@ A Golang library for the Discord API. [dgophers]: https://discord.gg/7jSf85J [dgophers_img]: https://img.shields.io/badge/Discord%20Gophers-%23arikawa-%237289da?style=flat-square -[examples]: https://github.com/diamondburned/arikawa/tree/v2/_example +[examples]: https://github.com/diamondburned/arikawa/tree/v3/_example [examples_img]: https://img.shields.io/badge/Example-__example%2F-blueviolet?style=flat-square [pipeline]: https://gitlab.com/diamondburned/arikawa/pipelines -[pipeline_img]: https://gitlab.com/diamondburned/arikawa/badges/v2/pipeline.svg?style=flat-square -[coverage_img]: https://gitlab.com/diamondburned/arikawa/badges/v2/coverage.svg?style=flat-square +[pipeline_img]: https://gitlab.com/diamondburned/arikawa/badges/v3/pipeline.svg?style=flat-square +[coverage_img]: https://gitlab.com/diamondburned/arikawa/badges/v3/coverage.svg?style=flat-square -[pkg.go.dev]: https://pkg.go.dev/github.com/diamondburned/arikawa/v2 -[pkg.go.dev_img]: https://pkg.go.dev/badge/github.com/diamondburned/arikawa/v2 +[pkg.go.dev]: https://pkg.go.dev/github.com/diamondburned/arikawa/v3 +[pkg.go.dev_img]: https://pkg.go.dev/badge/github.com/diamondburned/arikawa/v3 [himeArikawa]: https://hime-goto.fandom.com/wiki/Hime_Arikawa [himeArikawa_img]: https://img.shields.io/badge/Hime-Arikawa-ea75a2?style=flat-square @@ -32,14 +32,14 @@ A Golang library for the Discord API. ## Examples -### [Simple](https://github.com/diamondburned/arikawa/tree/v2/_example/simple) +### [Simple](https://github.com/diamondburned/arikawa/tree/v3/_example/simple) Simple bot example without any state. All it does is logging messages sent into the console. Run with `BOT_TOKEN="TOKEN" go run .`. This example only demonstrates the most simple needs; in most cases, bots should use the state or the bot router. -### [Undeleter](https://github.com/diamondburned/arikawa/tree/v2/_example/undeleter) +### [Undeleter](https://github.com/diamondburned/arikawa/tree/v3/_example/undeleter) A slightly more complicated example. This bot uses a local state to cache everything, including messages. It detects when someone deletes a message, @@ -60,8 +60,8 @@ package main import ( "os" - "github.com/diamondburned/arikawa/v2/bot" - "github.com/diamondburned/arikawa/v2/gateway" + "github.com/diamondburned/arikawa/v3/bot" + "github.com/diamondburned/arikawa/v3/gateway" ) func main() { @@ -81,7 +81,7 @@ func (b *Bot) Ping(*gateway.MessageCreateEvent) (string, error) { } ``` -### [Advanced Bot](https://github.com/diamondburned/arikawa/tree/v2/_example/advanced_bot) +### [Advanced Bot](https://github.com/diamondburned/arikawa/tree/v3/_example/advanced_bot) A complex example demonstrating the reflect-based command router that's built-in. The router turns exported struct methods into commands, its arguments diff --git a/_example/advanced_bot/bot.go b/_example/advanced_bot/bot.go index 2ab53db..5afa57e 100644 --- a/_example/advanced_bot/bot.go +++ b/_example/advanced_bot/bot.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/diamondburned/arikawa/v2/bot" - "github.com/diamondburned/arikawa/v2/bot/extras/arguments" - "github.com/diamondburned/arikawa/v2/bot/extras/middlewares" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" + "github.com/diamondburned/arikawa/v3/bot" + "github.com/diamondburned/arikawa/v3/bot/extras/arguments" + "github.com/diamondburned/arikawa/v3/bot/extras/middlewares" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" ) type Bot struct { diff --git a/_example/advanced_bot/debug.go b/_example/advanced_bot/debug.go index 27120f4..3160642 100644 --- a/_example/advanced_bot/debug.go +++ b/_example/advanced_bot/debug.go @@ -6,9 +6,9 @@ import ( "runtime" "strings" - "github.com/diamondburned/arikawa/v2/bot" - "github.com/diamondburned/arikawa/v2/bot/extras/middlewares" - "github.com/diamondburned/arikawa/v2/gateway" + "github.com/diamondburned/arikawa/v3/bot" + "github.com/diamondburned/arikawa/v3/bot/extras/middlewares" + "github.com/diamondburned/arikawa/v3/gateway" ) // Flag for administrators only. diff --git a/_example/advanced_bot/main.go b/_example/advanced_bot/main.go index 135a834..3493070 100644 --- a/_example/advanced_bot/main.go +++ b/_example/advanced_bot/main.go @@ -6,7 +6,7 @@ import ( "log" "os" - "github.com/diamondburned/arikawa/v2/bot" + "github.com/diamondburned/arikawa/v3/bot" ) // To run, do `BOT_TOKEN="TOKEN HERE" go run .` diff --git a/_example/buttons/main.go b/_example/buttons/main.go index 7e6dd87..0da9e93 100644 --- a/_example/buttons/main.go +++ b/_example/buttons/main.go @@ -4,11 +4,11 @@ import ( "log" "os" - "github.com/diamondburned/arikawa/v2/api" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/session" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/api" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/session" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) // To run, do `APP_ID="APP ID" GUILD_ID="GUILD ID" BOT_TOKEN="TOKEN HERE" go run .` diff --git a/_example/commands/main.go b/_example/commands/main.go index 96352f4..226bbfa 100644 --- a/_example/commands/main.go +++ b/_example/commands/main.go @@ -4,10 +4,10 @@ import ( "log" "os" - "github.com/diamondburned/arikawa/v2/api" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/session" + "github.com/diamondburned/arikawa/v3/api" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/session" ) // To run, do `APP_ID="APP ID" GUILD_ID="GUILD ID" BOT_TOKEN="TOKEN HERE" go run .` diff --git a/_example/simple/main.go b/_example/simple/main.go index b189dfa..bd7c0ab 100644 --- a/_example/simple/main.go +++ b/_example/simple/main.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/session" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/session" ) // To run, do `BOT_TOKEN="TOKEN HERE" go run .` diff --git a/_example/undeleter/main.go b/_example/undeleter/main.go index fc58b28..3c1b0a8 100644 --- a/_example/undeleter/main.go +++ b/_example/undeleter/main.go @@ -5,9 +5,9 @@ import ( "log" "os" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/state" - "github.com/diamondburned/arikawa/v2/utils/handler" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/state" + "github.com/diamondburned/arikawa/v3/utils/handler" ) // To run, do `BOT_TOKEN="TOKEN HERE" go run .` diff --git a/api/api.go b/api/api.go index 20946b4..99d5183 100644 --- a/api/api.go +++ b/api/api.go @@ -6,9 +6,9 @@ import ( "context" "net/http" - "github.com/diamondburned/arikawa/v2/api/rate" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/httputil/httpdriver" + "github.com/diamondburned/arikawa/v3/api/rate" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/httputil/httpdriver" ) var ( diff --git a/api/application.go b/api/application.go index e28b054..2d2ba2b 100644 --- a/api/application.go +++ b/api/application.go @@ -1,8 +1,8 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" ) var EndpointApplications = Endpoint + "applications/" diff --git a/api/channel.go b/api/channel.go index a547fd1..449b941 100644 --- a/api/channel.go +++ b/api/channel.go @@ -1,9 +1,9 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) var EndpointChannels = Endpoint + "channels/" diff --git a/api/emoji.go b/api/emoji.go index 83f8983..6467c31 100644 --- a/api/emoji.go +++ b/api/emoji.go @@ -1,8 +1,8 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" ) // Emojis returns a list of emoji objects for the given guild. diff --git a/api/guild.go b/api/guild.go index 0f21f02..25e2293 100644 --- a/api/guild.go +++ b/api/guild.go @@ -4,10 +4,10 @@ import ( "io" "net/url" - "github.com/diamondburned/arikawa/v2/discord" // for clarity - "github.com/diamondburned/arikawa/v2/internal/intmath" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/discord" // for clarity + "github.com/diamondburned/arikawa/v3/internal/intmath" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) // MaxGuildFetchLimit is the limit of max guilds per request, as imposed by diff --git a/api/image.go b/api/image.go index e9e3f1e..0d94666 100644 --- a/api/image.go +++ b/api/image.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/diamondburned/arikawa/v2/utils/json" + "github.com/diamondburned/arikawa/v3/utils/json" "github.com/pkg/errors" ) diff --git a/api/integration_test.go b/api/integration_test.go index c8940e4..d319846 100644 --- a/api/integration_test.go +++ b/api/integration_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/testenv" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/testenv" ) func TestIntegration(t *testing.T) { diff --git a/api/interaction.go b/api/interaction.go index 0432759..8052173 100644 --- a/api/interaction.go +++ b/api/interaction.go @@ -1,9 +1,9 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) var EndpointInteractions = Endpoint + "interactions/" diff --git a/api/invite.go b/api/invite.go index 64c4684..2435dc6 100644 --- a/api/invite.go +++ b/api/invite.go @@ -1,9 +1,9 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) var EndpointInvites = Endpoint + "invites/" diff --git a/api/login.go b/api/login.go index 0eb3264..9cc0a72 100644 --- a/api/login.go +++ b/api/login.go @@ -1,6 +1,6 @@ package api -import "github.com/diamondburned/arikawa/v2/utils/httputil" +import "github.com/diamondburned/arikawa/v3/utils/httputil" var ( EndpointAuth = Endpoint + "auth/" diff --git a/api/member.go b/api/member.go index d82e678..fc3bb63 100644 --- a/api/member.go +++ b/api/member.go @@ -1,10 +1,10 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/intmath" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/intmath" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) const MaxMemberFetchLimit = 1000 diff --git a/api/message.go b/api/message.go index 0c1d351..e8159f5 100644 --- a/api/message.go +++ b/api/message.go @@ -3,10 +3,10 @@ package api import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/intmath" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/intmath" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) const ( diff --git a/api/message_reaction.go b/api/message_reaction.go index 6aabb59..4b27897 100644 --- a/api/message_reaction.go +++ b/api/message_reaction.go @@ -1,9 +1,9 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/intmath" - "github.com/diamondburned/arikawa/v2/utils/httputil" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/intmath" + "github.com/diamondburned/arikawa/v3/utils/httputil" ) const MaxMessageReactionFetchLimit = 100 diff --git a/api/rate/rate.go b/api/rate/rate.go index 20440ac..1d4d997 100644 --- a/api/rate/rate.go +++ b/api/rate/rate.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" "github.com/pkg/errors" ) diff --git a/api/role.go b/api/role.go index 29c468d..cddb08a 100644 --- a/api/role.go +++ b/api/role.go @@ -1,9 +1,9 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) // Adds a role to a guild member. diff --git a/api/send.go b/api/send.go index f2bd489..bc7dc82 100644 --- a/api/send.go +++ b/api/send.go @@ -5,9 +5,9 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/json/option" - "github.com/diamondburned/arikawa/v2/utils/sendpart" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/json/option" + "github.com/diamondburned/arikawa/v3/utils/sendpart" ) const AttachmentSpoilerPrefix = "SPOILER_" diff --git a/api/send_test.go b/api/send_test.go index 11c863d..26d30ee 100644 --- a/api/send_test.go +++ b/api/send_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/sendpart" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/sendpart" ) func TestMarshalAllowedMentions(t *testing.T) { diff --git a/api/stage.go b/api/stage.go index 8456188..8f2e822 100644 --- a/api/stage.go +++ b/api/stage.go @@ -1,8 +1,8 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" ) var EndpointStageInstances = Endpoint + "stage-instances/" diff --git a/api/user.go b/api/user.go index ef94b17..71f777c 100644 --- a/api/user.go +++ b/api/user.go @@ -1,9 +1,9 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) var ( diff --git a/api/webhook.go b/api/webhook.go index b2c2546..f2cca91 100644 --- a/api/webhook.go +++ b/api/webhook.go @@ -1,9 +1,9 @@ package api import ( - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json/option" ) var EndpointWebhooks = Endpoint + "webhooks/" diff --git a/api/webhook/webhook.go b/api/webhook/webhook.go index ebb292f..03e84c7 100644 --- a/api/webhook/webhook.go +++ b/api/webhook/webhook.go @@ -10,13 +10,13 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/api" - "github.com/diamondburned/arikawa/v2/api/rate" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/httputil/httpdriver" - "github.com/diamondburned/arikawa/v2/utils/json/option" - "github.com/diamondburned/arikawa/v2/utils/sendpart" + "github.com/diamondburned/arikawa/v3/api" + "github.com/diamondburned/arikawa/v3/api/rate" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/httputil/httpdriver" + "github.com/diamondburned/arikawa/v3/utils/json/option" + "github.com/diamondburned/arikawa/v3/utils/sendpart" ) // TODO: if there's ever an Arikawa v3, then a new Client abstraction could be diff --git a/arikawa.go b/arikawa.go index 4d9b203..9bc1c5e 100644 --- a/arikawa.go +++ b/arikawa.go @@ -30,12 +30,12 @@ package arikawa import ( // Packages that most should use. - _ "github.com/diamondburned/arikawa/v2/bot" - _ "github.com/diamondburned/arikawa/v2/session" - _ "github.com/diamondburned/arikawa/v2/state" - _ "github.com/diamondburned/arikawa/v2/voice" + _ "github.com/diamondburned/arikawa/v3/bot" + _ "github.com/diamondburned/arikawa/v3/session" + _ "github.com/diamondburned/arikawa/v3/state" + _ "github.com/diamondburned/arikawa/v3/voice" // Low level packages. - _ "github.com/diamondburned/arikawa/v2/api" - _ "github.com/diamondburned/arikawa/v2/gateway" + _ "github.com/diamondburned/arikawa/v3/api" + _ "github.com/diamondburned/arikawa/v3/gateway" ) diff --git a/bot/command.go b/bot/command.go index 04e5e52..b7f33a7 100644 --- a/bot/command.go +++ b/bot/command.go @@ -3,7 +3,7 @@ package bot import ( "reflect" - "github.com/diamondburned/arikawa/v2/gateway" + "github.com/diamondburned/arikawa/v3/gateway" ) // eventIntents maps event pointer types to intents. diff --git a/bot/ctx.go b/bot/ctx.go index 5f717e9..5811868 100644 --- a/bot/ctx.go +++ b/bot/ctx.go @@ -11,10 +11,10 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/api" - "github.com/diamondburned/arikawa/v2/bot/extras/shellwords" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/state" + "github.com/diamondburned/arikawa/v3/api" + "github.com/diamondburned/arikawa/v3/bot/extras/shellwords" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/state" ) // Prefixer checks a message if it starts with the desired prefix. By default, diff --git a/bot/ctx_call.go b/bot/ctx_call.go index 20b129a..18e04f5 100644 --- a/bot/ctx_call.go +++ b/bot/ctx_call.go @@ -4,10 +4,10 @@ import ( "reflect" "strings" - "github.com/diamondburned/arikawa/v2/api" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/utils/json/option" + "github.com/diamondburned/arikawa/v3/api" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/utils/json/option" "github.com/pkg/errors" ) diff --git a/bot/ctx_plumb_test.go b/bot/ctx_plumb_test.go index 0bde80d..94beb11 100644 --- a/bot/ctx_plumb_test.go +++ b/bot/ctx_plumb_test.go @@ -3,10 +3,10 @@ package bot import ( "testing" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/state" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/state" + "github.com/diamondburned/arikawa/v3/state/store" ) type hasPlumb struct { diff --git a/bot/ctx_test.go b/bot/ctx_test.go index f8bc3f7..9e79bdd 100644 --- a/bot/ctx_test.go +++ b/bot/ctx_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/state" - "github.com/diamondburned/arikawa/v2/state/store" - "github.com/diamondburned/arikawa/v2/utils/handler" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/state" + "github.com/diamondburned/arikawa/v3/state/store" + "github.com/diamondburned/arikawa/v3/utils/handler" ) type testc struct { diff --git a/bot/extras/arguments/arguments.go b/bot/extras/arguments/arguments.go index baa960c..ff4dc18 100644 --- a/bot/extras/arguments/arguments.go +++ b/bot/extras/arguments/arguments.go @@ -3,7 +3,7 @@ package arguments import ( "strings" - "github.com/diamondburned/arikawa/v2/bot" + "github.com/diamondburned/arikawa/v3/bot" ) // Joined implements ManualParseable, in case you want all arguments but diff --git a/bot/extras/arguments/emoji.go b/bot/extras/arguments/emoji.go index 37bea54..7156b61 100644 --- a/bot/extras/arguments/emoji.go +++ b/bot/extras/arguments/emoji.go @@ -4,8 +4,8 @@ import ( "errors" "regexp" - "github.com/diamondburned/arikawa/v2/api/rate" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/api/rate" + "github.com/diamondburned/arikawa/v3/discord" ) var ( diff --git a/bot/extras/arguments/link.go b/bot/extras/arguments/link.go index f6683f7..2e7a01c 100644 --- a/bot/extras/arguments/link.go +++ b/bot/extras/arguments/link.go @@ -4,7 +4,7 @@ import ( "errors" "regexp" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) // (empty) so it matches standard links diff --git a/bot/extras/arguments/mention.go b/bot/extras/arguments/mention.go index a3bbc75..30a426f 100644 --- a/bot/extras/arguments/mention.go +++ b/bot/extras/arguments/mention.go @@ -4,7 +4,7 @@ import ( "errors" "regexp" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) var ( diff --git a/bot/extras/arguments/mention_test.go b/bot/extras/arguments/mention_test.go index 620d779..1148636 100644 --- a/bot/extras/arguments/mention_test.go +++ b/bot/extras/arguments/mention_test.go @@ -3,7 +3,7 @@ package arguments import ( "testing" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) func TestChannelMention(t *testing.T) { diff --git a/bot/extras/infer/infer.go b/bot/extras/infer/infer.go index 383008f..960a031 100644 --- a/bot/extras/infer/infer.go +++ b/bot/extras/infer/infer.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) // ChannelID looks for fields with name ChannelID, Channel, or in some special diff --git a/bot/extras/infer/infer_test.go b/bot/extras/infer/infer_test.go index 6e7aa22..b5ddffc 100644 --- a/bot/extras/infer/infer_test.go +++ b/bot/extras/infer/infer_test.go @@ -3,7 +3,7 @@ package infer import ( "testing" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) type hasID struct { diff --git a/bot/extras/middlewares/middlewares.go b/bot/extras/middlewares/middlewares.go index 7288b32..c7ed650 100644 --- a/bot/extras/middlewares/middlewares.go +++ b/bot/extras/middlewares/middlewares.go @@ -1,9 +1,9 @@ package middlewares import ( - "github.com/diamondburned/arikawa/v2/bot" - "github.com/diamondburned/arikawa/v2/bot/extras/infer" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/bot" + "github.com/diamondburned/arikawa/v3/bot/extras/infer" + "github.com/diamondburned/arikawa/v3/discord" ) func AdminOnly(ctx *bot.Context) func(interface{}) error { diff --git a/bot/extras/middlewares/middlewares_test.go b/bot/extras/middlewares/middlewares_test.go index 780917f..04e06d4 100644 --- a/bot/extras/middlewares/middlewares_test.go +++ b/bot/extras/middlewares/middlewares_test.go @@ -4,12 +4,12 @@ import ( "errors" "testing" - "github.com/diamondburned/arikawa/v2/bot" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/session" - "github.com/diamondburned/arikawa/v2/state" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/bot" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/session" + "github.com/diamondburned/arikawa/v3/state" + "github.com/diamondburned/arikawa/v3/state/store" ) func TestAdminOnly(t *testing.T) { diff --git a/bot/subcommand.go b/bot/subcommand.go index 808dfcb..3e16ac5 100644 --- a/bot/subcommand.go +++ b/bot/subcommand.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/gateway" + "github.com/diamondburned/arikawa/v3/gateway" ) var ( diff --git a/discord/auditlog.go b/discord/auditlog.go index 774dc50..a814494 100644 --- a/discord/auditlog.go +++ b/discord/auditlog.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/utils/json" + "github.com/diamondburned/arikawa/v3/utils/json" ) // https://discord.com/developers/docs/resources/audit-log#audit-log-object diff --git a/discord/channel.go b/discord/channel.go index 3c407ee..9f63bc1 100644 --- a/discord/channel.go +++ b/discord/channel.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/diamondburned/arikawa/v2/utils/json" + "github.com/diamondburned/arikawa/v3/utils/json" ) // Channel represents a guild or DM channel within Discord. diff --git a/discord/component.go b/discord/component.go index 684c2b7..7e027cd 100644 --- a/discord/component.go +++ b/discord/component.go @@ -3,7 +3,7 @@ package discord import ( "errors" - "github.com/diamondburned/arikawa/v2/utils/json" + "github.com/diamondburned/arikawa/v3/utils/json" ) var ErrNestedActionRow = errors.New("action row cannot have action row as a child") diff --git a/discord/guild_consts.go b/discord/guild_consts.go index 1cb2d0c..ca75c3e 100644 --- a/discord/guild_consts.go +++ b/discord/guild_consts.go @@ -1,7 +1,7 @@ package discord import ( - "github.com/diamondburned/arikawa/v2/utils/json/enum" + "github.com/diamondburned/arikawa/v3/utils/json/enum" ) // Guild.MaxPresences is this value when it's 0. diff --git a/discord/message.go b/discord/message.go index f27935e..5a7dfaa 100644 --- a/discord/message.go +++ b/discord/message.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/diamondburned/arikawa/v2/utils/json/enum" + "github.com/diamondburned/arikawa/v3/utils/json/enum" ) // https://discord.com/developers/docs/resources/channel#message-object diff --git a/gateway/commands.go b/gateway/commands.go index aedefe4..469273b 100644 --- a/gateway/commands.go +++ b/gateway/commands.go @@ -3,7 +3,7 @@ package gateway import ( "context" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" "github.com/pkg/errors" ) diff --git a/gateway/events.go b/gateway/events.go index 7b3fbb4..8857463 100644 --- a/gateway/events.go +++ b/gateway/events.go @@ -1,6 +1,6 @@ package gateway -import "github.com/diamondburned/arikawa/v2/discord" +import "github.com/diamondburned/arikawa/v3/discord" // Rules: VOICE_STATE_UPDATE -> VoiceStateUpdateEvent diff --git a/gateway/gateway.go b/gateway/gateway.go index b10a9ed..a48ea26 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -15,12 +15,12 @@ import ( "sync" "time" - "github.com/diamondburned/arikawa/v2/api" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json" - "github.com/diamondburned/arikawa/v2/utils/wsutil" + "github.com/diamondburned/arikawa/v3/api" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json" + "github.com/diamondburned/arikawa/v3/utils/wsutil" "github.com/gorilla/websocket" "github.com/pkg/errors" ) diff --git a/gateway/integration_test.go b/gateway/integration_test.go index ec9e8e3..c99310d 100644 --- a/gateway/integration_test.go +++ b/gateway/integration_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/diamondburned/arikawa/v2/internal/heart" - "github.com/diamondburned/arikawa/v2/internal/testenv" - "github.com/diamondburned/arikawa/v2/utils/wsutil" + "github.com/diamondburned/arikawa/v3/internal/heart" + "github.com/diamondburned/arikawa/v3/internal/testenv" + "github.com/diamondburned/arikawa/v3/utils/wsutil" ) func init() { diff --git a/gateway/intents.go b/gateway/intents.go index 6c6f79f..6414ba9 100644 --- a/gateway/intents.go +++ b/gateway/intents.go @@ -1,6 +1,6 @@ package gateway -import "github.com/diamondburned/arikawa/v2/discord" +import "github.com/diamondburned/arikawa/v3/discord" // Intents for the new Discord API feature, documented at // https://discord.com/developers/docs/topics/gateway#gateway-intents. diff --git a/gateway/op.go b/gateway/op.go index c381262..617d3cb 100644 --- a/gateway/op.go +++ b/gateway/op.go @@ -6,8 +6,8 @@ import ( "math/rand" "time" - "github.com/diamondburned/arikawa/v2/utils/json" - "github.com/diamondburned/arikawa/v2/utils/wsutil" + "github.com/diamondburned/arikawa/v3/utils/json" + "github.com/diamondburned/arikawa/v3/utils/wsutil" "github.com/pkg/errors" ) diff --git a/gateway/perseverance_test.go b/gateway/perseverance_test.go index 7815216..b7f1995 100644 --- a/gateway/perseverance_test.go +++ b/gateway/perseverance_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/diamondburned/arikawa/v2/internal/testenv" + "github.com/diamondburned/arikawa/v3/internal/testenv" ) func TestPerseverance(t *testing.T) { diff --git a/gateway/ready.go b/gateway/ready.go index 3cb537c..af00313 100644 --- a/gateway/ready.go +++ b/gateway/ready.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) type ( diff --git a/go.mod b/go.mod index 6d8e5e6..6d94969 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/diamondburned/arikawa/v2 +module github.com/diamondburned/arikawa/v3 go 1.13 diff --git a/internal/handleloop/handleloop.go b/internal/handleloop/handleloop.go index 11cecff..d545ed1 100644 --- a/internal/handleloop/handleloop.go +++ b/internal/handleloop/handleloop.go @@ -2,7 +2,7 @@ // channels and passing them onto event handlers. package handleloop -import "github.com/diamondburned/arikawa/v2/utils/handler" +import "github.com/diamondburned/arikawa/v3/utils/handler" // Loop provides a reusable event looper abstraction. It is thread-safe to use // concurrently. diff --git a/internal/moreatomic/snowflake.go b/internal/moreatomic/snowflake.go index f4197b0..3e1b410 100644 --- a/internal/moreatomic/snowflake.go +++ b/internal/moreatomic/snowflake.go @@ -3,7 +3,7 @@ package moreatomic import ( "sync/atomic" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) type Snowflake int64 diff --git a/internal/moreatomic/snowflake_set.go b/internal/moreatomic/snowflake_set.go index f78cc2c..938eb0d 100644 --- a/internal/moreatomic/snowflake_set.go +++ b/internal/moreatomic/snowflake_set.go @@ -3,7 +3,7 @@ package moreatomic import ( "sync" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) type SnowflakeSet struct { diff --git a/internal/moreatomic/syncmap.go b/internal/moreatomic/syncmap.go index 481892c..b6aef39 100644 --- a/internal/moreatomic/syncmap.go +++ b/internal/moreatomic/syncmap.go @@ -3,7 +3,7 @@ package moreatomic import ( "sync/atomic" - "github.com/diamondburned/arikawa/v2/internal/moreatomic/syncmod" + "github.com/diamondburned/arikawa/v3/internal/moreatomic/syncmod" ) // Map is a thread-safe map that is a wrapper around sync.Map with slight API diff --git a/internal/testenv/testenv.go b/internal/testenv/testenv.go index 1864feb..7c2da27 100644 --- a/internal/testenv/testenv.go +++ b/internal/testenv/testenv.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" "github.com/pkg/errors" ) diff --git a/session/session.go b/session/session.go index 2238a13..b6f320a 100644 --- a/session/session.go +++ b/session/session.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/api" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/internal/handleloop" - "github.com/diamondburned/arikawa/v2/utils/handler" + "github.com/diamondburned/arikawa/v3/api" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/internal/handleloop" + "github.com/diamondburned/arikawa/v3/utils/handler" ) var ErrMFA = errors.New("account has 2FA enabled") diff --git a/state/event_dispatcher.go b/state/event_dispatcher.go index 5248257..d0571e0 100644 --- a/state/event_dispatcher.go +++ b/state/event_dispatcher.go @@ -1,7 +1,7 @@ package state import ( - "github.com/diamondburned/arikawa/v2/gateway" + "github.com/diamondburned/arikawa/v3/gateway" ) func (s *State) handleReady(ev *gateway.ReadyEvent) { diff --git a/state/events.go b/state/events.go index 59c6c78..8052b0f 100644 --- a/state/events.go +++ b/state/events.go @@ -1,6 +1,6 @@ package state -import "github.com/diamondburned/arikawa/v2/gateway" +import "github.com/diamondburned/arikawa/v3/gateway" // events that originated from GuildCreate: type ( diff --git a/state/state.go b/state/state.go index 4f5da2c..e93b192 100644 --- a/state/state.go +++ b/state/state.go @@ -6,12 +6,12 @@ import ( "context" "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/session" - "github.com/diamondburned/arikawa/v2/state/store" - "github.com/diamondburned/arikawa/v2/state/store/defaultstore" - "github.com/diamondburned/arikawa/v2/utils/handler" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/session" + "github.com/diamondburned/arikawa/v3/state/store" + "github.com/diamondburned/arikawa/v3/state/store/defaultstore" + "github.com/diamondburned/arikawa/v3/utils/handler" "github.com/pkg/errors" ) diff --git a/state/state_events.go b/state/state_events.go index ba856f4..85bbece 100644 --- a/state/state_events.go +++ b/state/state_events.go @@ -3,9 +3,9 @@ package state import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/state/store" ) func (s *State) hookSession() { diff --git a/state/store/defaultstore/channel.go b/state/store/defaultstore/channel.go index 93dfcb4..e11ab67 100644 --- a/state/store/defaultstore/channel.go +++ b/state/store/defaultstore/channel.go @@ -4,8 +4,8 @@ import ( "errors" "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/state/store" ) type Channel struct { diff --git a/state/store/defaultstore/defaultstore.go b/state/store/defaultstore/defaultstore.go index 556d79b..3638fa0 100644 --- a/state/store/defaultstore/defaultstore.go +++ b/state/store/defaultstore/defaultstore.go @@ -2,7 +2,7 @@ // state values in memory. package defaultstore -import "github.com/diamondburned/arikawa/v2/state/store" +import "github.com/diamondburned/arikawa/v3/state/store" // New creates a new cabinet instance of defaultstore. For Message, it creates a // Message store with a limit of 100 messages. diff --git a/state/store/defaultstore/emoji.go b/state/store/defaultstore/emoji.go index fa09e0c..6de9ac8 100644 --- a/state/store/defaultstore/emoji.go +++ b/state/store/defaultstore/emoji.go @@ -3,9 +3,9 @@ package defaultstore import ( "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/state/store" ) type Emoji struct { diff --git a/state/store/defaultstore/guild.go b/state/store/defaultstore/guild.go index 0046ae4..0ffbbdc 100644 --- a/state/store/defaultstore/guild.go +++ b/state/store/defaultstore/guild.go @@ -3,8 +3,8 @@ package defaultstore import ( "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/state/store" ) type Guild struct { diff --git a/state/store/defaultstore/me.go b/state/store/defaultstore/me.go index 53e1a12..28cf319 100644 --- a/state/store/defaultstore/me.go +++ b/state/store/defaultstore/me.go @@ -3,8 +3,8 @@ package defaultstore import ( "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/state/store" ) type Me struct { diff --git a/state/store/defaultstore/member.go b/state/store/defaultstore/member.go index d4b686a..1379e47 100644 --- a/state/store/defaultstore/member.go +++ b/state/store/defaultstore/member.go @@ -3,9 +3,9 @@ package defaultstore import ( "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/state/store" ) type Member struct { diff --git a/state/store/defaultstore/message.go b/state/store/defaultstore/message.go index ece745d..8b02f21 100644 --- a/state/store/defaultstore/message.go +++ b/state/store/defaultstore/message.go @@ -3,9 +3,9 @@ package defaultstore import ( "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/state/store" ) type Message struct { diff --git a/state/store/defaultstore/message_test.go b/state/store/defaultstore/message_test.go index 51c139d..2e9b47a 100644 --- a/state/store/defaultstore/message_test.go +++ b/state/store/defaultstore/message_test.go @@ -3,7 +3,7 @@ package defaultstore import ( "testing" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) func populate12Store() *Message { diff --git a/state/store/defaultstore/presence.go b/state/store/defaultstore/presence.go index fd73a85..e396f79 100644 --- a/state/store/defaultstore/presence.go +++ b/state/store/defaultstore/presence.go @@ -3,10 +3,10 @@ package defaultstore import ( "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/state/store" ) type Presence struct { diff --git a/state/store/defaultstore/role.go b/state/store/defaultstore/role.go index c62ce59..e859c24 100644 --- a/state/store/defaultstore/role.go +++ b/state/store/defaultstore/role.go @@ -3,9 +3,9 @@ package defaultstore import ( "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/state/store" ) type Role struct { diff --git a/state/store/defaultstore/voicestate.go b/state/store/defaultstore/voicestate.go index d76f084..8997e0b 100644 --- a/state/store/defaultstore/voicestate.go +++ b/state/store/defaultstore/voicestate.go @@ -3,9 +3,9 @@ package defaultstore import ( "sync" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/state/store" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/state/store" ) type VoiceState struct { diff --git a/state/store/store.go b/state/store/store.go index bab1a34..b3d8ceb 100644 --- a/state/store/store.go +++ b/state/store/store.go @@ -37,8 +37,8 @@ import ( "errors" "fmt" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" ) // ErrNotFound is an error that a store can use to return when something isn't diff --git a/utils/handler/handler_test.go b/utils/handler/handler_test.go index 440cab9..3a6ba9f 100644 --- a/utils/handler/handler_test.go +++ b/utils/handler/handler_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" ) func newMessage(content string) *gateway.MessageCreateEvent { diff --git a/utils/httputil/client.go b/utils/httputil/client.go index e532611..b9674ee 100644 --- a/utils/httputil/client.go +++ b/utils/httputil/client.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/utils/httputil/httpdriver" - "github.com/diamondburned/arikawa/v2/utils/json" + "github.com/diamondburned/arikawa/v3/utils/httputil/httpdriver" + "github.com/diamondburned/arikawa/v3/utils/json" ) // StatusTooManyRequests is the HTTP status code discord sends on rate-limiting. diff --git a/utils/httputil/driverwrap.go b/utils/httputil/driverwrap.go index 02d37ba..c059e09 100644 --- a/utils/httputil/driverwrap.go +++ b/utils/httputil/driverwrap.go @@ -3,7 +3,7 @@ package httputil import ( "io" - "github.com/diamondburned/arikawa/v2/utils/httputil/httpdriver" + "github.com/diamondburned/arikawa/v3/utils/httputil/httpdriver" ) // This file contains mistakes. diff --git a/utils/httputil/options.go b/utils/httputil/options.go index 0126420..166912c 100644 --- a/utils/httputil/options.go +++ b/utils/httputil/options.go @@ -5,8 +5,8 @@ import ( "net/http" "net/url" - "github.com/diamondburned/arikawa/v2/utils/httputil/httpdriver" - "github.com/diamondburned/arikawa/v2/utils/json" + "github.com/diamondburned/arikawa/v3/utils/httputil/httpdriver" + "github.com/diamondburned/arikawa/v3/utils/json" ) type RequestOption func(httpdriver.Request) error diff --git a/utils/json/option/custom.go b/utils/json/option/custom.go index 656f915..0698b41 100644 --- a/utils/json/option/custom.go +++ b/utils/json/option/custom.go @@ -3,7 +3,7 @@ package option import ( "strconv" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) // ================================ Seconds ================================ diff --git a/utils/sendpart/sendpart.go b/utils/sendpart/sendpart.go index 1b3fbcb..569a4da 100644 --- a/utils/sendpart/sendpart.go +++ b/utils/sendpart/sendpart.go @@ -6,8 +6,8 @@ import ( "net/url" "strconv" - "github.com/diamondburned/arikawa/v2/utils/httputil" - "github.com/diamondburned/arikawa/v2/utils/json" + "github.com/diamondburned/arikawa/v3/utils/httputil" + "github.com/diamondburned/arikawa/v3/utils/json" "github.com/pkg/errors" ) diff --git a/utils/wsutil/heart.go b/utils/wsutil/heart.go index 025ba58..c44fa9e 100644 --- a/utils/wsutil/heart.go +++ b/utils/wsutil/heart.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/internal/heart" + "github.com/diamondburned/arikawa/v3/internal/heart" ) type errBrokenConnection struct { diff --git a/utils/wsutil/op.go b/utils/wsutil/op.go index 6ec4564..b0f8d29 100644 --- a/utils/wsutil/op.go +++ b/utils/wsutil/op.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/utils/json" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/utils/json" ) var ErrEmptyPayload = errors.New("empty payload") diff --git a/voice/session.go b/voice/session.go index a82cb66..70287b1 100644 --- a/voice/session.go +++ b/voice/session.go @@ -5,19 +5,19 @@ import ( "sync" "time" - "github.com/diamondburned/arikawa/v2/state" - "github.com/diamondburned/arikawa/v2/utils/handler" + "github.com/diamondburned/arikawa/v3/state" + "github.com/diamondburned/arikawa/v3/utils/handler" "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/gateway" - "github.com/diamondburned/arikawa/v2/internal/handleloop" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/session" - "github.com/diamondburned/arikawa/v2/utils/wsutil" - "github.com/diamondburned/arikawa/v2/voice/udp" - "github.com/diamondburned/arikawa/v2/voice/voicegateway" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/gateway" + "github.com/diamondburned/arikawa/v3/internal/handleloop" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/session" + "github.com/diamondburned/arikawa/v3/utils/wsutil" + "github.com/diamondburned/arikawa/v3/voice/udp" + "github.com/diamondburned/arikawa/v3/voice/voicegateway" ) // Protocol is the encryption protocol that this library uses. diff --git a/voice/session_example_test.go b/voice/session_example_test.go index 3c287cf..5f6a066 100644 --- a/voice/session_example_test.go +++ b/voice/session_example_test.go @@ -5,10 +5,10 @@ import ( "log" "testing" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/testenv" - "github.com/diamondburned/arikawa/v2/state" - "github.com/diamondburned/arikawa/v2/voice" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/testenv" + "github.com/diamondburned/arikawa/v3/state" + "github.com/diamondburned/arikawa/v3/voice" ) var ( diff --git a/voice/session_test.go b/voice/session_test.go index 17bf46e..3ccfa42 100644 --- a/voice/session_test.go +++ b/voice/session_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/testenv" - "github.com/diamondburned/arikawa/v2/state" - "github.com/diamondburned/arikawa/v2/utils/wsutil" - "github.com/diamondburned/arikawa/v2/voice/voicegateway" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/testenv" + "github.com/diamondburned/arikawa/v3/state" + "github.com/diamondburned/arikawa/v3/utils/wsutil" + "github.com/diamondburned/arikawa/v3/voice/voicegateway" "github.com/pkg/errors" ) diff --git a/voice/voice.go b/voice/voice.go index 631491b..3a3a60c 100644 --- a/voice/voice.go +++ b/voice/voice.go @@ -4,7 +4,7 @@ // This package abstracts the subpackage voice/voicesession and voice/udp. package voice -import "github.com/diamondburned/arikawa/v2/gateway" +import "github.com/diamondburned/arikawa/v3/gateway" // AddIntents adds the needed voice intents into gw. Bots should always call // this before Open if voice is required. diff --git a/voice/voicegateway/commands.go b/voice/voicegateway/commands.go index 6dde406..98c2781 100644 --- a/voice/voicegateway/commands.go +++ b/voice/voicegateway/commands.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" "github.com/pkg/errors" ) diff --git a/voice/voicegateway/events.go b/voice/voicegateway/events.go index 58d0c52..726ba1a 100644 --- a/voice/voicegateway/events.go +++ b/voice/voicegateway/events.go @@ -3,7 +3,7 @@ package voicegateway import ( "strconv" - "github.com/diamondburned/arikawa/v2/discord" + "github.com/diamondburned/arikawa/v3/discord" ) // OPCode 2 diff --git a/voice/voicegateway/gateway.go b/voice/voicegateway/gateway.go index 565ebc4..6050dfb 100644 --- a/voice/voicegateway/gateway.go +++ b/voice/voicegateway/gateway.go @@ -17,10 +17,10 @@ import ( "github.com/pkg/errors" - "github.com/diamondburned/arikawa/v2/discord" - "github.com/diamondburned/arikawa/v2/internal/moreatomic" - "github.com/diamondburned/arikawa/v2/utils/json" - "github.com/diamondburned/arikawa/v2/utils/wsutil" + "github.com/diamondburned/arikawa/v3/discord" + "github.com/diamondburned/arikawa/v3/internal/moreatomic" + "github.com/diamondburned/arikawa/v3/utils/json" + "github.com/diamondburned/arikawa/v3/utils/wsutil" ) const ( diff --git a/voice/voicegateway/op.go b/voice/voicegateway/op.go index 0e351d7..45ffd97 100644 --- a/voice/voicegateway/op.go +++ b/voice/voicegateway/op.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/diamondburned/arikawa/v2/utils/json" - "github.com/diamondburned/arikawa/v2/utils/wsutil" + "github.com/diamondburned/arikawa/v3/utils/json" + "github.com/diamondburned/arikawa/v3/utils/wsutil" "github.com/pkg/errors" )