stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove resource from room when the client disconnects without disconnecting the rooms

Browse source
This commit is contained in:
Jan Kaluza 2012-09-25 12:48:30 +02:00
parent eb1df41b3e
commit 4100b4caf8
4 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/transport/conversationmanager.h
View file

@ -70,6 +70,7 @@ class ConversationManager {
void removeConversation(Conversation *conv);
void resetResources();
void removeJID(const Swift::JID &jid);
private:
void handleMessageReceived(Swift::Message::ref message);

6
src/conversationmanager.cpp
View file

@ -89,6 +89,12 @@ void ConversationManager::resetResources() {
}
}
void ConversationManager::removeJID(const Swift::JID &jid) {
for (std::map<std::string, Conversation *>::const_iterator it = m_convs.begin(); it != m_convs.end(); it++) {
(*it).second->removeJID(jid);
}
}
void ConversationManager::handleMessageReceived(Swift::Message::ref message) {
// std::string name = message->getTo().getUnescapedNode();
// if (name.find_last_of("%") != std::string::npos) { // OK when commented

24
src/tests/user.cpp
View file

@ -28,6 +28,7 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
CPPUNIT_TEST(handlePresenceJoinRoomTwoResources);
CPPUNIT_TEST(handlePresenceLeaveRoom);
CPPUNIT_TEST(handlePresenceLeaveRoomTwoResources);
CPPUNIT_TEST(handlePresenceLeaveRoomTwoResourcesOneDisconnects);
CPPUNIT_TEST(leaveJoinedRoom);
CPPUNIT_TEST(handleDisconnected);
CPPUNIT_TEST(handleDisconnectedReconnect);
@ -253,6 +254,29 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
}
void handlePresenceLeaveRoomTwoResourcesOneDisconnects() {
handlePresenceJoinRoomTwoResources();
received.clear();
User *user = userManager->getUser("user@localhost");
// User is still connected from resource2, so he should not leave the room
Swift::Presence::ref response = Swift::Presence::create();
response->setTo("localhost/hanzz");
response->setFrom("user@localhost/resource");
response->setType(Swift::Presence::Unavailable);
injectPresence(response);
loop->processEvents();
CPPUNIT_ASSERT_EQUAL(std::string(""), room);
CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);
CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
Conversation *conv = user->getConversationManager()->getConversation("#room");
CPPUNIT_ASSERT_EQUAL(1, (int) conv->getJIDs().size());
CPPUNIT_ASSERT_EQUAL(Swift::JID("user@localhost/resource2"), conv->getJIDs().front());
}
void leaveJoinedRoom() {
User *user = userManager->getUser("user@localhost");
handlePresenceJoinRoom();

4
src/user.cpp
View file

@ -263,6 +263,10 @@ void User::handlePresence(Swift::Presence::ref presence) {
}
return;
}
if (presence->getType() == Swift::Presence::Unavailable) {
m_conversationManager->removeJID(presence->getFrom());
}
// User wants to disconnect this resource