summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-21 21:34:10 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-21 21:34:10 +0100
commit88d10d13ae0b30423452d1688f866bbc5318384e (patch)
tree1ef224ea381c905fac5e22c74e9f5734fd6decf3
parentbfa6491aa037dac6dee1697a4a284b354d164f47 (diff)
Cleanup
-rw-r--r--main.go65
1 files changed, 30 insertions, 35 deletions
diff --git a/main.go b/main.go
index 1ee0ae3..d878cfc 100644
--- a/main.go
+++ b/main.go
@@ -23,46 +23,41 @@ func main() {
c.EnableStateTracking()
discon := make(chan bool)
- c.HandleFunc(irc.DISCONNECTED,
- func(conn *irc.Conn, line *irc.Line) {
- discon <- true
- })
+ c.HandleFunc(irc.DISCONNECTED, func(conn *irc.Conn, line *irc.Line) {
+ discon <- true
+ })
- c.HandleFunc(irc.CONNECTED,
- func(conn *irc.Conn, line *irc.Line) {
- conn.Join(*room)
- go ShowNews(conn, line)
- })
+ c.HandleFunc(irc.CONNECTED, func(conn *irc.Conn, line *irc.Line) {
+ conn.Join(*room)
+ go ShowNews(conn, line)
+ })
- c.HandleFunc(irc.KICK,
- func(conn *irc.Conn, line *irc.Line) {
- conn.Join(*room)
- })
+ c.HandleFunc(irc.KICK, func(conn *irc.Conn, line *irc.Line) {
+ conn.Join(*room)
+ })
- c.HandleFunc(irc.JOIN,
- func(conn *irc.Conn, line *irc.Line) {
- if strings.Contains(line.Ident, "goirc") &&
- line.Nick != conn.Me().Nick {
- log.Printf("kick %+v\n", line.Ident)
- conn.Kick(*room, line.Nick, "imposter")
- }
- })
+ c.HandleFunc(irc.JOIN, func(conn *irc.Conn, line *irc.Line) {
+ if strings.Contains(line.Ident, "goirc") &&
+ line.Nick != conn.Me().Nick {
+ log.Printf("kick %+v\n", line.Ident)
+ conn.Kick(*room, line.Nick, "imposter")
+ }
+ })
- c.HandleFunc(irc.PRIVMSG,
- func(conn *irc.Conn, line *irc.Line) {
- defer func() {
- if r := recover(); r != nil {
- log.Println("catch panic", r)
- }
- }()
- go Dispatch(conn, line)
- go ExtractLinks(conn, line)
- go ExtractRFC(conn, line)
- if line.Public() && line.Nick != conn.Me().Nick {
- go DetectFlood(conn, line)
- Push(line)
+ c.HandleFunc(irc.PRIVMSG, func(conn *irc.Conn, line *irc.Line) {
+ defer func() {
+ if r := recover(); r != nil {
+ log.Println("catch panic", r)
}
- })
+ }()
+ go Dispatch(conn, line)
+ go ExtractLinks(conn, line)
+ go ExtractRFC(conn, line)
+ if line.Public() && line.Nick != conn.Me().Nick {
+ go DetectFlood(conn, line)
+ Push(line)
+ }
+ })
for n := 0; n < maxDiscon; n++ {
log.Println("Connect to", *server)