Examples: Fixed up advanced_bot to make it up to date

_example/advanced_bot/bot.go

@@ -21,6 +21,7 @@ type Bot struct {
 }
 
 func (bot *Bot) Setup(sub *bot.Subcommand) {
+	// Only allow people in guilds to run guildInfo.
 	sub.AddMiddleware("GuildInfo", middlewares.GuildOnly(bot.Ctx))
 }
 
@@ -30,32 +31,24 @@ func (bot *Bot) Help(m *gateway.MessageCreateEvent) (string, error) {
 }
 
 // Add demonstrates the usage of typed arguments. Run it with "~add 1 2".
-func (bot *Bot) Add(m *gateway.MessageCreateEvent, a, b int) error {
+func (bot *Bot) Add(m *gateway.MessageCreateEvent, a, b int) (string, error) {
-	content := fmt.Sprintf("%d + %d = %d", a, b, a+b)
+	return fmt.Sprintf("%d + %d = %d", a, b, a+b), nil
-
-	_, err := bot.Ctx.SendMessage(m.ChannelID, content, nil)
-	return err
 }
 
 // Ping is a simple ping example, perhaps the most simple you could make it.
-func (bot *Bot) Ping(m *gateway.MessageCreateEvent) error {
+func (bot *Bot) Ping(m *gateway.MessageCreateEvent) (string, error) {
-	_, err := bot.Ctx.SendMessage(m.ChannelID, "Pong!", nil)
+	return "Pong!", nil
-	return err
 }
 
 // Say demonstrates how arguments.Flag could be used without the flag library.
-func (bot *Bot) Say(m *gateway.MessageCreateEvent, f *arguments.Flag) (string, error) {
+func (bot *Bot) Say(m *gateway.MessageCreateEvent, f bot.RawArguments) (string, error) {
-	args := f.String()
+	if f != "" {
-	if args == "" {
+		return string(f), nil
-		// Empty message, ignore
-		return "", nil
 	}
-
+	return "", errors.New("Missing content.")
-	return args, nil
 }
 
-// GuildInfo demonstrates the use of command flags, in this case the GuildOnly
+// GuildInfo demonstrates the GuildOnly middleware done in (*Bot).Setup().
-// flag.
 func (bot *Bot) GuildInfo(m *gateway.MessageCreateEvent) (string, error) {
 	g, err := bot.Ctx.GuildWithCount(m.GuildID)
 	if err != nil {
@@ -71,8 +64,7 @@ func (bot *Bot) GuildInfo(m *gateway.MessageCreateEvent) (string, error) {
 // Repeat tells the bot to wait for the user's response, then repeat what they
 // said.
 func (bot *Bot) Repeat(m *gateway.MessageCreateEvent) (string, error) {
-	_, err := bot.Ctx.SendMessage(m.ChannelID,
+	_, err := bot.Ctx.SendMessage(m.ChannelID, "What do you want me to say?", nil)
-		"What do you want me to say?", nil)
 	if err != nil {
 		return "", err
 	}
@@ -80,6 +72,8 @@ func (bot *Bot) Repeat(m *gateway.MessageCreateEvent) (string, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 
+	// This might miss events that are sent immediately after. To make sure all
+	// events are caught, ChanFor should be used.
 	v := bot.Ctx.WaitFor(ctx, func(v interface{}) bool {
 		// Incoming event is a message create event:
 		mg, ok := v.(*gateway.MessageCreateEvent)
@@ -101,7 +95,7 @@ func (bot *Bot) Repeat(m *gateway.MessageCreateEvent) (string, error) {
 
 // Embed is a simple embed creator. Its purpose is to demonstrate the usage of
 // the ParseContent interface, as well as using the stdlib flag package.
-func (bot *Bot) Embed(m *gateway.MessageCreateEvent, f *arguments.Flag) (*discord.Embed, error) {
+func (bot *Bot) Embed(m *gateway.MessageCreateEvent, f arguments.Flag) (*discord.Embed, error) {
 	fs := arguments.NewFlagSet()
 
 	var (

bot/extras/arguments/flag.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"flag"
 	"io/ioutil"
-	"strings"
 )
 
 var FlagName = "command"
@@ -30,41 +29,21 @@ func (fs *FlagSet) Usage() string {
 	return buf.String()
 }
 
-type Flag struct {
+type Flag []string
-	command   string
-	arguments []string
-}
 
 func (f *Flag) ParseContent(arguments []string) error {
-	// trim the command out
+	*f = arguments
-	f.command, f.arguments = arguments[0], arguments[1:]
 	return nil
 }
 
-func (f *Flag) Usage() string {
+func (f Flag) Usage() string {
-	return "[flags] arguments..."
+	return "[flags] arguments"
 }
 
-func (f *Flag) Command() string {
+func (f Flag) Args() []string {
-	return f.command
+	return f
 }
 
-func (f *Flag) Args() []string {
+func (f Flag) With(fs *flag.FlagSet) error {
-	return f.arguments
+	return fs.Parse(f)
-}
-
-func (f *Flag) Arg(n int) string {
-	if n < 0 || n >= len(f.arguments) {
-		return ""
-	}
-
-	return f.arguments[n]
-}
-
-func (f *Flag) String() string {
-	return strings.Join(f.arguments, " ")
-}
-
-func (f *Flag) With(fs *flag.FlagSet) error {
-	return fs.Parse(f.arguments)
 }