Reduced the messages on the console

This commit is contained in:
Chris Sexton 2012-08-25 00:49:48 -04:00
parent 9c721a0f58
commit 3e7f8d4248
9 changed files with 21 additions and 19 deletions

View File

@ -44,9 +44,9 @@ type User struct {
type Message struct {
User *User
Channel, Body string
Raw string
Raw string
Command bool
Action bool
Action bool
}
// NewBot creates a Bot for a given connection and set of handlers.

View File

@ -87,7 +87,7 @@ func (b *Bot) isCmd(message string) (bool, string) {
}
// Builds our internal message type out of a Conn & Line from irc
func (b *Bot)buildMessage(conn *irc.Conn, line *irc.Line) Message {
func (b *Bot) buildMessage(conn *irc.Conn, line *irc.Line) Message {
// Check for the user
user := b.checkuser(line.Nick)
@ -114,9 +114,9 @@ func (b *Bot)buildMessage(conn *irc.Conn, line *irc.Line) Message {
User: user,
Channel: channel,
Body: filteredMessage,
Raw: message,
Raw: message,
Command: iscmd,
Action: isaction,
Action: isaction,
}
return msg
}
@ -125,7 +125,7 @@ func (b *Bot)buildMessage(conn *irc.Conn, line *irc.Line) Message {
func (b *Bot) MsgRecieved(conn *irc.Conn, line *irc.Line) {
msg := b.buildMessage(conn, line)
if strings.HasPrefix(msg.Body, "help") && msg.Command{
if strings.HasPrefix(msg.Body, "help") && msg.Command {
parts := strings.Fields(strings.ToLower(msg.Body))
b.checkHelp(msg.Channel, parts)
return
@ -169,4 +169,4 @@ func (b *Bot) UserJoined(conn *irc.Conn, line *irc.Line) {
break
}
}
}
}

View File

@ -34,5 +34,8 @@ func Readconfig(version, cfile string) *Config {
panic(err)
}
c.Version = version
fmt.Printf("godeepintir version %s running.\n")
return &c
}

View File

@ -21,7 +21,6 @@ func main() {
flag.Parse() // parses the logging flags.
config := config.Readconfig(Version, *cfile)
fmt.Println(config)
c := irc.SimpleClient(config.Nick)
// Optionally, enable SSL
@ -33,6 +32,7 @@ func main() {
func(conn *irc.Conn, line *irc.Line) {
for _, channel := range config.Channels {
conn.Join(channel)
fmt.Printf("Now talking in %s.\n", channel)
}
})
// And a signal on disconnect

View File

@ -5,10 +5,10 @@ import (
"fmt"
"labix.org/v2/mgo"
"labix.org/v2/mgo/bson"
"math/rand"
"strconv"
"strings"
"time"
"math/rand"
)
// This is a skeleton plugin to serve as an example and quick copy/paste for new plugins.
@ -130,7 +130,7 @@ func (p *BeersPlugin) Message(message bot.Message) bool {
}
// Empty event handler because this plugin does not do anything on event recv
func (p *BeersPlugin) Event(kind string, message bot.Message) bool {
func (p *BeersPlugin) Event(kind string, message bot.Message) bool {
return false
}
@ -199,4 +199,4 @@ func (p *BeersPlugin) doIKnow(nick string) bool {
func (p *BeersPlugin) randomReply(channel string) {
replies := []string{"ZIGGY! ZAGGY!", "HIC!", "Stay thirsty, my friend!"}
p.Bot.SendMessage(channel, replies[rand.Intn(len(replies))])
}
}

View File

@ -57,7 +57,7 @@ func (p *TestPlugin) Help(message bot.Message) {
}
// Empty event handler because this plugin does not do anything on event recv
func (p *TestPlugin) Event(kind string, message bot.Message) bool {
func (p *TestPlugin) Event(kind string, message bot.Message) bool {
return false
}
@ -91,7 +91,6 @@ func (fp FalsePlugin) LoadData() {
}
// Empty event handler because this plugin does not do anything on event recv
func (p *FalsePlugin) Event(kind string, message bot.Message) bool {
func (p *FalsePlugin) Event(kind string, message bot.Message) bool {
return false
}

View File

@ -64,7 +64,7 @@ func (p *RememberPlugin) Message(message bot.Message) bool {
return true
}
for i := len(p.Log[message.Channel])-1; i >= 0; i-- {
for i := len(p.Log[message.Channel]) - 1; i >= 0; i-- {
entry := p.Log[message.Channel][i]
// find the entry we want
fmt.Printf("Comparing '%s' to '%s'\n", entry.Raw, snip)
@ -159,6 +159,6 @@ func (p *RememberPlugin) quoteTimer(channel string) {
}
// Empty event handler because this plugin does not do anything on event recv
func (p *RememberPlugin) Event(kind string, message bot.Message) bool {
func (p *RememberPlugin) Event(kind string, message bot.Message) bool {
return false
}

View File

@ -36,6 +36,6 @@ func (p *SkeletonPlugin) Help(channel string, parts []string) {
}
// Empty event handler because this plugin does not do anything on event recv
func (p *SkeletonPlugin) Event(kind string, message bot.Message) bool {
func (p *SkeletonPlugin) Event(kind string, message bot.Message) bool {
return false
}

View File

@ -2,8 +2,8 @@ package plugins
import (
"bitbucket.org/phlyingpenguin/godeepintir/bot"
"strings"
"fmt"
"strings"
)
type TalkerPlugin struct {
@ -44,7 +44,7 @@ func (p *TalkerPlugin) Help(channel string, parts []string) {
}
// Empty event handler because this plugin does not do anything on event recv
func (p *TalkerPlugin) Event(kind string, message bot.Message) bool {
func (p *TalkerPlugin) Event(kind string, message bot.Message) bool {
if kind == "JOIN" && message.User.Name != p.Bot.Config.Nick {
msg := fmt.Sprintf("Joins upset the hivemind's OCD, %s.", message.User.Name)
p.Bot.SendMessage(message.Channel, msg)