libtransport.git Changeset - ff3adaa3f33f

Changeset - ff3adaa3f33f

Parent rev.

Child rev.

[Not reviewed]

0 7 0

HanzZ - 14 years ago 2011-11-24 12:24:26
hanzz.k@gmail.com

Working IRC nickserv + PMs

7 files changed with 43 insertions and 4 deletions:

backends/libircclient-qt/session.cpp

backends/libircclient-qt/session.h

backends/libircclient-qt/singleircnetworkplugin.cpp

backends/libircclient-qt/singleircnetworkplugin.h

include/transport/conversation.h

src/conversation.cpp

src/conversationmanager.cpp

0 comments (0 inline, 0 general)

backends/libircclient-qt/session.cpp

➞

Show inline comments

+}
 void MyIrcBuffer::on_ctcpRequestReceived(const QString& origin, const QString& request, Irc::Buffer::MessageFlags flags)
+{
     qDebug() << "ctcp request received:" << receiver() << origin << request
              << (flags & Irc::Buffer::IdentifiedFlag ? "(identified!)" : "(not identified)");
+}
 void MyIrcBuffer::on_ctcpReplyReceived(const QString& origin, const QString& reply, Irc::Buffer::MessageFlags flags)
+{
     qDebug() << "ctcp reply received:" << receiver() << origin << reply
              << (flags & Irc::Buffer::IdentifiedFlag ? "(identified!)" : "(not identified)");
+}
 void MyIrcBuffer::on_ctcpActionReceived(const QString& origin, const QString& action, Irc::Buffer::MessageFlags flags)
+{
     qDebug() << "ctcp action received:" << receiver() << origin << action
              << (flags & Irc::Buffer::IdentifiedFlag ? "(identified!)" : "(not identified)");
+}
 void MyIrcBuffer::on_numericMessageReceived(const QString& origin, uint code, const QStringList& params)
+{
 	switch (code) {
 		case 251:
 			if (suffix.empty())
+			if (suffix.empty()) {
 				np->handleConnected(user);
+			}
 			if (p->getIdentify().find(" ") != std::string::npos) {
 				std::string to = p->getIdentify().substr(0, p->getIdentify().find(" "));
 				std::string what = p->getIdentify().substr(p->getIdentify().find(" ") + 1);
 				p->message(QString::fromStdString(to), QString::fromStdString(what));
+			}
 			break;
 		case 332:
 			m_topicData = params.value(2).toStdString();
 			break;
 		case 333:
 			 np->handleSubject(user, params.value(1).toStdString() + suffix, m_topicData, params.value(2).toStdString());
 			break;
 		case 353:
 			QString channel = params.value(2);
 			QStringList members = params.value(3).split(" ");
 			for (int i = 0; i < members.size(); i++) {
 				bool flags = 0;
 				std::string nickname = members.at(i).toStdString();
 				flags = correctNickname(nickname);
 				p->m_modes[channel.toStdString() + nickname] = flags;
 				std::cout << channel.toStdString() + suffix << " " << flags << "\n";
 				np->handleParticipantChanged(user, nickname, channel.toStdString() + suffix,(int) flags, pbnetwork::STATUS_ONLINE);
+			}
 			break;
+	}
 	LOG4CXX_INFO(logger, user << ": Numeric message received " << receiver().toStdString() << " " << origin.toStdString() << " " << code);
 	//qDebug() << "numeric message received:" << receiver() << origin << code << params;
+}

backends/libircclient-qt/session.h

➞

Show inline comments

@@ @@ -6,58 +6,67 @@ @@
  * You can study them, modify them, use them in your own program - either
  * completely or partially. By using it you may give me some credits in your
  * program, but you don't have to.
  */
 #ifndef SESSION_H
 #define SESSION_H
 #include <IrcSession>
 #include <IrcBuffer>
 #include <transport/networkplugin.h>
 using namespace Transport;
 class MyIrcSession : public Irc::Session
