libtransport.git Changeset - 0af5cfe9169e

@@ -6,13 +6,13 @@

DEFINE_LOGGER(logger, "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);

	m_socket->connectToHost(QString::fromUtf8(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 {

@@ -41,16 +41,16 @@ void SingleIRCNetworkPlugin::handleLoginRequest(const std::string &user, const s

		LOG4CXX_WARN(logger, user << ": Already logged in.");

		return;

	LOG4CXX_INFO(logger, user << ": Connecting " << m_server << " as " << legacyName);

	MyIrcSession *session = new MyIrcSession(user, this);

	session->setUserName(QString::fromStdString(legacyName));

	session->setNickName(QString::fromStdString(legacyName));

	session->setRealName(QString::fromStdString(legacyName));

	session->setHost(QString::fromStdString(m_server));

	session->setUserName(QString::fromUtf8(legacyName));

	session->setNickName(QString::fromUtf8(legacyName));

	session->setRealName(QString::fromUtf8(legacyName));

	session->setHost(QString::fromUtf8(m_server));

	session->setPort(6667);

	if (!password.empty()) {

		std::string identify = m_identify;

		boost::replace_all(identify, "$password", password);

		boost::replace_all(identify, "$name", legacyName);

@@ -87,13 +87,13 @@ void SingleIRCNetworkPlugin::handleMessageSendRequest(const std::string &user, c

	else {

		r = legacyName.substr(legacyName.find("/") + 1);

	LOG4CXX_INFO(logger, user << ": Forwarding message to " << r);

	m_sessions[user]->sendCommand(IrcCommand::createMessage(QString::fromStdString(r), QString::fromStdString(message)));

	m_sessions[user]->sendCommand(IrcCommand::createMessage(QString::fromUtf8(r), QString::fromUtf8(message)));

	if (r.find("#") == 0) {

		handleMessage(user, legacyName, message, m_sessions[user]->nickName().toStdString());

@@ -102,13 +102,13 @@ void SingleIRCNetworkPlugin::handleJoinRoomRequest(const std::string &user, cons

		LOG4CXX_WARN(logger, user << ": Join room requested for unconnected user");

		return;

	LOG4CXX_INFO(logger, user << ": Joining " << room);

	m_sessions[user]->addAutoJoinChannel(room);

	m_sessions[user]->sendCommand(IrcCommand::createJoin(QString::fromStdString(room), QString::fromStdString(password)));

	m_sessions[user]->sendCommand(IrcCommand::createJoin(QString::fromUtf8(room), QString::fromUtf8(password)));

	m_sessions[user]->rooms += 1;

	// update nickname, because we have nickname per session, no nickname per room.

	handleRoomNicknameChanged(user, room, m_sessions[user]->userName().toStdString());

@@ -119,10 +119,10 @@ void SingleIRCNetworkPlugin::handleLeaveRoomRequest(const std::string &user, con

	if (m_sessions[u] == NULL) {

		LOG4CXX_WARN(logger, user << ": Leave room requested for unconnected user");

		return;

	LOG4CXX_INFO(logger, user << ": Leaving " << room);

	m_sessions[u]->sendCommand(IrcCommand::createPart(QString::fromStdString(r)));

	m_sessions[u]->sendCommand(IrcCommand::createPart(QString::fromUtf8(r)));

	m_sessions[u]->removeAutoJoinChannel(r);

	m_sessions[u]->rooms -= 1;