libtransport.git Changeset - 96aad929c0d2

@@ -93,26 +93,26 @@ bool MyIrcSession::correctNickname(std::string &nickname) {

void MyIrcSession::on_joined(IrcMessage *message) {

	IrcJoinMessage *m = (IrcJoinMessage *) message;

	bool op = 0;

	std::string nickname = TO_UTF8(m->sender().name());

	op = correctNickname(nickname);

	getIRCBuddy(TO_UTF8(m->channel()), nickname).setOp(op);

	np->handleParticipantChanged(user, nickname, TO_UTF8(m->channel()) + suffix, op, pbnetwork::STATUS_ONLINE);

	LOG4CXX_INFO(logger, user << ": " << nickname << " joined " << TO_UTF8(m->channel()) + suffix);

	getIRCBuddy(TO_UTF8(m->channel().toLower()), nickname).setOp(op);

	np->handleParticipantChanged(user, nickname, TO_UTF8(m->channel().toLower()) + suffix, op, pbnetwork::STATUS_ONLINE);

	LOG4CXX_INFO(logger, user << ": " << nickname << " joined " << TO_UTF8(m->channel().toLower()) + suffix);

void MyIrcSession::on_parted(IrcMessage *message) {

	IrcPartMessage *m = (IrcPartMessage *) message;

	bool op = 0;

	std::string nickname = TO_UTF8(m->sender().name());

	op = correctNickname(nickname);

	removeIRCBuddy(TO_UTF8(m->channel()), nickname);

	LOG4CXX_INFO(logger, user << ": " << nickname << " parted " << TO_UTF8(m->channel()) + suffix);

	np->handleParticipantChanged(user, nickname, TO_UTF8(m->channel()) + suffix, op, pbnetwork::STATUS_NONE, TO_UTF8(m->reason()));

	removeIRCBuddy(TO_UTF8(m->channel().toLower()), nickname);

	LOG4CXX_INFO(logger, user << ": " << nickname << " parted " << TO_UTF8(m->channel().toLower()) + suffix);

	np->handleParticipantChanged(user, nickname, TO_UTF8(m->channel().toLower()) + suffix, op, pbnetwork::STATUS_NONE, TO_UTF8(m->reason()));

void MyIrcSession::on_quit(IrcMessage *message) {

	IrcQuitMessage *m = (IrcQuitMessage *) message;

	for(AutoJoinMap::iterator it = m_autoJoin.begin(); it != m_autoJoin.end(); it++) {

		bool op = 0;

@@ -169,13 +169,13 @@ void MyIrcSession::on_topicChanged(IrcMessage *message) {

	IrcTopicMessage *m = (IrcTopicMessage *) message;

	std::string nickname = TO_UTF8(m->sender().name());

	correctNickname(nickname);

	LOG4CXX_INFO(logger, user << ": " << nickname << " topic changed to " << TO_UTF8(m->topic()));

	np->handleSubject(user, TO_UTF8(m->channel()) + suffix, TO_UTF8(m->topic()), nickname);

	np->handleSubject(user, TO_UTF8(m->channel().toLower()) + suffix, TO_UTF8(m->topic()), nickname);

void MyIrcSession::on_messageReceived(IrcMessage *message) {

	IrcPrivateMessage *m = (IrcPrivateMessage *) message;

	if (m->isRequest()) {

		QString request = m->message().split(" ", QString::SkipEmptyParts).value(0).toUpper();

@@ -187,13 +187,13 @@ void MyIrcSession::on_messageReceived(IrcMessage *message) {

	QString msg = m->message();

	if (m->isAction()) {

		msg = QString("/me ") + msg;

	std::string target = TO_UTF8(m->target());

	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);

@@ -226,16 +226,16 @@ void MyIrcSession::on_numericMessageReceived(IrcMessage *message) {

			if (nick.find("!") != std::string::npos) {

				nick = nick.substr(0, nick.find("!"));

			if (nick.find("/") != std::string::npos) {

				nick = nick.substr(0, nick.find("/"));

			np->handleSubject(user, TO_UTF8(parameters[1]) + suffix, m_topicData, nick);

			np->handleSubject(user, TO_UTF8(parameters[1].toLower()) + suffix, m_topicData, nick);

			break;

		case 352: {

			channel = parameters[1];

			channel = parameters[1].toLower();

			nick = TO_UTF8(parameters[5]);

			IRCBuddy &buddy = getIRCBuddy(TO_UTF8(channel), nick);

			if (parameters[6].toUpper().startsWith("G")) {

				if (!buddy.isAway()) {

					buddy.setAway(true);

@@ -246,13 +246,13 @@ void MyIrcSession::on_numericMessageReceived(IrcMessage *message) {

				buddy.setAway(false);

				np->handleParticipantChanged(user, nick, TO_UTF8(channel) + suffix, buddy.isOp(), pbnetwork::STATUS_ONLINE);

			break;

		case 353:

			channel = parameters[2];

			channel = parameters[2].toLower();

			members = parameters[3].split(" ");

			LOG4CXX_INFO(logger, user << ": Received members for " << TO_UTF8(channel) << suffix);

			for (int i = 0; i < members.size(); i++) {

				bool op = 0;

				std::string nickname = TO_UTF8(members.at(i));

@@ -262,13 +262,13 @@ void MyIrcSession::on_numericMessageReceived(IrcMessage *message) {

				np->handleParticipantChanged(user, nickname, TO_UTF8(channel) + suffix, buddy.isOp(), pbnetwork::STATUS_ONLINE);

			break;

		case 366:

			// ask /who to get away states

			channel = parameters[1];

			channel = parameters[1].toLower();

			LOG4CXX_INFO(logger, user << "Asking /who for channel " << TO_UTF8(channel));

			sendCommand(IrcCommand::createWho(channel));

			break;

		case 432:

			np->handleDisconnected(user, pbnetwork::CONNECTION_ERROR_INVALID_USERNAME, "Erroneous Nickname");

			break;