From 6eb53393c74fd97bfd2e19d0a196de79cdf22a16 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Tue, 19 Mar 2013 15:18:03 +0100 Subject: [PATCH] Libtransport: Do not send subscribe presences from full JID --- spectrum/src/sample.cfg | 4 ++-- src/rostermanager.cpp | 2 +- src/tests/rostermanager.cpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spectrum/src/sample.cfg b/spectrum/src/sample.cfg index 75735b97..edb5af77 100644 --- a/spectrum/src/sample.cfg +++ b/spectrum/src/sample.cfg @@ -14,8 +14,8 @@ admin_password=test #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 diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp index 72f6af25..b91a9e43 100644 --- a/src/rostermanager.cpp +++ b/src/rostermanager.cpp @@ -200,7 +200,7 @@ void RosterManager::sendBuddyUnsubscribePresence(Buddy *buddy) { 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(buddy->getAlias())); diff --git a/src/tests/rostermanager.cpp b/src/tests/rostermanager.cpp index b9df7a0f..5b58a722 100644 --- a/src/tests/rostermanager.cpp +++ b/src/tests/rostermanager.cpp @@ -70,6 +70,7 @@ class RosterManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest { CPPUNIT_ASSERT_EQUAL(1, (int) received.size()); CPPUNIT_ASSERT(getStanza(received[0])->getPayload()); CPPUNIT_ASSERT_EQUAL(std::string("Buddy 1"), getStanza(received[0])->getPayload()->getNickname()); + CPPUNIT_ASSERT_EQUAL(std::string("buddy1@localhost"), getStanza(received[0])->getFrom().toString()); }