+{
     Q_OBJECT
 public:
 	MyIrcSession(const std::string &user, NetworkPlugin *np, const std::string &suffix = "", QObject* parent = 0);
 	std::map<std::string, bool> m_modes;
 	std::string suffix;
 	int rooms;
 	void setIdentify(const std::string &identify) {
 		m_identify = identify;
+	}
 	const std::string  &getIdentify() {
 		return m_identify;
+	}
 protected Q_SLOTS:
     void on_connected();
     void on_disconnected();
     void on_bufferAdded(Irc::Buffer* buffer);
     void on_bufferRemoved(Irc::Buffer* buffer);
 protected:
 	NetworkPlugin *np;
 	std::string user;
 	std::string m_identify;
     virtual Irc::Buffer* createBuffer(const QString& receiver);
 };
 class MyIrcBuffer : public Irc::Buffer
+{
     Q_OBJECT
 public:
 	MyIrcBuffer(const QString& receiver, const std::string &user, NetworkPlugin *np, const std::string &suffix, Irc::Session* parent);
 	NetworkPlugin *np;
 	std::string user;
 	MyIrcSession *p;
 	std::string m_topicData;
 		std::string suffix;
 protected Q_SLOTS:
     void on_receiverChanged(const QString& receiver);
     void on_joined(const QString& origin);
     void on_parted(const QString& origin, const QString& message);
     void on_quit(const QString& origin, const QString& message);
     void on_nickChanged(const QString& origin, const QString& nick);
     void on_modeChanged(const QString& origin, const QString& mode, const QString& args);
     void on_topicChanged(const QString& origin, const QString& topic);

backends/libircclient-qt/singleircnetworkplugin.cpp

➞

Show inline comments

 #include "singleircnetworkplugin.h"
 #include "log4cxx/logger.h"
 using namespace log4cxx;
 static LoggerPtr logger = log4cxx::Logger::getLogger("SingleIRCNetworkPlugin");
 SingleIRCNetworkPlugin::SingleIRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port) {
 	this->config = config;
 	m_server = config->getUnregistered().find("service.irc_server")->second;
 	m_socket = new QTcpSocket();
 	m_socket->connectToHost(QString::fromStdString(host), port);
 	connect(m_socket, SIGNAL(readyRead()), this, SLOT(readData()));
 	if (config->getUnregistered().find("service.irc_identify") != config->getUnregistered().end()) {
 		m_identify = config->getUnregistered().find("service.irc_identify")->second;
+	}
 	else {
 		m_identify = "NickServ identify $name $password";
+	}
 	LOG4CXX_INFO(logger, "SingleIRCNetworkPlugin for server " << m_server << " initialized.");
+}
 void SingleIRCNetworkPlugin::readData() {
 	size_t availableBytes = m_socket->bytesAvailable();
 	if (availableBytes == 0)
 		return;
 	std::string d = std::string(m_socket->readAll().data(), availableBytes);
 	handleDataRead(d);
+}
 void SingleIRCNetworkPlugin::sendData(const std::string &string) {
 	m_socket->write(string.c_str(), string.size());
+}
 void SingleIRCNetworkPlugin::handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
 	// legacy name is users nickname
 	if (m_sessions[user] != NULL) {
 		LOG4CXX_WARN(logger, user << ": Already logged in.");
 		return;
+	}
 	LOG4CXX_INFO(logger, user << ": Connecting " << m_server << " as " << legacyName);
 	MyIrcSession *session = new MyIrcSession(user, this);
 	session->setNick(QString::fromStdString(legacyName));
 	session->connectToServer(QString::fromStdString(m_server), 6667);
 	std::string identify = m_identify;
 	boost::replace_all(identify, "$password", password);
 	boost::replace_all(identify, "$name", legacyName);
 	session->setIdentify(identify);
 	m_sessions[user] = session;
