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

Don't handle unavailable presence if we know that we're reconnecting and removing user

Browse source
This commit is contained in:
HanzZ 2011-08-09 00:45:51 +02:00
parent 3eff71c90d
commit cc37caf803
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/usermanager.cpp
View file

@ -100,7 +100,7 @@ int UserManager::getUserCount() {
void UserManager::handlePresence(Swift::Presence::ref presence) {
std::string barejid = presence->getTo().toBare().toString();
std::string userkey = presence->getFrom().toBare().toString();
std::cout << "PRESENCE " << presence->getType() << "\n";
User *user = getUser(userkey);
if (!user) {
if (CONFIG_STRING(m_component->getConfig(), "service.admin_username") == presence->getFrom().getNode()) {
@ -212,9 +212,11 @@ void UserManager::handleRemoveTimeout(const std::string jid, bool reconnect) {
msg->setTo(user->getJID().toBare());
msg->setFrom(m_component->getJID());
m_component->getStanzaChannel()->sendMessage(msg);
if (m_component->inServerMode()) {
dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(user->getJID().toBare(), boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
}
m_component->onUserPresenceReceived.disconnect(bind(&UserManager::handlePresence, this, _1));
if (m_component->inServerMode()) {
dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(user->getJID().toBare(), boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
}
m_component->onUserPresenceReceived.connect(bind(&UserManager::handlePresence, this, _1));
}
removeUser(user);
}