Shorten

bot/handler/coin.go

@@ -21,9 +21,7 @@ func (c *Coin) Flip() bool {
 }
 
 func NewCoinHandler(s string) *CoinHandler {
-	h := new(CoinHandler)
+	return &CoinHandler{Name: s}
-	h.Name = s
-	return h
 }
 
 func (h *CoinHandler) SetConfig(config bot.Config) {

bot/handler/dice.go

@@ -85,9 +85,7 @@ func (r *Roll) RollDice() {
 }
 
 func NewRollHandler(s string) *RollHandler {
-	h := new(RollHandler)
+	return &RollHandler{Name: s}
-	h.Name = s
-	return h
 }
 
 func (h *RollHandler) SetConfig(config bot.Config) {

bot/handler/ping.go

@@ -15,9 +15,7 @@ type (
 )
 
 func NewPingHandler(s string) *PingHandler {
-	h := new(PingHandler)
+	return &PingHandler{Name: s}
-	h.Name = s
-	return h
 }
 
 func (h *PingHandler) SetConfig(config bot.Config) {

bot/handler/roulette.go

@@ -75,9 +75,7 @@ func (g *Gun) IsEmpty() bool {
 }
 
 func NewRouletteHandler(s string) *RouletteHandler {
-	h := new(RouletteHandler)
+	return &RouletteHandler{Name: s}
-	h.Name = s
-	return h
 }
 
 func (h *RouletteHandler) SetConfig(config bot.Config) {

bot/handler/time.go

@@ -18,9 +18,7 @@ type (
 )
 
 func NewTimeHandler(s string) *TimeHandler {
-	h := new(TimeHandler)
+	return &TimeHandler{Name: s}
-	h.Name = s
-	return h
 }
 
 func (h *TimeHandler) SetConfig(config bot.Config) {

bot/handler/version.go

@@ -21,9 +21,7 @@ type (
 )
 
 func NewVersionHandler(s string) *VersionHandler {
-	h := new(VersionHandler)
+	return &VersionHandler{Name: s}
-	h.Name = s
-	return h
 }
 
 func (h *VersionHandler) SetConfig(config bot.Config) {

bot/handler/weather.go

@@ -17,9 +17,7 @@ type WeatherHandler struct {
 }
 
 func NewWeatherHandler(s string) *WeatherHandler {
-	h := new(WeatherHandler)
+	return &WeatherHandler{Name: s}
-	h.Name = s
-	return h
 }
 
 func (h *WeatherHandler) SetConfig(config bot.Config) {

lib/common.go

@@ -53,6 +53,9 @@ func BuildURI(rawuri, rawpath string) string {
 func HasCommand(s, prefix, cmd string) bool {
 	s = strings.TrimSpace(s)
 
+	args := strings.Split(s, " ")
+	s = args[0]
+
 	// a command cannot be less than two characters e.g. !x
 	if len(s) < 2 {
 		return false

lib/common_test.go

@@ -0,0 +1,28 @@
+package lib
+
+import "testing"
+
+func TestHasCommand(t *testing.T) {
+	tables := []struct {
+		s      string
+		prefix string
+		cmd    string
+		r      bool
+	}{
+		{"!command x y", "!", "command", true},
+		{"#command x y", "#", "command", true},
+		{"command x y", "!", "comamnd", false},
+		{"", "", "", false},
+		{"!", "!", "", false},
+		{"! x y", "!", "", false},
+	}
+
+	for _, table := range tables {
+		r := HasCommand(table.s, table.prefix, table.cmd)
+		if r != table.r {
+			t.Errorf("HasCommand(%q, %q, %q), got: %t, want: %t",
+				table.s, table.prefix, table.cmd, r, table.r,
+			)
+		}
+	}
+}