Multiple resources handling

1 files changed, 6 insertions, 5 deletions

diff --git a/xmpp/handlers.go b/xmpp/handlers.go
index ee767ad..59d4c62 100644
--- a/xmpp/handlers.go
+++ b/xmpp/handlers.go
@@ -85,7 +85,7 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
 			}).Error(errors.Wrap(err, "Invalid to JID!"))
 		} else if toID == gateway.Jid.Bare() {
 			if strings.HasPrefix(msg.Body, "/") {
-				response := session.ProcessTransportCommand(msg.Body)
+				response := session.ProcessTransportCommand(msg.Body, fromJid.Resource)
 				if response != "" {
 					gateway.SendMessage(msg.From, "", response, component)
 				}
@@ -169,17 +169,18 @@ func handlePresence(s xmpp.Sender, p stanza.Presence) {
 	switch p.Type {
 	// destroy session
 	case "unsubscribed", "unsubscribe":
-		session.Disconnect()
-		delete(sessions, bareFromJid)
+		if session.Disconnect(fromJid.Resource, false) {
+			delete(sessions, bareFromJid)
+		}
 	// go offline
 	case "unavailable", "error":
-		session.Disconnect()
+		session.Disconnect(fromJid.Resource, false)
 	// go online
 	case "probe", "", "online":
 		// due to the weird implementation of go-tdlib wrapper, it won't
 		// return the client instance until successful authorization
 		go func() {
-			err = session.Connect()
+			err = session.Connect(fromJid.Resource)
 			if err != nil {
 				log.Error(errors.Wrap(err, "TDlib connection failure"))
 			} else {