summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/MUC/MUC.cpp')
-rw-r--r--Swiften/MUC/MUC.cpp67
1 files changed, 34 insertions, 33 deletions
diff --git a/Swiften/MUC/MUC.cpp b/Swiften/MUC/MUC.cpp
index 2b8054f..a6fbcbd 100644
--- a/Swiften/MUC/MUC.cpp
+++ b/Swiften/MUC/MUC.cpp
@@ -3,63 +3,64 @@
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
+#include "Swiften/Presence/PresenceSender.h"
#include "Swiften/Client/StanzaChannel.h"
#include "Swiften/Elements/IQ.h"
-#include "Swiften/Elements/Message.h"
#include "Swiften/Elements/MUCPayload.h"
-#include "Swiften/Elements/Presence.h"
namespace Swift {
typedef std::pair<String, MUCOccupant> StringMUCOccupantPair;
-MUC::MUC(StanzaChannel* stanzaChannel, const JID &muc) : muc_(muc), stanzaChannel_(stanzaChannel) {
- stanzaChannel_->onPresenceReceived.connect(boost::bind(&MUC::handleIncomingPresence, this, _1));
-}
-
-MUC::~MUC() {
+MUC::MUC(StanzaChannel* stanzaChannel, PresenceSender* presenceSender, const JID &muc) : ownMUCJID(muc), stanzaChannel(stanzaChannel), presenceSender(presenceSender) {
+ stanzaChannel->onPresenceReceived.connect(boost::bind(&MUC::handleIncomingPresence, this, _1));
}
void MUC::joinAs(const String &nick) {
+ firstPresenceSeen = false;
+
+ ownMUCJID = JID(ownMUCJID.getNode(), ownMUCJID.getDomain(), nick);
+
boost::shared_ptr<Presence> joinPresence(new Presence());
- joinPresence->setTo(JID(muc_.getNode(), muc_.getDomain(), nick));
+ joinPresence->setTo(ownMUCJID);
joinPresence->addPayload(boost::shared_ptr<Payload>(new MUCPayload()));
- stanzaChannel_->sendPresence(joinPresence);
- myNick_ = nick;
+ presenceSender->sendPresence(joinPresence);
}
void MUC::part() {
- boost::shared_ptr<Presence> partPresence(new Presence());
- partPresence->setType(Presence::Unavailable);
- partPresence->setTo(JID(muc_.getNode(), muc_.getDomain(), myNick_));
- stanzaChannel_->sendPresence(partPresence);
+ presenceSender->removeDirectedPresenceReceiver(ownMUCJID);
}
void MUC::handleIncomingPresence(boost::shared_ptr<Presence> presence) {
- if (presence->getFrom().toBare() != muc_ || presence->getFrom().getResource() == "") {
+ if (!isFromMUC(presence->getFrom())) {
return;
}
+
+ if (!firstPresenceSeen) {
+ if (presence->getType() == Presence::Error) {
+ onJoinComplete(JoinFailed);
+ return;
+ }
+ firstPresenceSeen = true;
+ onJoinComplete(JoinSucceeded);
+ presenceSender->addDirectedPresenceReceiver(ownMUCJID);
+ }
+
String nick = presence->getFrom().getResource();
+ if (nick.isEmpty()) {
+ return;
+ }
if (presence->getType() == Presence::Unavailable) {
- foreach (StringMUCOccupantPair occupantPair, occupants_) {
- if (occupantPair.first == nick) {
- occupants_.erase(nick);
- onOccupantLeft(occupantPair.second, Part, "");
- break;
- }
- }
- } else if (presence->getType() == Presence::Available) {
- bool found = false;
- foreach (StringMUCOccupantPair occupantPair, occupants_) {
- if (occupantPair.first == nick) {
- found = true;
- break;
- }
+ std::map<String,MUCOccupant>::iterator i = occupants.find(nick);
+ if (i != occupants.end()) {
+ onOccupantLeft(i->second, Part, "");
+ occupants.erase(i);
}
- if (!found) {
- MUCOccupant occupant(nick);
- occupants_.insert(occupants_.end(), std::pair<String, MUCOccupant>(nick, occupant));
- onOccupantJoined(occupant);
+ }
+ else if (presence->getType() == Presence::Available) {
+ std::pair<std::map<String,MUCOccupant>::iterator, bool> result = occupants.insert(std::make_pair(nick, MUCOccupant(nick)));
+ if (result.second) {
+ onOccupantJoined(result.first->second);
}
onOccupantPresenceChange(presence);
}