Merge pull request #9 from pkdindustries/alexschlessinger/issue8

toggle for addressing mode #8

config.go

@@ -37,7 +37,7 @@ func init() {
 	root.PersistentFlags().BoolP("list", "l", false, "list configured personalities")
 	root.PersistentFlags().StringP("directory", "d", "./personalities", "personalities configuration directory")
 	root.PersistentFlags().BoolP("verbose", "v", false, "enable verbose logging of sessions and configuration")
-
+	root.PersistentFlags().BoolP("addressed", "a", true, "require bot be addressed by nick for response")
 	vip.BindPFlags(root.PersistentFlags())
 
 	vip.SetEnvPrefix("SOULSHACK")

context.go

@@ -25,6 +25,7 @@ type Config struct {
 	Server    string
 	Port      int
 	SSL       bool
+	Addressed bool
 }
 
 type ChatContext struct {
@@ -33,8 +34,8 @@ type ChatContext struct {
 	Config      *Config
 	Client      *girc.Client
 	Event       *girc.Event
-	Args        []string
 	Session     *ChatSession
+	Args        []string
 }
 
 func PersonalityFromViper(v *vip.Viper) *Personality {
@@ -57,6 +58,7 @@ func IrcFromViper(v *vip.Viper) *Config {
 		Server:    v.GetString("server"),
 		Port:      v.GetInt("port"),
 		SSL:       v.GetBool("ssl"),
+		Addressed: v.GetBool("addressed"),
 	}
 }
 
@@ -89,7 +91,15 @@ func (c *ChatContext) Reply(message string) *ChatContext {
 }
 
 func (c *ChatContext) Valid() bool {
-	return (c.IsAddressed() || c.IsPrivate()) && len(c.Args) > 0
+	// check if the message is addressed to the bot or if being addressed is not required
+	addressed := c.IsAddressed() || !c.Config.Addressed
+	hasArguments := len(c.Args) > 0
+
+	// valid if:
+	// - the message is either addressed to the bot or being addressed is not required
+	// - or the message is private
+	// - and at least one argument
+	return (addressed || c.IsPrivate()) && hasArguments
 }
 
 func (c *ChatContext) IsPrivate() bool {

handlers.go

@@ -34,7 +34,7 @@ func sendMessage(ctx *ChatContext, message string) {
 	ctx.Reply(message)
 }
 
-var configParams = map[string]string{"prompt": "", "model": "", "nick": "", "greeting": "", "goodbye": "", "directory": "", "session": ""}
+var configParams = map[string]string{"prompt": "", "model": "", "nick": "", "greeting": "", "goodbye": "", "directory": "", "session": "", "addressed": ""}
 
 func handleSet(ctx *ChatContext) {