+}
 void SingleIRCNetworkPlugin::handleLogoutRequest(const std::string &user, const std::string &legacyName) {
 	if (m_sessions[user] == NULL) {
 		LOG4CXX_WARN(logger, user << ": Already disconnected.");
 		return;
+	}
 	LOG4CXX_INFO(logger, user << ": Disconnecting.");
 	m_sessions[user]->disconnectFromServer();
 	m_sessions[user]->deleteLater();
 	m_sessions.erase(user);
+}
 void SingleIRCNetworkPlugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &/*xhtml*/) {
 	if (m_sessions[user] == NULL) {
 		LOG4CXX_WARN(logger, user << ": Message received for unconnected user");
 		return;
+	}
 	// handle PMs
 	std::string r = legacyName;
 	if (legacyName.find("/") == std::string::npos) {

backends/libircclient-qt/singleircnetworkplugin.h

➞

Show inline comments

 	public:
 		SingleIRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port);
 		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password);
 		void handleLogoutRequest(const std::string &user, const std::string &legacyName);
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &/*xhtml*/);
 		void handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password);
 		void handleLeaveRoomRequest(const std::string &user, const std::string &room);
 		std::map<std::string, MyIrcSession *> m_sessions;
 	public slots:
 		void readData();
 		void sendData(const std::string &string);
 	private:
 		Config *config;
 		QTcpSocket *m_socket;
 		std::string m_server;
 		std::string m_identify;
 };

include/transport/conversation.h

➞

Show inline comments

