libtransport.git Changeset - a32e962a1a97

Changeset - a32e962a1a97

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 13 years ago 2013-02-11 20:44:28
hanzz.k@gmail.com

Libcommuni: Fixed bug when response to PM message initated from XMPP was not sent to the same JID

3 files changed with 24 insertions and 2 deletions:

backends/libcommuni/ircnetworkplugin.cpp

backends/libcommuni/session.cpp

backends/libcommuni/session.h

0 comments (0 inline, 0 general)

backends/libcommuni/ircnetworkplugin.cpp

➞

Show inline comments

 // 	}
 	return r;
+}
 void IRCNetworkPlugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &/*xhtml*/, const std::string &/*id*/) {
 	std::string session = getSessionName(user, legacyName);
 	if (m_sessions[session] == NULL) {
 		LOG4CXX_WARN(logger, user << ": Session name: " << session << ", No session for user");
 		return;
+	}
 	std::string target = getTargetName(legacyName);
 	if (legacyName.find("/") != std::string::npos) {
 		m_sessions[session]->addPM(target, legacyName.substr(0, legacyName.find("@")));
+	}
 	LOG4CXX_INFO(logger, user << ": Session name: " << session << ", message to " << target);
 	if (message.find("/me") == 0) {
 		m_sessions[session]->sendCommand(IrcCommand::createCtcpAction(FROM_UTF8(target), FROM_UTF8(message.substr(4))));
+	}
 	else {
 		m_sessions[session]->sendCommand(IrcCommand::createMessage(FROM_UTF8(target), FROM_UTF8(message)));
+	}
 	if (target.find("#") == 0) {
 		handleMessage(user, legacyName, message, TO_UTF8(m_sessions[session]->nickName()));

backends/libcommuni/session.cpp

➞

Show inline comments

+	}
 	std::string target = TO_UTF8(m->target().toLower());
 	LOG4CXX_INFO(logger, user << ": Message from " << target);
 	if (target.find("#") == 0) {
 		std::string nickname = TO_UTF8(m->sender().name());
 		correctNickname(nickname);
 		np->handleMessage(user, target + suffix, TO_UTF8(msg), nickname);
+	}
 	else {
 		std::string nickname = TO_UTF8(m->sender().name());
 		correctNickname(nickname);
 		LOG4CXX_INFO(logger, nickname + suffix);
 		np->handleMessage(user, nickname + suffix, TO_UTF8(msg));
 		if (m_pms.find(nickname) != m_pms.end()) {
 			if (hasIRCBuddy(m_pms[nickname], nickname)) {
 				LOG4CXX_INFO(logger, nickname);
 				np->handleMessage(user, m_pms[nickname] + suffix, TO_UTF8(msg), nickname, "", "", false, true);
 				return;
+			}
 			else {
 				nickname = nickname + suffix;
+			}
+		}
 		else {
 			nickname = nickname + suffix;
+		}
 		LOG4CXX_INFO(logger, nickname);
 		np->handleMessage(user, nickname, TO_UTF8(msg));
+	}
+}
 void MyIrcSession::on_numericMessageReceived(IrcMessage *message) {
 	QString channel;
 	QStringList members;
 	std::string nick;
 	IrcNumericMessage *m = (IrcNumericMessage *) message;
 	QStringList parameters = m->parameters();
 	switch (m->code()) {
 		case 301:

backends/libcommuni/session.h

➞

Show inline comments

@@ @@ -72,24 +72,28 @@ public: @@
 	std::string suffix;
 	int rooms;
 	void addAutoJoinChannel(const std::string &channel, const std::string &password) {
 		m_autoJoin[channel] = boost::make_shared<AutoJoinChannel>(channel, password, 12 + m_autoJoin.size());
+	}
 	void removeAutoJoinChannel(const std::string &channel) {
 		m_autoJoin.erase(channel);
 		removeIRCBuddies(channel);
+	}
 	void addPM(const std::string &name, const std::string &room) {
 		m_pms[name] = room;
+	}
 	void setIdentify(const std::string &identify) {
 		m_identify = identify;
+	}
 	const std::string  &getIdentify() {
 		return m_identify;
+	}
 	bool hasIRCBuddy(const std::string &channel, const std::string &name) {
 		return m_buddies[channel].find(name) != m_buddies[channel].end();
+	}
@@ @@ -124,17 +128,18 @@ protected Q_SLOTS: @@
 	void onMessageReceived(IrcMessage* message);
 	void awayTimeout();
 protected:
 	IRCNetworkPlugin *np;
 	std::string user;
 	std::string m_identify;
 	AutoJoinMap m_autoJoin;
 	std::string m_topicData;
 	bool m_connected;
 	std::list<std::string> m_rooms;
 	std::list<std::string> m_names;
 	std::map<std::string, std::string> m_pms;
 	IRCBuddyMap m_buddies;
 	QTimer *m_awayTimer;
 };
 #endif // SESSION_H

0 comments (0 inline, 0 general)