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 21 insertions and 4 deletions:

include/transport/user.h

src/user.cpp

0 comments (0 inline, 0 general)

include/transport/user.h

➞

Show inline comments

@@ @@ -132,9 +132,10 @@ class User : public Swift::EntityCapsProvider { @@
 		bool m_ignoreDisconnect;
 		Swift::Timer::ref m_reconnectTimer;
 		boost::shared_ptr<Swift::Connection> connection;
 		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

@@ @@ -40,23 +40,24 @@ using namespace boost; @@
 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_presenceOracle = component->m_presenceOracle;
 	m_entityCapsManager = component->m_entityCapsManager;
 	m_userManager = userManager;
 	m_userInfo = userInfo;
 	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));
 	m_rosterManager = new RosterManager(this, m_component);
 	m_conversationManager = new ConversationManager(this, m_component);
 void User::sendCurrentPresence() {
 	if (m_component->inServerMode()) {
 		return;
+	}
 	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(m_jid);
+				response->setTo(presence->getFrom());
 				response->setFrom(m_component->getJID());
 				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);
 				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);
+		}
+	}
+}
 void User::setConnected(bool connected) {
 	m_connected = connected;
 	setIgnoreDisconnect(false);
 	updateLastActivity();
 	sendCurrentPresence();
+}
 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) {
 			// Forward status message to legacy network, but only if it's sent from active resource
 // 					if (m_activeResource == presence->getFrom().getResource().getUTF8String()) {
 				response->setFrom(m_component->getJID());
 				response->setType(Swift::Presence::Unavailable);
 				m_component->getStanzaChannel()->sendPresence(response);
+		}
 		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) {
 		Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());
 		if (highest) {

0 comments (0 inline, 0 general)