Merge branch 'master' into capture_the_flag

bot/bot.go

@@ -93,6 +93,7 @@ func New(config *config.Config, connector Connector) Bot {
 
 	connector.RegisterMessageReceived(bot.MsgReceived)
 	connector.RegisterEventReceived(bot.EventReceived)
+	connector.RegisterReplyMessageReceived(bot.ReplyMsgReceived)
 
 	return bot
 }
@@ -145,7 +146,7 @@ func (b *bot) migrateDB() {
 
 // Adds a constructed handler to the bots handlers list
 func (b *bot) AddHandler(name string, h Handler) {
-	b.plugins[strings.ToLower(name)] = h
+	b.plugins[name] = h
 	b.pluginOrdering = append(b.pluginOrdering, name)
 	if entry := h.RegisterWeb(); entry != nil {
 		b.httpEndPoints[name] = *entry

bot/handlers.go

@@ -22,7 +22,6 @@ func (b *bot) MsgReceived(msg msg.Message) {
 
 	// msg := b.buildMessage(client, inMsg)
 	// do need to look up user and fix it
-
 	if strings.HasPrefix(msg.Body, "help ") && msg.Command {
 		parts := strings.Fields(strings.ToLower(msg.Body))
 		b.checkHelp(msg.Channel, parts)
@@ -53,16 +52,40 @@ func (b *bot) EventReceived(msg msg.Message) {
 	}
 }
 
-func (b *bot) SendMessage(channel, message string) {
+// Handle incoming replys
-	b.conn.SendMessage(channel, message)
+func (b *bot) ReplyMsgReceived(msg msg.Message, identifier string) {
+	log.Println("Received message: ", msg)
+
+	for _, name := range b.pluginOrdering {
+		p := b.plugins[name]
+		if p.ReplyMessage(msg, identifier) {
+			break
+		}
+	}
 }
 
-func (b *bot) SendAction(channel, message string) {
+func (b *bot) SendMessage(channel, message string) string {
-	b.conn.SendAction(channel, message)
+	return b.conn.SendMessage(channel, message)
 }
 
-func (b *bot) React(channel, reaction string, message msg.Message) {
+func (b *bot) SendAction(channel, message string) string {
-	b.conn.React(channel, reaction, message)
+	return b.conn.SendAction(channel, message)
+}
+
+func (b *bot) ReplyToMessageIdentifier(channel, message, identifier string) (string, bool) {
+	return b.conn.ReplyToMessageIdentifier(channel, message, identifier)
+}
+
+func (b *bot) ReplyToMessage(channel, message string, replyTo msg.Message) (string, bool) {
+		return b.conn.ReplyToMessage(channel, message, replyTo)
+}
+
+func (b *bot) React(channel, reaction string, message msg.Message) bool {
+	return b.conn.React(channel, reaction, message)
+}
+
+func (b *bot) Edit(channel, newMessage, identifier string) bool {
+	return b.conn.Edit(channel, newMessage, identifier)
 }
 
 func (b *bot) GetEmojiList() map[string]string {

bot/interfaces.go

@@ -15,10 +15,14 @@ type Bot interface {
 	DB() *sqlx.DB
 	Who(string) []user.User
 	AddHandler(string, Handler)
-	SendMessage(string, string)
+	SendMessage(string, string) string
-	SendAction(string, string)
+	SendAction(string, string) string
-	React(string, string, msg.Message)
+	ReplyToMessageIdentifier(string, string, string) (string, bool)
+	ReplyToMessage(string, string, msg.Message) (string, bool)
+	React(string, string, msg.Message) bool
+	Edit(string, string, string) bool
 	MsgReceived(msg.Message)
+	ReplyMsgReceived(msg.Message, string)
 	EventReceived(msg.Message)
 	Filter(msg.Message, string) string
 	LastMessage(string) (msg.Message, error)
@@ -30,10 +34,14 @@ type Bot interface {
 type Connector interface {
 	RegisterEventReceived(func(message msg.Message))
 	RegisterMessageReceived(func(message msg.Message))
+	RegisterReplyMessageReceived(func(msg.Message, string))
 
-	SendMessage(channel, message string)
+	SendMessage(channel, message string) string
-	SendAction(channel, message string)
+	SendAction(channel, message string) string
-	React(string, string, msg.Message)
+	ReplyToMessageIdentifier(string, string, string) (string, bool)
+	ReplyToMessage(string, string, msg.Message) (string, bool)
+	React(string, string, msg.Message) bool
+	Edit(string, string, string) bool
 	GetEmojiList() map[string]string
 	Serve() error
 
@@ -44,6 +52,7 @@ type Connector interface {
 type Handler interface {
 	Message(message msg.Message) bool
 	Event(kind string, message msg.Message) bool
+	ReplyMessage(msg.Message, string) bool
 	BotMessage(message msg.Message) bool
 	Help(channel string, parts []string)
 	RegisterWeb() *string

bot/mock.go

@@ -3,7 +3,10 @@
 package bot
 
 import (
+	"fmt"
 	"log"
+	"strconv"
+	"strings"
 
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/mock"
@@ -25,13 +28,22 @@ type MockBot struct {
 func (mb *MockBot) Config() *config.Config            { return &mb.Cfg }
 func (mb *MockBot) DBVersion() int64                  { return 1 }
 func (mb *MockBot) DB() *sqlx.DB                      { return mb.db }
+func (mb *MockBot) Conn() Connector                   { return nil }
 func (mb *MockBot) Who(string) []user.User            { return []user.User{} }
 func (mb *MockBot) AddHandler(name string, f Handler) {}
-func (mb *MockBot) SendMessage(ch string, msg string) {
+func (mb *MockBot) SendMessage(ch string, msg string) string {
 	mb.Messages = append(mb.Messages, msg)
+	return fmt.Sprintf("m-%d", len(mb.Actions)-1)
 }
-func (mb *MockBot) SendAction(ch string, msg string) {
+func (mb *MockBot) SendAction(ch string, msg string) string {
 	mb.Actions = append(mb.Actions, msg)
+	return fmt.Sprintf("a-%d", len(mb.Actions)-1)
+}
+func (mb *MockBot) ReplyToMessageIdentifier(channel, message, identifier string) (string, bool) {
+	return "", false
+}
+func (mb *MockBot) ReplyToMessage(channel, message string, replyTo msg.Message) (string, bool) {
+	return "", false
 }
 func (mb *MockBot) MsgReceived(msg msg.Message)                {}
 func (mb *MockBot) EventReceived(msg msg.Message)              {}
@@ -39,9 +51,43 @@ func (mb *MockBot) Filter(msg msg.Message, s string) string    { return "" }
 func (mb *MockBot) LastMessage(ch string) (msg.Message, error) { return msg.Message{}, nil }
 func (mb *MockBot) CheckAdmin(nick string) bool                { return false }
 
-func (mb *MockBot) React(channel, reaction string, message msg.Message) {}
+func (mb *MockBot) React(channel, reaction string, message msg.Message) bool { return false }
-func (mb *MockBot) GetEmojiList() map[string]string                     { return make(map[string]string) }
+
-func (mb *MockBot) RegisterFilter(s string, f func(string) string)      {}
+func (mb *MockBot) Edit(channel, newMessage, identifier string) bool {
+	isMessage := identifier[0] == 'm'
+	if !isMessage && identifier[0] != 'a' {
+		log.Printf("failed to parse identifier: %s", identifier)
+		return false
+	}
+
+	index, err := strconv.Atoi(strings.Split(identifier, "-")[1])
+	if err != nil {
+		log.Printf("failed to parse identifier: %s", identifier)
+		return false
+	}
+
+	if isMessage {
+		if index < len(mb.Messages) {
+			mb.Messages[index] = newMessage
+		} else {
+			return false
+		}
+	} else {
+		if index < len(mb.Actions) {
+			mb.Actions[index] = newMessage
+		} else {
+			return false
+		}
+	}
+	return true
+}
+
+func (mb *MockBot) ReplyMsgReceived(msg.Message, string) {
+
+}
+
+func (mb *MockBot) GetEmojiList() map[string]string                { return make(map[string]string) }
+func (mb *MockBot) RegisterFilter(s string, f func(string) string) {}
 
 func NewMockBot() *MockBot {
 	db, err := sqlx.Open("sqlite3_custom", ":memory:")

config/config.go

@@ -91,6 +91,7 @@ type Config struct {
 	}
 	Emojify struct {
 		Chance float64
+		Scoreless []string
 	}
 	Reaction struct {
 		GeneralChance                 float64
@@ -103,6 +104,12 @@ type Config struct {
 	Inventory struct {
 		Max int
 	}
+	Sisyphus struct {
+		MinDecrement int
+		MaxDecrement int
+		MinPush      int
+		MaxPush      int
+	}
 }
 
 func init() {

example_config.lua

@@ -29,7 +29,11 @@ config = {
 	  YourChance = 0.4
 	},
 	Emojify = {
-	  Chance = 0.02
+	  Chance = 0.02,
+		Scoreless = {
+			"a",
+			"it"
+		}
 	},
 	DB = {
 	  File = "catbase.db",
@@ -105,5 +109,14 @@ config = {
 	  },
 	  DBPath = "stats.db"
 	},
-	HttpAddr = "127.0.0.1:1337"
+	HttpAddr = "127.0.0.1:1337",
+  Inventory = {
+    Max = 5
+  },
+  Sisyphus = {
+    MinDecrement = 10,
+    MinPush = 1
+  }
+}
+
 }

irc/irc.go

@@ -44,6 +44,7 @@ type Irc struct {
 
 	eventReceived   func(msg.Message)
 	messageReceived func(msg.Message)
+	replyMessageReceived  func(msg.Message, string)
 }
 
 func New(c *config.Config) *Irc {
@@ -61,12 +62,16 @@ func (i *Irc) RegisterMessageReceived(f func(msg.Message)) {
 	i.messageReceived = f
 }
 
+func (i *Irc) RegisterReplyMessageReceived(f func(msg.Message, string)) {
+	i.replyMessageReceived = f
+}
+
 func (i *Irc) JoinChannel(channel string) {
 	log.Printf("Joining channel: %s", channel)
 	i.Client.Out <- irc.Msg{Cmd: irc.JOIN, Args: []string{channel}}
 }
 
-func (i *Irc) SendMessage(channel, message string) {
+func (i *Irc) SendMessage(channel, message string) string {
 	for len(message) > 0 {
 		m := irc.Msg{
 			Cmd:  "PRIVMSG",
@@ -90,17 +95,33 @@ func (i *Irc) SendMessage(channel, message string) {
 
 		i.Client.Out <- m
 	}
+	return "NO_IRC_IDENTIFIERS"
 }
 
 // Sends action to channel
-func (i *Irc) SendAction(channel, message string) {
+func (i *Irc) SendAction(channel, message string) string {
 	message = actionPrefix + " " + message + "\x01"
 
 	i.SendMessage(channel, message)
+	return "NO_IRC_IDENTIFIERS"
 }
 
-func (i *Irc) React(channel, reaction string, message msg.Message) {
+func (i *Irc) ReplyToMessageIdentifier(channel, message, identifier string) (string, bool) {
+	return "NO_IRC_IDENTIFIERS", false
+}
+
+func (i *Irc) ReplyToMessage(channel, message string, replyTo msg.Message) (string, bool) {
+	return "NO_IRC_IDENTIFIERS", false
+}
+
+func (i *Irc) React(channel, reaction string, message msg.Message) bool {
 	//we're not goign to do anything because it's IRC
+	return false
+}
+
+func (i *Irc) Edit(channel, newMessage, identifier string) bool {
+	//we're not goign to do anything because it's IRC
+	return false
 }
 
 func (i *Irc) GetEmojiList() map[string]string {

main.go

@@ -20,11 +20,15 @@ import (
 	"github.com/velour/catbase/plugins/first"
 	"github.com/velour/catbase/plugins/inventory"
 	"github.com/velour/catbase/plugins/leftpad"
+	"github.com/velour/catbase/plugins/picker"
 	"github.com/velour/catbase/plugins/reaction"
 	"github.com/velour/catbase/plugins/reminder"
+	"github.com/velour/catbase/plugins/rpgORdie"
 	"github.com/velour/catbase/plugins/rss"
+	"github.com/velour/catbase/plugins/sisyphus"
 	"github.com/velour/catbase/plugins/stats"
 	"github.com/velour/catbase/plugins/talker"
+	"github.com/velour/catbase/plugins/tell"
 	"github.com/velour/catbase/plugins/twitch"
 	"github.com/velour/catbase/plugins/your"
 	"github.com/velour/catbase/plugins/zork"
@@ -58,6 +62,7 @@ func main() {
 	// b.AddHandler("downtime", downtime.New(b))
 	b.AddHandler("talker", talker.New(b))
 	b.AddHandler("dice", dice.New(b))
+	b.AddHandler("picker", picker.New(b))
 	b.AddHandler("beers", beers.New(b))
 	b.AddHandler("remember", fact.NewRemember(b))
 	b.AddHandler("your", your.New(b))
@@ -71,6 +76,9 @@ func main() {
 	b.AddHandler("twitch", twitch.New(b))
 	b.AddHandler("inventory", inventory.New(b))
 	b.AddHandler("capturetheflag", capturetheflag.New(b))
+	b.AddHandler("rpgORdie", rpgORdie.New(b))
+	b.AddHandler("sisyphus", sisyphus.New(b))
+	b.AddHandler("tell", tell.New(b))
 	// catches anything left, will always return true
 	b.AddHandler("factoid", fact.New(b))
 

plugins/admin/admin.go

@@ -117,3 +117,5 @@ func (p *AdminPlugin) BotMessage(message msg.Message) bool {
 func (p *AdminPlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *AdminPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/babbler/babbler.go

@@ -935,3 +935,5 @@ func (p *BabblerPlugin) babbleSeedBookends(babblerName string, start, end []stri
 
 	return strings.Join(words, " "), nil
 }
+
+func (p *BabblerPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/beers/beers.go

@@ -461,3 +461,5 @@ func (p *BeersPlugin) BotMessage(message msg.Message) bool {
 func (p *BeersPlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *BeersPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/counter/counter.go

@@ -45,6 +45,32 @@ func GetItems(db *sqlx.DB, nick string) ([]Item, error) {
 	return items, nil
 }
 
+func LeaderAll(db *sqlx.DB) ([]Item, error) {
+	s := `select id,item,nick,max(count) as count from counter group by item having count(nick) > 1 and max(count) > 1 order by count desc`
+	var items []Item
+	err := db.Select(&items, s)
+	if err != nil {
+		return nil, err
+	}
+	for i := range items {
+		items[i].DB = db
+	}
+	return items, nil
+}
+
+func Leader(db *sqlx.DB, itemName string) ([]Item, error) {
+	s := `select * from counter where item=? order by count desc`
+	var items []Item
+	err := db.Select(&items, s, itemName)
+	if err != nil {
+		return nil, err
+	}
+	for i := range items {
+		items[i].DB = db
+	}
+	return items, nil
+}
+
 // GetItem returns a specific counter for a subject
 func GetItem(db *sqlx.DB, nick, itemName string) (Item, error) {
 	var item Item
@@ -136,7 +162,36 @@ func (p *CounterPlugin) Message(message msg.Message) bool {
 		return false
 	}
 
-	if tea, _ := regexp.MatchString("(?i)^tea\\. [^.]*\\. ((hot)|(iced))\\.?$", message.Body); tea {
+	if parts[0] == "leaderboard" {
+		var cmd func() ([]Item, error)
+		itNameTxt := ""
+
+		if len(parts) == 1 {
+			cmd = func() ([]Item, error) { return LeaderAll(p.DB) }
+		} else {
+			itNameTxt = fmt.Sprintf(" for %s", parts[1])
+			cmd = func() ([]Item, error) { return Leader(p.DB, parts[1]) }
+		}
+
+		its, err := cmd()
+		if err != nil {
+			log.Println(err)
+			return false
+		} else if len(its) == 0 {
+			return false
+		}
+
+		out := fmt.Sprintf("Leaderboard%s:\n", itNameTxt)
+		for _, it := range its {
+			out += fmt.Sprintf("%s with %d %s\n",
+				it.Nick,
+				it.Count,
+				it.Item,
+			)
+		}
+		p.Bot.SendMessage(channel, out)
+		return true
+	} else if tea, _ := regexp.MatchString("(?i)^tea\\. [^.]*\\. ((hot)|(iced))\\.?$", message.Body); tea {
 		item, err := GetItem(p.DB, nick, ":tea:")
 		if err != nil {
 			log.Printf("Error finding item %s.%s: %s.", nick, ":tea:", err)
@@ -364,3 +419,5 @@ func (p *CounterPlugin) BotMessage(message msg.Message) bool {
 func (p *CounterPlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *CounterPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/dice/dice.go

@@ -12,8 +12,6 @@ import (
 import (
 	"fmt"
 	"math/rand"
-	"strconv"
-	"strings"
 )
 
 // This is a dice plugin to serve as an example and quick copy/paste for new plugins.
@@ -39,46 +37,37 @@ func rollDie(sides int) int {
 // This function returns true if the plugin responds in a meaningful way to the users message.
 // Otherwise, the function returns false and the bot continues execution of other plugins.
 func (p *DicePlugin) Message(message msg.Message) bool {
+	if !message.Command {
+		return false
+	}
+
 	channel := message.Channel
-	parts := strings.Fields(message.Body)
+	nDice := 0
+	sides := 0
 
-	if len(parts) == 1 && message.Command {
+	if n, err := fmt.Sscanf(message.Body, "%dd%d", &nDice, &sides); n != 2 || err != nil {
-		var dice []string
+		return false
-		dice = strings.Split(parts[0], "d")
+	}
 
-		if len(dice) == 2 {
+	if sides < 2 || nDice < 1 || nDice > 20 {
-			// We actually have a die roll.
+		p.Bot.SendMessage(channel, "You're a dick.")
-			nDice, err := strconv.Atoi(dice[0])
+		return true
-			if err != nil {
+	}
-				return false
-			}
 
-			sides, err := strconv.Atoi(dice[1])
+	rolls := fmt.Sprintf("%s, you rolled: ", message.User.Name)
-			if err != nil {
-				return false
-			}
 
-			if sides < 2 || nDice < 1 || nDice > 20 {
+	for i := 0; i < nDice; i++ {
-				p.Bot.SendMessage(channel, "You're a dick.")
+		rolls = fmt.Sprintf("%s %d", rolls, rollDie(sides))
-				return true
+		if i != nDice-1 {
-			}
+			rolls = fmt.Sprintf("%s,", rolls)
-
+		} else {
-			rolls := fmt.Sprintf("%s, you rolled: ", message.User.Name)
+			rolls = fmt.Sprintf("%s.", rolls)
-
-			for i := 0; i < nDice; i++ {
-				rolls = fmt.Sprintf("%s %d", rolls, rollDie(sides))
-				if i != nDice-1 {
-					rolls = fmt.Sprintf("%s,", rolls)
-				} else {
-					rolls = fmt.Sprintf("%s.", rolls)
-				}
-			}
-
-			p.Bot.SendMessage(channel, rolls)
-			return true
 		}
 	}
-	return false
+
+	p.Bot.SendMessage(channel, rolls)
+	return true
+
 }
 
 // Help responds to help requests. Every plugin must implement a help function.
@@ -100,3 +89,5 @@ func (p *DicePlugin) BotMessage(message msg.Message) bool {
 func (p *DicePlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *DicePlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/downtime/downtime.go

@@ -231,3 +231,5 @@ func (p *DowntimePlugin) BotMessage(message msg.Message) bool {
 func (p *DowntimePlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *DowntimePlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/emojifyme/emojifyme.go

@@ -67,23 +67,30 @@ func (p *EmojifyMePlugin) Message(message msg.Message) bool {
 		}
 	}
 
+	inertTokens := p.Bot.Config().Emojify.Scoreless
 	emojied := 0.0
 	tokens := strings.Fields(strings.ToLower(message.Body))
 	for i, token := range tokens {
 		if _, ok := p.Emoji[token]; ok {
-			emojied++
+			if !stringsContain(inertTokens, token) {
+				emojied++
+			}
 			tokens[i] = ":" + token + ":"
 		} else if strings.HasSuffix(token, "s") {
-			//Check to see if we can strip the trailing "es" off and get an emoji
+			//Check to see if we can strip the trailing "s" off and get an emoji
 			temp := strings.TrimSuffix(token, "s")
 			if _, ok := p.Emoji[temp]; ok {
-				emojied++
+				if !stringsContain(inertTokens, temp) {
+					emojied++
+				}
 				tokens[i] = ":" + temp + ":s"
 			} else if strings.HasSuffix(token, "es") {
 				//Check to see if we can strip the trailing "es" off and get an emoji
 				temp := strings.TrimSuffix(token, "es")
 				if _, ok := p.Emoji[temp]; ok {
-					emojied++
+					if !stringsContain(inertTokens, temp) {
+						emojied++
+					}
 					tokens[i] = ":" + temp + ":es"
 				}
 			}
@@ -112,3 +119,14 @@ func (p *EmojifyMePlugin) BotMessage(message msg.Message) bool {
 func (p *EmojifyMePlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *EmojifyMePlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }
+
+func stringsContain(haystack []string, needle string) bool {
+	for _, s := range haystack {
+		if s == needle {
+			return true
+		}
+	}
+	return false
+}

plugins/fact/factoid.go

@@ -764,3 +764,5 @@ func (p *Factoid) serveQuery(w http.ResponseWriter, r *http.Request) {
 		log.Println(err)
 	}
 }
+
+func (p *Factoid) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/fact/remember.go

@@ -170,3 +170,5 @@ func (p *RememberPlugin) recordMsg(message msg.Message) {
 	log.Printf("Logging message: %s: %s", message.User.Name, message.Body)
 	p.Log[message.Channel] = append(p.Log[message.Channel], message)
 }
+
+func (p *RememberPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/first/first.go

@@ -228,3 +228,5 @@ func (p *FirstPlugin) BotMessage(message msg.Message) bool {
 func (p *FirstPlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *FirstPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/inventory/inventory.go

@@ -236,3 +236,5 @@ func (p *InventoryPlugin) RegisterWeb() *string {
 	// nothing to register
 	return nil
 }
+
+func (p *InventoryPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/leftpad/leftpad.go

@@ -76,3 +76,5 @@ func (p *LeftpadPlugin) RegisterWeb() *string {
 	// nothing to register
 	return nil
 }
+
+func (p *LeftpadPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/picker/picker.go

@@ -0,0 +1,74 @@
+// © 2013 the CatBase Authors under the WTFPL. See AUTHORS for the list of authors.
+
+package picker
+
+import (
+	"strings"
+	"time"
+
+	"fmt"
+	"math/rand"
+
+	"github.com/velour/catbase/bot"
+	"github.com/velour/catbase/bot/msg"
+)
+
+type PickerPlugin struct {
+	Bot bot.Bot
+}
+
+// NewPickerPlugin creates a new PickerPlugin with the Plugin interface
+func New(bot bot.Bot) *PickerPlugin {
+	rand.Seed(time.Now().Unix())
+
+	return &PickerPlugin{
+		Bot: bot,
+	}
+}
+
+func rollDie(sides int) int {
+	return rand.Intn(sides) + 1
+}
+
+// Message responds to the bot hook on recieving messages.
+// This function returns true if the plugin responds in a meaningful way to the users message.
+// Otherwise, the function returns false and the bot continues execution of other plugins.
+func (p *PickerPlugin) Message(message msg.Message) bool {
+	body := message.Body
+	pfx, sfx := "pick {", "}"
+
+	if strings.HasPrefix(body, pfx) && strings.HasSuffix(body, sfx) {
+		body = strings.TrimSuffix(strings.TrimPrefix(body, pfx), sfx)
+		items := strings.Split(body, ",")
+		item := items[rand.Intn(len(items))]
+
+		out := fmt.Sprintf("I've chosen \"%s\" for you.", strings.TrimSpace(item))
+
+		p.Bot.SendMessage(message.Channel, out)
+
+		return true
+	}
+	return false
+}
+
+// Help responds to help requests. Every plugin must implement a help function.
+func (p *PickerPlugin) Help(channel string, parts []string) {
+	p.Bot.SendMessage(channel, "Choose from a list of options. Try \"pick {a,b,c}\".")
+}
+
+// Empty event handler because this plugin does not do anything on event recv
+func (p *PickerPlugin) Event(kind string, message msg.Message) bool {
+	return false
+}
+
+// Handler for bot's own messages
+func (p *PickerPlugin) BotMessage(message msg.Message) bool {
+	return false
+}
+
+// Register any web URLs desired
+func (p *PickerPlugin) RegisterWeb() *string {
+	return nil
+}
+
+func (p *PickerPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/reaction/reaction.go

@@ -80,3 +80,5 @@ func (p *ReactionPlugin) BotMessage(message msg.Message) bool {
 func (p *ReactionPlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *ReactionPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/reminder/reminder.go

@@ -322,3 +322,5 @@ func reminderer(p *ReminderPlugin) {
 		p.queueUpNextReminder()
 	}
 }
+
+func (p *ReminderPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/rpgORdie/rpgORdie.go

@@ -0,0 +1,169 @@
+package rpgORdie
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/velour/catbase/bot"
+	"github.com/velour/catbase/bot/msg"
+)
+
+const (
+	DUDE    = ":lion_face:"
+	BOULDER = ":full_moon:"
+	HOLE    = ":new_moon:"
+	EMPTY   = ":white_large_square:"
+
+	OK      = iota
+	INVALID = iota
+	WIN     = iota
+)
+
+type RPGPlugin struct {
+	Bot       bot.Bot
+	listenFor map[string]*board
+}
+
+type board struct {
+	state [][]string
+	x, y  int
+}
+
+func NewRandomBoard() *board {
+	boardSize := 5
+	b := board{
+		state: make([][]string, boardSize),
+		x:     boardSize - 1,
+		y:     boardSize - 1,
+	}
+	for i := 0; i < boardSize; i++ {
+		b.state[i] = make([]string, boardSize)
+		for j := 0; j < boardSize; j++ {
+			b.state[i][j] = ":white_large_square:"
+		}
+	}
+
+	b.state[boardSize-1][boardSize-1] = DUDE
+	b.state[boardSize/2][boardSize/2] = BOULDER
+	b.state[0][0] = HOLE
+
+	return &b
+}
+
+func (b *board) toMessageString() string {
+	lines := make([]string, len(b.state))
+	for i := 0; i < len(b.state); i++ {
+		lines[i] = strings.Join(b.state[i], "")
+	}
+	return strings.Join(lines, "\n")
+}
+
+func (b *board) checkAndMove(dx, dy int) int {
+	newX := b.x + dx
+	newY := b.y + dy
+
+	if newX < 0 || newY < 0 || newX >= len(b.state) || newY >= len(b.state) {
+		return INVALID
+	}
+
+	if b.state[newY][newX] == HOLE {
+		return INVALID
+	}
+
+	win := false
+	if b.state[newY][newX] == BOULDER {
+		newBoulderX := newX + dx
+		newBoulderY := newY + dy
+
+		if newBoulderX < 0 || newBoulderY < 0 || newBoulderX >= len(b.state) || newBoulderY >= len(b.state) {
+			return INVALID
+		}
+
+		if b.state[newBoulderY][newBoulderX] != HOLE {
+			b.state[newBoulderY][newBoulderX] = BOULDER
+		} else {
+			win = true
+		}
+	}
+
+	b.state[newY][newX] = DUDE
+	b.state[b.y][b.x] = EMPTY
+	b.x = newX
+	b.y = newY
+
+	if win {
+		return WIN
+	}
+	return OK
+}
+
+func New(b bot.Bot) *RPGPlugin {
+	return &RPGPlugin{
+		Bot:       b,
+		listenFor: map[string]*board{},
+	}
+}
+
+func (p *RPGPlugin) Message(message msg.Message) bool {
+	if strings.ToLower(message.Body) == "start rpg" {
+		b := NewRandomBoard()
+		ts := p.Bot.SendMessage(message.Channel, b.toMessageString())
+		p.listenFor[ts] = b
+		p.Bot.ReplyToMessageIdentifier(message.Channel, "Over here.", ts)
+		return true
+	}
+	return false
+}
+
+func (p *RPGPlugin) LoadData() {
+
+}
+
+func (p *RPGPlugin) Help(channel string, parts []string) {
+	p.Bot.SendMessage(channel, "Go find a walkthrough or something.")
+}
+
+func (p *RPGPlugin) Event(kind string, message msg.Message) bool {
+	return false
+}
+
+func (p *RPGPlugin) BotMessage(message msg.Message) bool {
+	return false
+}
+
+func (p *RPGPlugin) RegisterWeb() *string {
+	return nil
+}
+
+func (p *RPGPlugin) ReplyMessage(message msg.Message, identifier string) bool {
+	if strings.ToLower(message.User.Name) != strings.ToLower(p.Bot.Config().Nick) {
+		if b, ok := p.listenFor[identifier]; ok {
+
+			var res int
+
+			if message.Body == "left" {
+				res = b.checkAndMove(-1, 0)
+			} else if message.Body == "right" {
+				res = b.checkAndMove(1, 0)
+			} else if message.Body == "up" {
+				res = b.checkAndMove(0, -1)
+			} else if message.Body == "down" {
+				res = b.checkAndMove(0, 1)
+			} else {
+				return false
+			}
+
+			switch res {
+			case OK:
+				p.Bot.Edit(message.Channel, b.toMessageString(), identifier)
+			case WIN:
+				p.Bot.Edit(message.Channel, b.toMessageString(), identifier)
+				p.Bot.ReplyToMessageIdentifier(message.Channel, "congratulations, you beat the easiest level imaginable.", identifier)
+			case INVALID:
+				p.Bot.ReplyToMessageIdentifier(message.Channel, fmt.Sprintf("you can't move %s", message.Body), identifier)
+			}
+			return true
+		}
+	}
+	return false
+}

plugins/rpgORdie/rpgORdie_test.go

@@ -0,0 +1,3 @@
+package rpgORdie
+
+import ()

plugins/rss/rss.go

@@ -117,3 +117,5 @@ func (p *RSSPlugin) BotMessage(message msg.Message) bool {
 func (p *RSSPlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *RSSPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/sisyphus/sisyphus.go

@@ -0,0 +1,231 @@
+package sisyphus
+
+import (
+	"fmt"
+	"log"
+	"math/rand"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/velour/catbase/bot"
+	"github.com/velour/catbase/bot/msg"
+)
+
+const (
+	BOULDER  = ":full_moon:"
+	MOUNTAIN = ":new_moon:"
+)
+
+type SisyphusPlugin struct {
+	Bot       bot.Bot
+	listenFor map[string]*game
+}
+
+type game struct {
+	id       string
+	channel  string
+	bot      bot.Bot
+	who      string
+	start    time.Time
+	size     int
+	current  int
+	nextPush time.Time
+	nextDec  time.Time
+	timers   [2]*time.Timer
+	ended    bool
+	nextAns  int
+}
+
+func NewRandomGame(bot bot.Bot, channel, who string) *game {
+	size := rand.Intn(9) + 2
+	g := game{
+		channel: channel,
+		bot:     bot,
+		who:     who,
+		start:   time.Now(),
+		size:    size,
+		current: size / 2,
+	}
+	g.id = bot.SendMessage(channel, g.toMessageString())
+
+	g.schedulePush()
+	g.scheduleDecrement()
+
+	return &g
+}
+
+func (g *game) scheduleDecrement() {
+	if g.timers[0] != nil {
+		g.timers[0].Stop()
+	}
+	minDec := g.bot.Config().Sisyphus.MinDecrement
+	maxDec := g.bot.Config().Sisyphus.MinDecrement
+	g.nextDec = time.Now().Add(time.Duration((minDec + rand.Intn(maxDec))) * time.Minute)
+	go func() {
+		t := time.NewTimer(g.nextDec.Sub(time.Now()))
+		g.timers[0] = t
+		select {
+		case <-t.C:
+			g.handleDecrement()
+		}
+	}()
+}
+
+func (g *game) schedulePush() {
+	if g.timers[1] != nil {
+		g.timers[1].Stop()
+	}
+	minPush := g.bot.Config().Sisyphus.MinPush
+	maxPush := g.bot.Config().Sisyphus.MaxPush
+	g.nextPush = time.Now().Add(time.Duration(rand.Intn(maxPush)+minPush) * time.Minute)
+	go func() {
+		t := time.NewTimer(g.nextPush.Sub(time.Now()))
+		g.timers[1] = t
+		select {
+		case <-t.C:
+			g.handleNotify()
+		}
+	}()
+}
+
+func (g *game) endGame() {
+	for _, t := range g.timers {
+		t.Stop()
+	}
+	g.ended = true
+}
+
+func (g *game) handleDecrement() {
+	g.current++
+	g.bot.Edit(g.channel, g.toMessageString(), g.id)
+	if g.current > g.size-2 {
+		g.bot.ReplyToMessageIdentifier(g.channel, "you lose", g.id)
+		msg := fmt.Sprintf("%s just lost the game after %s", g.who, time.Now().Sub(g.start))
+		g.bot.SendMessage(g.channel, msg)
+		g.endGame()
+	} else {
+		g.scheduleDecrement()
+	}
+}
+
+func (g *game) handleNotify() {
+	g.bot.ReplyToMessageIdentifier(g.channel, "You can push now.\n"+g.generateQuestion(), g.id)
+}
+
+func (g *game) generateQuestion() string {
+	n1 := rand.Intn(99) + (rand.Intn(9)+1)*100
+	n2 := rand.Intn(99) + (rand.Intn(9)+1)*100
+	var op string
+	switch i := rand.Intn(3); i {
+	case 0:
+		// times
+		g.nextAns = n1 * n2
+		op = "*"
+	case 1:
+		// plus
+		g.nextAns = n1 + n2
+		op = "+"
+	case 2:
+		// minus
+		g.nextAns = n1 - n2
+		op = "-"
+	}
+	return fmt.Sprintf("What is %d %s %d?", n1, op, n2)
+}
+
+func (g *game) checkAnswer(ans string) bool {
+	if strings.Contains(ans, strconv.Itoa(g.nextAns)) {
+		g.current--
+		if g.current < 0 {
+			g.current = 0
+		}
+		return true
+	}
+	return false
+}
+
+func (g *game) toMessageString() string {
+	out := ""
+	for i := 0; i < g.size; i++ {
+		for j := 0; j < i; j++ {
+			out = out + MOUNTAIN
+		}
+		if i == g.current {
+			out = out + BOULDER
+		} else if i == g.current+1 {
+			out = out + ":" + g.who + ":"
+		}
+		out = out + "\n"
+	}
+	return out
+}
+
+func New(b bot.Bot) *SisyphusPlugin {
+	return &SisyphusPlugin{
+		Bot:       b,
+		listenFor: map[string]*game{},
+	}
+}
+
+func (p *SisyphusPlugin) Message(message msg.Message) bool {
+	if strings.ToLower(message.Body) == "start sisyphus" {
+		b := NewRandomGame(p.Bot, message.Channel, message.User.Name)
+		p.listenFor[b.id] = b
+		p.Bot.ReplyToMessageIdentifier(message.Channel, "Over here.", b.id)
+		return true
+	}
+	return false
+}
+
+func (p *SisyphusPlugin) Help(channel string, parts []string) {
+	p.Bot.SendMessage(channel, "https://en.wikipedia.org/wiki/Sisyphus")
+}
+
+func (p *SisyphusPlugin) Event(kind string, message msg.Message) bool {
+	return false
+}
+
+func (p *SisyphusPlugin) BotMessage(message msg.Message) bool {
+	return false
+}
+
+func (p *SisyphusPlugin) RegisterWeb() *string {
+	return nil
+}
+
+func (p *SisyphusPlugin) ReplyMessage(message msg.Message, identifier string) bool {
+	if strings.ToLower(message.User.Name) != strings.ToLower(p.Bot.Config().Nick) {
+		if g, ok := p.listenFor[identifier]; ok {
+
+			log.Printf("got message on %s: %+v", identifier, message)
+
+			if g.ended {
+				return false
+			}
+
+			if strings.ToLower(message.Body) == "end game" {
+				g.endGame()
+				return true
+			}
+
+			if time.Now().After(g.nextPush) {
+				if g.checkAnswer(message.Body) {
+					p.Bot.Edit(message.Channel, g.toMessageString(), identifier)
+					g.schedulePush()
+					msg := fmt.Sprintf("Ok. You can push again in %s", g.nextPush.Sub(time.Now()))
+					p.Bot.ReplyToMessageIdentifier(message.Channel, msg, identifier)
+				} else {
+					p.Bot.ReplyToMessageIdentifier(message.Channel, "you lose", identifier)
+					msg := fmt.Sprintf("%s just lost the sisyphus game after %s", g.who, time.Now().Sub(g.start))
+					p.Bot.SendMessage(message.Channel, msg)
+					g.endGame()
+				}
+			} else {
+				p.Bot.ReplyToMessageIdentifier(message.Channel, "you cannot push yet", identifier)
+			}
+			return true
+		}
+	}
+	return false
+}

plugins/sisyphus/sisyphus_test.go

@@ -0,0 +1 @@
+package sisyphus

plugins/stats/stats.go

@@ -275,3 +275,5 @@ func (p *StatsPlugin) mkSightingStat(message msg.Message) stats {
 func (p *StatsPlugin) mkChannelStat(message msg.Message) stats {
 	return stats{stat{mkDay(), "channel", message.Channel, 1}}
 }
+
+func (p *StatsPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/talker/talker.go

@@ -119,3 +119,5 @@ func (p *TalkerPlugin) BotMessage(message msg.Message) bool {
 func (p *TalkerPlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *TalkerPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/tell/tell.go

@@ -0,0 +1,47 @@
+package tell
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/velour/catbase/bot"
+	"github.com/velour/catbase/bot/msg"
+)
+
+type delayedMsg string
+
+type TellPlugin struct {
+	b     bot.Bot
+	users map[string][]string
+}
+
+func New(b bot.Bot) *TellPlugin {
+	return &TellPlugin{b, make(map[string][]string)}
+}
+
+func (t *TellPlugin) Message(message msg.Message) bool {
+	if strings.HasPrefix(strings.ToLower(message.Body), "tell") {
+		parts := strings.Split(message.Body, " ")
+		target := strings.ToLower(parts[1])
+		newMessage := strings.Join(parts[2:], " ")
+		newMessage = fmt.Sprintf("Hey, %s. %s said: %s", target, message.User.Name, newMessage)
+		t.users[target] = append(t.users[target], newMessage)
+		t.b.SendMessage(message.Channel, fmt.Sprintf("Okay. I'll tell %s.", target))
+		return true
+	}
+	uname := strings.ToLower(message.User.Name)
+	if msg, ok := t.users[uname]; ok && len(msg) > 0 {
+		for _, m := range msg {
+			t.b.SendMessage(message.Channel, string(m))
+		}
+		t.users[uname] = []string{}
+		return true
+	}
+	return false
+}
+
+func (t *TellPlugin) Event(kind string, message msg.Message) bool { return false }
+func (t *TellPlugin) ReplyMessage(msg.Message, string) bool       { return false }
+func (t *TellPlugin) BotMessage(message msg.Message) bool         { return false }
+func (t *TellPlugin) Help(channel string, parts []string)         {}
+func (t *TellPlugin) RegisterWeb() *string                        { return nil }

plugins/twitch/twitch.go

@@ -238,3 +238,5 @@ func (p *TwitchPlugin) checkTwitch(channel string, twitcher *Twitcher, alwaysPri
 		twitcher.game = game
 	}
 }
+
+func (p *TwitchPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/your/your.go

@@ -66,3 +66,5 @@ func (p *YourPlugin) BotMessage(message msg.Message) bool {
 func (p *YourPlugin) RegisterWeb() *string {
 	return nil
 }
+
+func (p *YourPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

plugins/zork/zork.go

@@ -122,3 +122,5 @@ func (p *ZorkPlugin) Help(ch string, _ []string) {
 }
 
 func (p *ZorkPlugin) RegisterWeb() *string { return nil }
+
+func (p *ZorkPlugin) ReplyMessage(message msg.Message, identifier string) bool { return false }

slack/slack.go

@@ -5,6 +5,7 @@ package slack
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"html"
 	"io"
@@ -15,7 +16,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"sync/atomic"
+	// "sync/atomic"
 	"time"
 
 	"github.com/velour/catbase/bot"
@@ -36,10 +37,13 @@ type Slack struct {
 
 	users map[string]string
 
+	myBotID string
+
 	emoji map[string]string
 
-	eventReceived   func(msg.Message)
+	eventReceived        func(msg.Message)
-	messageReceived func(msg.Message)
+	messageReceived      func(msg.Message)
+	replyMessageReceived func(msg.Message, string)
 }
 
 var idCounter uint64
@@ -132,7 +136,9 @@ type slackMessage struct {
 	Text     string `json:"text"`
 	User     string `json:"user"`
 	Username string `json:"username"`
+	BotID    string `json:"bot_id"`
 	Ts       string `json:"ts"`
+	ThreadTs string `json:"thread_ts"`
 	Error    struct {
 		Code uint64 `json:"code"`
 		Msg  string `json:"msg"`
@@ -163,6 +169,27 @@ func New(c *config.Config) *Slack {
 	}
 }
 
+func checkReturnStatus(response *http.Response) bool {
+	type Response struct {
+		OK bool `json:"ok"`
+	}
+
+	body, err := ioutil.ReadAll(response.Body)
+	response.Body.Close()
+	if err != nil {
+		log.Printf("Error reading Slack API body: %s", err)
+		return false
+	}
+
+	var resp Response
+	err = json.Unmarshal(body, &resp)
+	if err != nil {
+		log.Printf("Error parsing message response: %s", err)
+		return false
+	}
+	return resp.OK
+}
+
 func (s *Slack) RegisterEventReceived(f func(msg.Message)) {
 	s.eventReceived = f
 }
@@ -171,32 +198,117 @@ func (s *Slack) RegisterMessageReceived(f func(msg.Message)) {
 	s.messageReceived = f
 }
 
-func (s *Slack) SendMessageType(channel, messageType, subType, message string) error {
+func (s *Slack) RegisterReplyMessageReceived(f func(msg.Message, string)) {
-	m := slackMessage{
+	s.replyMessageReceived = f
-		ID:      atomic.AddUint64(&idCounter, 1),
+}
-		Type:    messageType,
+
-		SubType: subType,
+func (s *Slack) SendMessageType(channel, message string, meMessage bool) (string, error) {
-		Channel: channel,
+	postUrl := "https://slack.com/api/chat.postMessage"
-		Text:    message,
+	if meMessage {
+		postUrl = "https://slack.com/api/chat.meMessage"
 	}
-	err := websocket.JSON.Send(s.ws, m)
+
+	resp, err := http.PostForm(postUrl,
+		url.Values{"token": {s.config.Slack.Token},
+			"as_user": {"true"},
+			"channel": {channel},
+			"text":    {message},
+		})
+
 	if err != nil {
 		log.Printf("Error sending Slack message: %s", err)
 	}
-	return err
+
+	body, err := ioutil.ReadAll(resp.Body)
+	resp.Body.Close()
+	if err != nil {
+		log.Fatalf("Error reading Slack API body: %s", err)
+	}
+
+	log.Println(string(body))
+
+	type MessageResponse struct {
+		OK        bool   `json:"ok"`
+		Timestamp string `json:"ts"`
+		Message struct {
+			BotID  string `json:"bot_id"`
+		} `json:"message"`
+	}
+
+	var mr MessageResponse
+	err = json.Unmarshal(body, &mr)
+	if err != nil {
+		log.Fatalf("Error parsing message response: %s", err)
+	}
+
+	if !mr.OK {
+		return "", errors.New("failure response received")
+	}
+
+	s.myBotID = mr.Message.BotID
+
+	return mr.Timestamp, err
 }
 
-func (s *Slack) SendMessage(channel, message string) {
+func (s *Slack) SendMessage(channel, message string) string {
 	log.Printf("Sending message to %s: %s", channel, message)
-	s.SendMessageType(channel, "message", "", message)
+	identifier, _ := s.SendMessageType(channel, message, false)
+	return identifier
 }
 
-func (s *Slack) SendAction(channel, message string) {
+func (s *Slack) SendAction(channel, message string) string {
 	log.Printf("Sending action to %s: %s", channel, message)
-	s.SendMessageType(channel, "message", "me_message", "_"+message+"_")
+	identifier, _ := s.SendMessageType(channel, "_"+message+"_", true)
+	return identifier
 }
 
-func (s *Slack) React(channel, reaction string, message msg.Message) {
+func (s *Slack) ReplyToMessageIdentifier(channel, message, identifier string) (string, bool) {
+	resp, err := http.PostForm("https://slack.com/api/chat.postMessage",
+		url.Values{"token": {s.config.Slack.Token},
+			"as_user":   {"true"},
+			"channel":   {channel},
+			"text":      {message},
+			"thread_ts": {identifier},
+		})
+
+	if err != nil {
+		log.Printf("Error sending Slack reply: %s", err)
+		return "", false
+	}
+
+	body, err := ioutil.ReadAll(resp.Body)
+	resp.Body.Close()
+	if err != nil {
+		log.Printf("Error reading Slack API body: %s", err)
+		return "", false
+	}
+
+	log.Println(string(body))
+
+	type MessageResponse struct {
+		OK        bool   `json:"ok"`
+		Timestamp string `json:"ts"`
+	}
+
+	var mr MessageResponse
+	err = json.Unmarshal(body, &mr)
+	if err != nil {
+		log.Printf("Error parsing message response: %s", err)
+		return "", false
+	}
+
+	if !mr.OK {
+		return "", false
+	}
+
+	return mr.Timestamp, err == nil
+}
+
+func (s *Slack) ReplyToMessage(channel, message string, replyTo msg.Message) (string, bool) {
+	return s.ReplyToMessageIdentifier(channel, message, replyTo.AdditionalData["RAW_SLACK_TIMESTAMP"])
+}
+
+func (s *Slack) React(channel, reaction string, message msg.Message) bool {
 	log.Printf("Reacting in %s: %s", channel, reaction)
 	resp, err := http.PostForm("https://slack.com/api/reactions.add",
 		url.Values{"token": {s.config.Slack.Token},
@@ -204,9 +316,24 @@ func (s *Slack) React(channel, reaction string, message msg.Message) {
 			"channel":   {channel},
 			"timestamp": {message.AdditionalData["RAW_SLACK_TIMESTAMP"]}})
 	if err != nil {
-		log.Printf("Error sending Slack reaction: %s", err)
+		log.Println("reaction failed: %s", err)
+		return false
 	}
-	log.Print(resp)
+	return checkReturnStatus(resp)
+}
+
+func (s *Slack) Edit(channel, newMessage, identifier string) bool {
+	log.Printf("Editing in (%s) %s: %s", identifier, channel, newMessage)
+	resp, err := http.PostForm("https://slack.com/api/chat.update",
+		url.Values{"token": {s.config.Slack.Token},
+			"channel": {channel},
+			"text":    {newMessage},
+			"ts":      {identifier}})
+	if err != nil {
+		log.Println("edit failed: %s", err)
+		return false
+	}
+	return checkReturnStatus(resp)
 }
 
 func (s *Slack) GetEmojiList() map[string]string {
@@ -243,7 +370,6 @@ func (s *Slack) populateEmojiList() {
 func (s *Slack) receiveMessage() (slackMessage, error) {
 	var msg []byte
 	m := slackMessage{}
-	//err := websocket.JSON.Receive(s.ws, &m)
 	err := websocket.Message.Receive(s.ws, &msg)
 	if err != nil {
 		log.Println("Error decoding WS message")
@@ -273,14 +399,18 @@ func (s *Slack) Serve() error {
 		}
 		switch msg.Type {
 		case "message":
-			if !msg.Hidden {
+			isItMe := msg.BotID != "" && msg.BotID == s.myBotID
+			if !isItMe && !msg.Hidden && msg.ThreadTs == "" {
 				m := s.buildMessage(msg)
 				if m.Time.Before(s.lastRecieved) {
 					log.Printf("Ignoring message: %+v\nlastRecieved: %v msg: %v", msg.ID, s.lastRecieved, m.Time)
 				} else {
 					s.lastRecieved = m.Time
-					s.messageReceived(s.buildMessage(msg))
+					s.messageReceived(m)
 				}
+			} else if msg.ThreadTs != "" {
+				//we're throwing away some information here by not parsing the correct reply object type, but that's okay
+				s.replyMessageReceived(s.buildLightReplyMessage(msg), msg.ThreadTs)
 			} else {
 				log.Printf("THAT MESSAGE WAS HIDDEN: %+v", msg.ID)
 			}
@@ -337,6 +467,40 @@ func (s *Slack) buildMessage(m slackMessage) msg.Message {
 	}
 }
 
+func (s *Slack) buildLightReplyMessage(m slackMessage) msg.Message {
+	text := html.UnescapeString(m.Text)
+
+	text = fixText(s.getUser, text)
+
+	isCmd, text := bot.IsCmd(s.config, text)
+
+	isAction := m.SubType == "me_message"
+
+	u, _ := s.getUser(m.User)
+	if m.Username != "" {
+		u = m.Username
+	}
+
+	tstamp := slackTStoTime(m.Ts)
+
+	return msg.Message{
+		User: &user.User{
+			ID:   m.User,
+			Name: u,
+		},
+		Body:    text,
+		Raw:     m.Text,
+		Channel: m.Channel,
+		Command: isCmd,
+		Action:  isAction,
+		Host:    string(m.ID),
+		Time:    tstamp,
+		AdditionalData: map[string]string{
+			"RAW_SLACK_TIMESTAMP": m.Ts,
+		},
+	}
+}
+
 // markAllChannelsRead gets a list of all channels and marks each as read
 func (s *Slack) markAllChannelsRead() {
 	chs := s.getAllChannels()