libtransport.git Changeset - eba558cfda55

Changeset - eba558cfda55

Parent rev.

Child rev.

[Not reviewed]

Merge

0 2 0

Vitaly Takmazov - 13 years ago 2013-02-10 14:59:25
vitalyster@gmail.com

1 file changed with 13 insertions and 5 deletions:

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

src/networkpluginserver.cpp

➞

Show inline comments

 		return;
 	Swift::JID originalJID = stanza->getFrom();
 	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(originalJID.toBare());
 	LocalBuddy *buddy = (LocalBuddy *) user->getRosterManager()->getBuddy(stanza->getFrom().toBare());
 	if (buddy) {
 		const Swift::JID &jid = buddy->getJID();
+	}
 	else {
 		std::string name = stanza->getFrom().toBare();
 		if (CONFIG_BOOL_DEFAULTED(m_config, "service.jid_escaping", true)) {
 			name = Swift::JID::getEscapedNode(name);
+		}
 		else {
 		if (conv && conv->isMUC()) {
 			if (name.find_last_of("@") != std::string::npos) {
 				name.replace(name.find_last_of("@"), 1, "%");
+			}
+		}
 		else {
 			if (CONFIG_BOOL_DEFAULTED(m_config, "service.jid_escaping", true)) {
 				name = Swift::JID::getEscapedNode(name);
+			}
 			else {
 				if (name.find_last_of("@") != std::string::npos) {
 					name.replace(name.find_last_of("@"), 1, "%");
+				}
+			}
+		}
 		if (stanza->getFrom().getResource().empty()) {
 			stanza->setFrom(Swift::JID(name, m_component->getJID().toString()));
+		}
 	boost::shared_ptr<Swift::Message> message = boost::dynamic_pointer_cast<Swift::Message>(stanza);
 	if (message) {
 		NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(originalJID.toBare());
 		if (conv) {
 			conv->handleRawMessage(message);
 			return;

0 comments (0 inline, 0 general)