libtransport.git Changeset - 6eb53393c74f

Changeset - 6eb53393c74f

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 13 years ago 2013-03-19 15:18:03
hanzz.k@gmail.com

Libtransport: Do not send subscribe presences from full JID

3 files changed with 4 insertions and 3 deletions:

spectrum/src/sample.cfg

src/rostermanager.cpp

src/tests/rostermanager.cpp

0 comments (0 inline, 0 general)

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -11,14 +11,14 @@ pidfile=./test.pid @@
 #admin_jid=admin@localhost
 admin_password=test
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
 #backend=../..//backends/swiften/spectrum2_swiften_backend
 #backend=../../backends/twitter/spectrum2_twitter_backend
 backend=/home/hanzz/code/libtransport/backends/libcommuni/spectrum2_libcommuni_backend
 backend=../../backends/twitter/spectrum2_twitter_backend
 #backend=/home/hanzz/code/libtransport/backends/libcommuni/spectrum2_libcommuni_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=any
 #protocol=prpl-icq
 working_dir=./
 portfile=./$jid.port

src/rostermanager.cpp

➞

Show inline comments

 	m_component->getStanzaChannel()->sendPresence(response);
+}
 void RosterManager::sendBuddySubscribePresence(Buddy *buddy) {
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(m_user->getJID());
 	response->setFrom(buddy->getJID());
+	response->setFrom(buddy->getJID().toBare());
 	response->setType(Swift::Presence::Subscribe);
 	if (!buddy->getAlias().empty()) {
 		response->addPayload(boost::make_shared<Swift::Nickname>(buddy->getAlias()));
+	}
 	m_component->getStanzaChannel()->sendPresence(response);
+}

src/tests/rostermanager.cpp

➞

Show inline comments

 		received.clear();
 		User *user = userManager->getUser("user@localhost");
 		user->getRosterManager()->sendBuddySubscribePresence(user->getRosterManager()->getBuddy("buddy1"));
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Nickname>());
 		CPPUNIT_ASSERT_EQUAL(std::string("Buddy 1"), getStanza(received[0])->getPayload<Swift::Nickname>()->getNickname());
 		CPPUNIT_ASSERT_EQUAL(std::string("buddy1@localhost"), getStanza(received[0])->getFrom().toString());
+	}
 	void setBuddyNoAlias() {
 		User *user = userManager->getUser("user@localhost");
 		CPPUNIT_ASSERT(user);

0 comments (0 inline, 0 general)