Merge pull request #34 from crackcomm/master

Status and status message options

_example/example-gui.go

@@ -68,7 +68,7 @@ func main() {
 		os.Exit(0)
 	}
 
-	xmpp.DefaultConfig = tls.Config {
+	xmpp.DefaultConfig = tls.Config{
 		ServerName:         "talk.google.com",
 		InsecureSkipVerify: false,
 	}

_example/example.go

@@ -14,6 +14,8 @@ import (
 var server = flag.String("server", "talk.google.com:443", "server")
 var username = flag.String("username", "", "username")
 var password = flag.String("password", "", "password")
+var status = flag.String("status", "xa", "status")
+var statusMessage = flag.String("status-msg", "I for one welcome our new codebot overlords.", "status message")
 var notls = flag.Bool("notls", false, "No TLS")
 var debug = flag.Bool("debug", false, "debug output")
 var session = flag.Bool("session", false, "use server session")
@@ -34,7 +36,7 @@ func main() {
 	}
 
 	if !*notls {
-		xmpp.DefaultConfig = tls.Config {
+		xmpp.DefaultConfig = tls.Config{
 			ServerName:         serverName(*server),
 			InsecureSkipVerify: false,
 		}
@@ -47,7 +49,10 @@ func main() {
 		Password:      *password,
 		NoTLS:         *notls,
 		Debug:         *debug,
-		Session:  *session}
+		Session:       *session,
+		Status:        *status,
+		StatusMessage: *statusMessage,
+	}
 
 	talk, err = options.NewClient()
 

xmpp.go

@@ -133,8 +133,14 @@ type Options struct {
 	// Debug output
 	Debug bool
 
-	//Use server sessions
+	// Use server sessions
 	Session bool
+
+	// Presence Status
+	Status string
+
+	// Status message
+	StatusMessage string
 }
 
 // NewClient establishes a new Client connection based on a set of Options.
@@ -407,7 +413,8 @@ func (c *Client) init(o *Options) error {
 	}
 
 	// We're connected and can now receive and send messages.
-	fmt.Fprintf(c.conn, "<presence xml:lang='en'><show>xa</show><status>I for one welcome our new codebot overlords.</status></presence>")
+	fmt.Fprintf(c.conn, "<presence xml:lang='en'><show>%s</show><status>%s</status></presence>", o.Status, o.StatusMessage)
+
 	return nil
 }