diamondburned
/
arikawa
mirror of https://github.com/diamondburned/arikawa.git
1
0
Fork 0
Code Issues Releases Activity

Bot: API breakage to indicate changes

This commit is contained in:
diamondburned (Forefront) 2020-05-03 19:12:44 -07:00
parent e9d81f67eb
commit be99041a03
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bot/arguments.go
View File

@ -32,14 +32,16 @@ type ManualParser interface {
ParseContent([]string) error ParseContent([]string) error
} }
// RawArguments implements ManualParseable, in case you want to implement a // ArgumentParts implements ManualParseable, in case you want to parse arguments
// custom argument parser. It borrows the library's argument parser. // manually. It borrows the library's argument parser.
type RawArguments struct { type ArgumentParts struct {
Command string Command string
Arguments []string Arguments []string
} }
func (r *RawArguments) ParseContent(args []string) error { var _ ManualParser = (*ArgumentParts)(nil)
func (r *ArgumentParts) ParseContent(args []string) error {
r.Command = args[0] r.Command = args[0]
if len(args) > 1 { if len(args) > 1 {
@ -49,7 +51,7 @@ func (r *RawArguments) ParseContent(args []string) error {
return nil return nil
} }
func (r RawArguments) Arg(n int) string { func (r ArgumentParts) Arg(n int) string {
if n < 0 || n >= len(r.Arguments) { if n < 0 || n >= len(r.Arguments) {
return "" return ""
} }
@ -57,7 +59,7 @@ func (r RawArguments) Arg(n int) string {
return r.Arguments[n] return r.Arguments[n]
} }
func (r RawArguments) After(n int) string { func (r ArgumentParts) After(n int) string {
if n < 0 || n >= len(r.Arguments) { if n < 0 || n >= len(r.Arguments) {
return "" return ""
} }
@ -65,28 +67,29 @@ func (r RawArguments) After(n int) string {
return strings.Join(r.Arguments[n:], " ") return strings.Join(r.Arguments[n:], " ")
} }
func (r RawArguments) String() string { func (r ArgumentParts) String() string {
return r.Command + " " + strings.Join(r.Arguments, " ") return r.Command + " " + strings.Join(r.Arguments, " ")
} }
func (r RawArguments) Length() int { func (r ArgumentParts) Length() int {
return len(r.Arguments) return len(r.Arguments)
} }
// CustomParser has a CustomParse method, which would be passed in the full // CustomParser has a CustomParse method, which would be passed in the full
// message content with the prefix trimmed, but not the command. This is used // message content with the prefix and command trimmed. This is used
// for commands that require more advanced parsing than the default parser. // for commands that require more advanced parsing than the default parser.
type CustomParser interface { type CustomParser interface {
CustomParse(content string) error CustomParse(arguments string) error
} }
// CustomArguments implements the CustomParser interface, which sets the string // Arguments implements the CustomParser interface, which sets all the
// exactly. This string contains the command, subcommand, and all its arguments. // arguments into it as raw as it could.
// It does not contain the prefix. type Arguments string
type Content string
func (c *Content) CustomParse(content string) error { var _ CustomParser = (*Arguments)(nil)
*c = Content(content)
func (a *Arguments) CustomParse(arguments string) error {
*a = Arguments(arguments)
return nil return nil
} }