Skip to content

Commit 50e01f9

Browse files
tystuyfzandtystuyfzand
committed
Update to Arikawa v3
1 parent 73f1488 commit 50e01f9

File tree

10 files changed

+20
-34
lines changed

10 files changed

+20
-34
lines changed

‎arguments/parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package arguments
22

3-
import "github.com/diamondburned/arikawa/v2/bot/extras/shellwords"
3+
import "github.com/diamondburned/arikawa/v3/bot/extras/shellwords"
44

55
// Parse parses a command argument string using a Space Tokenizer
66
func Parse(command string) []string {

‎examples/basic/main.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package main
22

33
import (
4+
"context"
45
"flag"
5-
"github.com/diamondburned/arikawa/v2/gateway"
6-
"github.com/diamondburned/arikawa/v2/state"
6+
"github.com/diamondburned/arikawa/v3/gateway"
7+
"github.com/diamondburned/arikawa/v3/state"
78
"log"
89
"meow.tf/astral/arguments"
910
"meow.tf/astral/middleware"
@@ -83,7 +84,7 @@ func main() {
8384
}).Alias("alias")
8485
})
8586

86-
err = s.Open()
87+
err = s.Open(context.Background())
8788

8889
if err != nil {
8990
log.Fatalln("Unable to connect to Discord:", err)

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module meow.tf/astral
33
go 1.13
44

55
require (
6-
github.com/diamondburned/arikawa/v2 v2.0.6
6+
github.com/diamondburned/arikawa/v3 v3.0.0-20210627000400-d4c66d497105
77
github.com/diamondburned/timedmap v0.0.0-20200510234918-a50f7ffba1d8
88
github.com/tmdvs/Go-Emoji-Utils v1.1.0
99
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e

‎go.sum

+2-17
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
github.com/diamondburned/arikawa/v2 v2.0.0-20201103183545-d8ccaf78c329 h1:c+vdkpyuSlUD4tdVGAbmP3gc19R6juOsCGbjp/9oAHE=
2-
github.com/diamondburned/arikawa/v2 v2.0.0-20201103183545-d8ccaf78c329/go.mod h1:33ra6kX2wK4dSeTD/3hjg1ZSOVQ3GJy4e9GJ7hPMJsk=
3-
github.com/diamondburned/arikawa/v2 v2.0.0-20210101074829-c6d8c741e883 h1:LKBqjbyw8V4V/UijEL4Re9/mr0had/rOvzqeF+9PsyY=
4-
github.com/diamondburned/arikawa/v2 v2.0.0-20210101074829-c6d8c741e883/go.mod h1:e+lhS20ni2luFEU06Pc8paCxgZL99/RZb77dOC82CF0=
5-
github.com/diamondburned/arikawa/v2 v2.0.0 h1:DGdDDFgDsHFpr3Z2pZWuJ5yLGTr66jdIX+ohbjEmzt8=
6-
github.com/diamondburned/arikawa/v2 v2.0.0/go.mod h1:e+lhS20ni2luFEU06Pc8paCxgZL99/RZb77dOC82CF0=
7-
github.com/diamondburned/arikawa/v2 v2.0.6 h1:KQKyIyzSBtk/Ei7qyDOWiDqhi7vTlXCN293YWIyDbDk=
8-
github.com/diamondburned/arikawa/v2 v2.0.6/go.mod h1:e+lhS20ni2luFEU06Pc8paCxgZL99/RZb77dOC82CF0=
1+
github.com/diamondburned/arikawa/v3 v3.0.0-20210627000400-d4c66d497105 h1:HJ5NmE5fTILkJnfU/9YMQb31+gGQXTRp9j3060OuanU=
2+
github.com/diamondburned/arikawa/v3 v3.0.0-20210627000400-d4c66d497105/go.mod h1:sNqM/iGXuH87wEH1rpQBEY1PR0AAkRKJuUhJGOdo7To=
93
github.com/diamondburned/timedmap v0.0.0-20200510234918-a50f7ffba1d8 h1:3Gg+m1ZbSzoYxJXB4G87jOfbn2GKsP7LX5kmEWDfPPc=
104
github.com/diamondburned/timedmap v0.0.0-20200510234918-a50f7ffba1d8/go.mod h1:IhCTtFAXmwUTqlIGhDAvsvG9liud0NocNnIyOdfU2qA=
11-
github.com/gorilla/schema v1.1.0 h1:CamqUDOFUBqzrvxuz2vEwo8+SUdwsluFh7IlzJh30LY=
12-
github.com/gorilla/schema v1.1.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
135
github.com/gorilla/schema v1.2.0 h1:YufUaxZYCKGFuAq3c96BOhjgd5nmXiOY9NGzF247Tsc=
146
github.com/gorilla/schema v1.2.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
157
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
@@ -19,18 +11,11 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
1911
github.com/tmdvs/Go-Emoji-Utils v1.1.0 h1:gtPix7HZPrd49+MNDcuRLvv4xVNxCE5wgjqyuvmbyYg=
2012
github.com/tmdvs/Go-Emoji-Utils v1.1.0/go.mod h1:J82i2WeGn+Kz+T3s5v9+i/OJlvevIVfGZ6qXgqiNWBc=
2113
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
22-
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
23-
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
24-
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
2514
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
2615
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
2716
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
28-
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
2917
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
30-
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13 h1:5jaG59Zhd+8ZXe8C+lgiAGqkOaZBruqrWclLkgAww34=
3118
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3219
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
33-
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
34-
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
3520
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
3621
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎middleware/channels.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package middleware
22

33
import (
44
"errors"
5-
"github.com/diamondburned/arikawa/v2/discord"
5+
"github.com/diamondburned/arikawa/v3/discord"
66
"meow.tf/astral/router"
77
)
88

‎middleware/permissions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package middleware
22

33
import (
4-
"github.com/diamondburned/arikawa/v2/discord"
4+
"github.com/diamondburned/arikawa/v3/discord"
55
"meow.tf/astral/router"
66
)
77

‎router/context.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package router
22

33
import (
4-
"github.com/diamondburned/arikawa/v2/discord"
5-
"github.com/diamondburned/arikawa/v2/gateway"
6-
"github.com/diamondburned/arikawa/v2/state"
4+
"github.com/diamondburned/arikawa/v3/discord"
5+
"github.com/diamondburned/arikawa/v3/gateway"
6+
"github.com/diamondburned/arikawa/v3/state"
77
)
88

99
type Context struct {
@@ -22,7 +22,7 @@ type Context struct {
2222
Vars map[string]interface{}
2323
}
2424

25-
// Create a new Context from the session and event
25+
// ContextFrom creates a new Context from the session and event
2626
func ContextFrom(state *state.State, event *gateway.MessageCreateEvent, r *Route, command string, args []string, argString string) (*Context, error) {
2727
// Find the channel for the event, which doesn't have a built-in discordgo equivalent of .Guild()
2828
c, err := state.Channel(event.ChannelID)

‎router/context_arguments.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package router
22

33
import (
4-
"github.com/diamondburned/arikawa/v2/discord"
4+
"github.com/diamondburned/arikawa/v3/discord"
55
emoji "github.com/tmdvs/Go-Emoji-Utils"
66
"strconv"
77
)

‎router/context_replies.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package router
33
import (
44
"errors"
55
"fmt"
6-
"github.com/diamondburned/arikawa/v2/api"
7-
"github.com/diamondburned/arikawa/v2/discord"
8-
"github.com/diamondburned/arikawa/v2/utils/sendpart"
6+
"github.com/diamondburned/arikawa/v3/api"
7+
"github.com/diamondburned/arikawa/v3/discord"
8+
"github.com/diamondburned/arikawa/v3/utils/sendpart"
99
"io"
1010
"strings"
1111
)
@@ -41,7 +41,7 @@ func (c *Context) Send(text string) (*discord.Message, error) {
4141
}
4242
}
4343

44-
return c.Session.SendMessage(c.Channel.ID, text, nil)
44+
return c.Session.SendMessage(c.Channel.ID, text)
4545
}
4646

4747
// Sendf Sends formattable text to the originating channel

‎router/validator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package router
22

33
import (
44
"errors"
5-
"github.com/diamondburned/arikawa/v2/discord"
5+
"github.com/diamondburned/arikawa/v3/discord"
66
emoji "github.com/tmdvs/Go-Emoji-Utils"
77
"regexp"
88
"strconv"

0 commit comments

Comments
 (0)