libtransport.git Changeset - 2b836edd7985

Changeset - 2b836edd7985

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 14 years ago 2011-11-11 10:00:11
hanzz.k@gmail.com

Send current presences to newly connected resource

2 files changed with 34 insertions and 17 deletions:

include/transport/user.h

src/user.cpp

0 comments (0 inline, 0 general)

include/transport/user.h

➞

Show inline comments

@@ @@ -135,6 +135,7 @@ class User : public Swift::EntityCapsProvider { @@
 		time_t m_lastActivity;
 		std::map<Swift::JID, Swift::DiscoInfo::ref> m_legacyCaps;
 		std::vector<boost::shared_ptr<Swift::OutgoingFileTransfer> > m_filetransfers;
 		int m_resources;
 };
+}

src/user.cpp

➞

Show inline comments

@@ @@ -43,7 +43,7 @@ namespace Transport { @@
 static LoggerPtr logger = Logger::getLogger("User");
 User::User(const Swift::JID &jid, UserInfo &userInfo, Component *component, UserManager *userManager) {
 	m_jid = jid;
+	m_jid = jid.toBare();
 	m_data = NULL;
 	m_component = component;
 	m_connected = false;
 	m_readyForConnect = false;
 	m_ignoreDisconnect = false;
 	m_resources = 0;
 	m_reconnectTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(10000);
 	m_reconnectTimer->onTick.connect(boost::bind(&User::onConnectingTimeout, this));
@@ @@ -129,30 +130,37 @@ void User::sendCurrentPresence() { @@
 		return;
+	}
 	if (m_connected) {
 		Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());
 		if (highest) {
 			Swift::Presence::ref response = Swift::Presence::create(highest);
 			response->setTo(m_jid);
 			response->setFrom(m_component->getJID());
 			m_component->getStanzaChannel()->sendPresence(response);
 	std::vector<Swift::Presence::ref> presences = m_presenceOracle->getAllPresence(m_jid);
 	foreach(Swift::Presence::ref presence, presences) {
 		if (presence->getType() == Swift::Presence::Unavailable) {
 			continue;
+		}
 		if (m_connected) {
 			Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());
 			if (highest) {
 				Swift::Presence::ref response = Swift::Presence::create(highest);
 				response->setTo(presence->getFrom());
 				response->setFrom(m_component->getJID());
 				m_component->getStanzaChannel()->sendPresence(response);
+			}
 			else {
 				Swift::Presence::ref response = Swift::Presence::create();
 				response->setTo(presence->getFrom());
 				response->setFrom(m_component->getJID());
 				response->setType(Swift::Presence::Unavailable);
 				m_component->getStanzaChannel()->sendPresence(response);
+			}
+		}
 		else {
 			Swift::Presence::ref response = Swift::Presence::create();
-			response->setTo(m_jid.toBare());
+			response->setTo(presence->getFrom());
 			response->setFrom(m_component->getJID());
 			response->setType(Swift::Presence::Unavailable);
 			response->setStatus("Connecting");
 			m_component->getStanzaChannel()->sendPresence(response);
+		}
+	}
 	else {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(m_jid.toBare());
 		response->setFrom(m_component->getJID());
 		response->setType(Swift::Presence::Unavailable);
 		response->setStatus("Connecting");
 		m_component->getStanzaChannel()->sendPresence(response);
+	}
+}
 void User::setConnected(bool connected) {
@@ @@ -164,6 +172,8 @@ void User::setConnected(bool connected) { @@
+}
 void User::handlePresence(Swift::Presence::ref presence) {
 	int currentResourcesCount = m_presenceOracle->getAllPresence(m_jid).size();
 	if (!m_connected) {
 		// we are not connected to legacy network, so we should do it when disco#info arrive :)
 		if (m_readyForConnect == false) {
@@ @@ -231,9 +241,15 @@ void User::handlePresence(Swift::Presence::ref presence) { @@
+		}
 		else {
 			sendCurrentPresence();
 			// This resource is new, so we have to send buddies presences
 			if (currentResourcesCount != m_resources) {
 				m_rosterManager->sendCurrentPresences(presence->getFrom());
+			}
+		}
+	}
 	m_resources = currentResourcesCount;
 	// Change legacy network presence
 	if (m_readyForConnect) {

0 comments (0 inline, 0 general)