src/xmpp/chatStateNotification.go

@@ -1,27 +0,0 @@
-package xmpp
-
-import (
-	"encoding/xml"
-)
-
-const (
-	NSChatStatesNotification = "http://jabber.org/protocol/chatstates"
-)
-
-// XEP-0085: Chat States Notification
-
-type Active struct {
-	XMLName xml.Name `xml:"http://jabber.org/protocol/chatstates active"`
-}
-type Composing struct {
-	XMLName xml.Name `xml:"http://jabber.org/protocol/chatstates composing"`
-}
-type Paused struct {
-	XMLName xml.Name `xml:"http://jabber.org/protocol/chatstates paused"`
-}
-type Inactive struct {
-	XMLName xml.Name `xml:"http://jabber.org/protocol/chatstates inactive"`
-}
-type Gone struct {
-	XMLName xml.Name `xml:"http://jabber.org/protocol/chatstates gone"`
-}

src/xmpp/stanza.go

@@ -76,14 +76,7 @@ type Message struct {
 	Body    string   `xml:"body,omitempty"`
 	Thread  string   `xml:"thread,omitempty"`
 	Error   *Error   `xml:"error"`
-
-	Confir *Confirm `xml:"confirm"` // XEP-0070
-
-	Active    *Active    `xml:"active"`    // XEP-0085
-	Composing *Composing `xml:"composing"` // XEP-0085
-	Paused    *Paused    `xml:"paused"`    // XEP-0085
-	Inactive  *Inactive  `xml:"inactive"`  // XEP-0085
-	Gone      *Gone      `xml:"gone"`      // XEP-0085
+	Confir  *Confirm `xml:"confirm"`
 }
 
 // XMPP <presence/> stanza.

src/xmpp/xmpp.go

@@ -195,12 +195,12 @@ func (x *XMPP) receiver() {
 		case "presence":
 			v = &Presence{}
 		default:
-			log.Println("Error. Unexected element: %T %v", start, start)
+			log.Fatal("Unexected element: %T %v", start, start)
 		}
 
 		err = x.stream.Decode(v, start)
 		if err != nil {
-			log.Println("Error. Failed to decode element. ", err)
+			log.Fatal(err)
 		}
 
 		filtered := false