Add bot version info to library version.

irc-client.go

@@ -19,6 +19,8 @@ import (
 	"time"
 )
 
+const VERSION string = "red-green.com/irc-client 0.1.0"
+
 func StrInArray(strings []string, str string) bool {
 	for _, s := range strings {
 		if s == str {
@@ -54,6 +56,7 @@ type IRCConfig struct {
 	ServerPassword string   `json: ServerPassword` // Password for server
 	AutoJoin       []string `json: AutoJoin`       // Channels to auto-join
 	RejoinDelay    int      `json: RejoinDelay`    // ms to rejoin
+	Version        string   `json: Version`        // Version displayed
 	MyNick         string
 	OnExit         func()
 	Socket         net.Conn
@@ -347,6 +350,9 @@ func (Config *IRCConfig) Action(to string, message string) {
 
 func (Config *IRCConfig) ReaderRoutine() {
 	defer Config.wg.Done()
+	var registering bool
+	// var identified bool
+
 	for {
 		var line string
 		var err error
@@ -359,7 +365,7 @@ func (Config *IRCConfig) ReaderRoutine() {
 
 			results = IRCParse(line)
 
-			if results[1] == "433" {
+			if results[1] == "433" && !registering {
 				// Nick already in use!
 				var newNick string = RandomNick(Config.Nick)
 				Config.MyNick = newNick
@@ -390,9 +396,15 @@ func (Config *IRCConfig) ReaderRoutine() {
 
 						if results[3] == "VERSION" {
 							// Send version reply
+							var version string
+							if Config.Version != "" {
+								version = Config.Version + " " + VERSION
+							} else {
+								version = VERSION
+							}
 							Config.WriteTo(IRCNick(results[0]),
-								fmt.Sprintf("NOTICE %s :\x01VERSION red-green.com/irc-client 0.1\x01",
-									IRCNick(results[0])))
+								fmt.Sprintf("NOTICE %s :\x01VERSION %s\x01",
+									IRCNick(results[0]), version))
 						}
 
 						if results[3] == "TIME" {
@@ -494,6 +506,7 @@ func (Config *IRCConfig) ReaderRoutine() {
 			// This should probably be look for + and contains "r"
 			if (msg.Msg[0] == '+') && (strings.Contains(msg.Msg, "r")) {
 				Config.ReadChannel <- IRCMsg{Cmd: "Identified"}
+				// identified = true
 			}
 			if len(Config.AutoJoin) > 0 {
 				Config.PriorityWrite("JOIN " + strings.Join(Config.AutoJoin, ","))
@@ -512,6 +525,21 @@ func (Config *IRCConfig) ReaderRoutine() {
 			}
 		}
 
+		/*
+			// Needs rate limit, it doesn't always work.  (if they're not on the HOP+ list)
+				if msg.Cmd == "474" && identified {
+
+						:irc.red-green.com 474 meow-bot #chat :Cannot join channel (+b)
+						Msg: ircclient.IRCMsg{MsgParts:[]string{":irc.red-green.com", "474", "meow-bot", "#chat", "Cannot join channel (+b)"}, From:"irc.red-green.com", To:"meow-bot", Cmd:"474", Msg:"#chat"}
+					  :[email protected] NOTICE meow-bot :Access denied.
+					  Msg: ircclient.IRCMsg{MsgParts:[]string{":[email protected]", "NOTICE", "meow-bot", "Access denied."}, From:"ChanServ", To:"meow-bot", Cmd:"NOTICE", Msg:"Access denied."}
+					if Config.IsAuto(msg.MsgParts[3]) {
+						Config.PriorityWrite(fmt.Sprintf("CS UNBAN %s", msg.MsgParts[3]))
+						time.AfterFunc(time.Duration(Config.RejoinDelay)*time.Millisecond, func() { Config.WriteTo(msg.To, "JOIN "+msg.MsgParts[3]) })
+					}
+				}
+		*/
+
 		if Config.ReadChannel != nil {
 			Config.ReadChannel <- msg
 		}
@@ -520,6 +548,7 @@ func (Config *IRCConfig) ReaderRoutine() {
 			// End MOTD, or MOTD Missing
 			var reg IRCMsg = IRCMsg{Cmd: "EndMOTD"}
 			Config.ReadChannel <- reg
+			registering = true
 		}
 
 		if msg.Cmd == "NICK" {