@@ @@ -53,48 +53,52 @@ class Conversation { @@
 		const std::string &getLegacyName() { return m_legacyName; }
 		/// Handles new message from Legacy network and forwards it to XMPP.
 		/// \param message Message received from legacy network.
 		/// \param nickname For MUC conversation this is nickname of room participant who sent this message.
 		void handleMessage(boost::shared_ptr<Swift::Message> &message, const std::string &nickname = "");
 		/// Handles participant change in MUC.
 		/// \param nickname Nickname of participant which changed.
 		/// \param flag ParticipantFlag.
 		/// \param status Current status of this participant.
 		/// \param statusMessage Current status message of this participant.
 		/// \param newname If participant was renamed, this variable contains his new name.
 		void handleParticipantChanged(const std::string &nickname, int flag, int status = Swift::StatusShow::None, const std::string &statusMessage = "", const std::string &newname = "");
 		/// Sets XMPP user nickname in MUC rooms.
 		/// \param nickname XMPP user nickname in MUC rooms.
 		void setNickname(const std::string &nickname) {
 			m_nickname = nickname;
+		}
 		const std::string &getNickname() {
 			return m_nickname;
+		}
 		void setJID(const Swift::JID &jid) {
 			m_jid = jid;
+		}
 		/// Sends message to Legacy network.
 		/// \param message Message.
 		virtual void sendMessage(boost::shared_ptr<Swift::Message> &message) = 0;
 		/// Returns ConversationManager associated with this Conversation.
 		/// \return  ConversationManager associated with this Conversation.
 		ConversationManager *getConversationManager() {
 			return m_conversationManager;
+		}
 		/// Returns True if this conversation is MUC room.
 		/// \return  True if this conversation is MUC room.
 		bool isMUC() {
 			return m_muc;
+		}
 		/// Sets room name associated with this Conversation.

src/conversation.cpp

➞

Show inline comments

@@ @@ -35,67 +35,72 @@ namespace Transport { @@
 Conversation::Conversation(ConversationManager *conversationManager, const std::string &legacyName, bool isMUC) : m_conversationManager(conversationManager) {
 	m_legacyName = legacyName;
 	m_conversationManager->addConversation(this);
 	m_muc = isMUC;
 	m_jid = m_conversationManager->getUser()->getJID().toBare();
+}
 Conversation::~Conversation() {
+}
 void Conversation::setRoom(const std::string &room) {
 	m_room = room;
 	m_legacyName = m_room + "/" + m_legacyName;
+}
 void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, const std::string &nickname) {
 	if (m_muc) {
 		message->setType(Swift::Message::Groupchat);
+	}
 	else {
 		message->setType(Swift::Message::Chat);
+	}
 	std::string n = nickname;
 	if (n.empty() && !m_room.empty() && !m_muc) {
 		n = m_nickname;
+	}
 	if (message->getType() != Swift::Message::Groupchat) {
 		message->setTo(m_jid);
 		// normal message
-		if (nickname.empty()) {
+		if (n.empty()) {
 			Buddy *buddy = m_conversationManager->getUser()->getRosterManager()->getBuddy(m_legacyName);
 			if (buddy) {
 				message->setFrom(buddy->getJID());
+			}
 			else {
 				message->setFrom(Swift::JID(Swift::JID::getEscapedNode(m_legacyName), m_conversationManager->getComponent()->getJID().toBare()));
+			}
+		}
 		// PM message
 		else {
 			if (m_room.empty()) {
-				message->setFrom(Swift::JID(nickname, m_conversationManager->getComponent()->getJID().toBare(), "user"));
+				message->setFrom(Swift::JID(n, m_conversationManager->getComponent()->getJID().toBare(), "user"));
+			}
 			else {
-				message->setFrom(Swift::JID(m_room, m_conversationManager->getComponent()->getJID().toBare(), nickname));
+				message->setFrom(Swift::JID(m_room, m_conversationManager->getComponent()->getJID().toBare(), n));
+			}
+		}
 		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(message);
+	}
 	else {
 		std::string legacyName = m_legacyName;
 		if (legacyName.find_last_of("@") != std::string::npos) {
 			legacyName.replace(legacyName.find_last_of("@"), 1, "%"); // OK
+		}
 		message->setTo(m_jid);
 		message->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), nickname));
 		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(message);
+	}
+}
 void Conversation::handleParticipantChanged(const std::string &nick, int flag, int status, const std::string &statusMessage, const std::string &newname) {
 	std::string nickname = nick;
 	Swift::Presence::ref presence = Swift::Presence::create();
 	std::string legacyName = m_legacyName;
 	if (m_muc) {
 		if (legacyName.find_last_of("@") != std::string::npos) {
 			legacyName.replace(legacyName.find_last_of("@"), 1, "%"); // OK
+		}
+	}

src/conversationmanager.cpp

➞

Show inline comments

@@ @@ -69,33 +69,34 @@ void ConversationManager::resetResources() { @@
+}
 void ConversationManager::handleMessageReceived(Swift::Message::ref message) {
 // 	std::string name = message->getTo().getUnescapedNode();
 // 	if (name.find_last_of("%") != std::string::npos) { // OK when commented
 // 		name.replace(name.find_last_of("%"), 1, "@"); // OK when commented
 // 	}
 	std::string name = Buddy::JIDToLegacyName(message->getTo());
 	if (name.empty()) {
 		LOG4CXX_WARN(logger, m_user->getJID().toString() << ": Tried to create empty conversation");
 		return;
+	}
 	// create conversation if it does not exist.
 	if (!m_convs[name]) {
 		m_convs[name] = m_component->getFactory()->createConversation(this, name);
+	}
 	// if it exists and it's MUC, but this message is PM, get PM conversation or create new one.
 	else if (m_convs[name]->isMUC() && message->getType() != Swift::Message::Groupchat) {
 		std::string room_name = name;
 		name = message->getTo().getResource();
 		if (!m_convs[name]) {
 			m_convs[name] = m_component->getFactory()->createConversation(this, name);
 			m_convs[name]->setRoom(room_name);
 			m_convs[name]->setNickname(name);
+		}
+	}
 	// update resource and send the message
 	m_convs[name]->setJID(message->getFrom());
 	m_convs[name]->sendMessage(message);
+}
+}

0 comments (0 inline, 0 general)