libtransport.git Changeset - 11a084deb042

Changeset - 11a084deb042

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 13 years ago 2012-12-04 19:21:59
hanzz.k@gmail.com

Update away state regularly

2 files changed with 49 insertions and 7 deletions:

backends/libcommuni/session.cpp

backends/libcommuni/session.h

0 comments (0 inline, 0 general)

backends/libcommuni/session.cpp

➞

Show inline comments

@@ @@ -27,24 +27,32 @@ static bool sentList; @@
 MyIrcSession::MyIrcSession(const std::string &user, IRCNetworkPlugin *np, const std::string &suffix, QObject* parent) : IrcSession(parent)
+{
 	this->np = np;
 	this->user = user;
 	this->suffix = suffix;
 	m_connected = false;
 	rooms = 0;
 	connect(this, SIGNAL(disconnected()), SLOT(on_disconnected()));
 	connect(this, SIGNAL(socketError(QAbstractSocket::SocketError)), SLOT(on_socketError(QAbstractSocket::SocketError)));
 	connect(this, SIGNAL(connected()), SLOT(on_connected()));
 	connect(this, SIGNAL(messageReceived(IrcMessage*)), this, SLOT(onMessageReceived(IrcMessage*)));
 	m_awayTimer = new QTimer(this);
 	connect(m_awayTimer, SIGNAL(timeout()), this, SLOT(awayTimeout()));
 	m_awayTimer->start(10*1000);
+}
 MyIrcSession::~MyIrcSession() {
 	delete m_awayTimer;
+}
 void MyIrcSession::on_connected() {
 	m_connected = true;
 	if (suffix.empty()) {
 		np->handleConnected(user);
 // 		if (!sentList) {
 // 			sendCommand(IrcCommand::createList("", ""));
 // 			sentList = true;
 // 		}
+	}
 			m_topicData = TO_UTF8(m->parameters().value(2));
 			break;
 		case 333:
 			nick = TO_UTF8(m->parameters().value(2));
 			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(m->parameters().value(1)) + suffix, m_topicData, nick);
 			break;
 		case 352:
 		case 352: {
 			channel = m->parameters().value(1);
 			nick = TO_UTF8(m->parameters().value(5));
 			IRCBuddy &buddy = getIRCBuddy(TO_UTF8(channel), nick);
 			if (m->parameters().value(6).toUpper().startsWith("G")) {
 				channel = m->parameters().value(1);
 				nick = TO_UTF8(m->parameters().value(5));
 				IRCBuddy &buddy = getIRCBuddy(TO_UTF8(channel), nick);
 				np->handleParticipantChanged(user, nick, TO_UTF8(channel) + suffix, buddy.isOp(), pbnetwork::STATUS_AWAY);
 				if (!buddy.isAway()) {
 					buddy.setAway(true);
 					np->handleParticipantChanged(user, nick, TO_UTF8(channel) + suffix, buddy.isOp(), pbnetwork::STATUS_AWAY);
+				}
+			}
 			else if (buddy.isAway()) {
 				buddy.setAway(false);
 				np->handleParticipantChanged(user, nick, TO_UTF8(channel) + suffix, buddy.isOp(), pbnetwork::STATUS_ONLINE);
+			}
 			break;
+		}
 		case 353:
 			channel = m->parameters().value(2);
 			members = m->parameters().value(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));
 				op = correctNickname(nickname);
 				IRCBuddy &buddy = getIRCBuddy(TO_UTF8(channel), nickname);
 				buddy.setOp(op);
 				np->handleParticipantChanged(user, nickname, TO_UTF8(channel) + suffix, buddy.isOp(), pbnetwork::STATUS_ONLINE);
 			m_names.push_back(TO_UTF8(m->parameters().value(1)));
 			break;
 		case 323:
 			np->handleRoomList("", m_rooms, m_names);
 			break;
 		default:
 			break;
+	}
 	//qDebug() << "numeric message received:" << receiver() << origin << code << params;
+}
 void MyIrcSession::awayTimeout() {
 	for(AutoJoinMap::iterator it = m_autoJoin.begin(); it != m_autoJoin.end(); it++) {
 		if (it->second->shouldAskWho()) {
 			LOG4CXX_INFO(logger, "The time has come. Asking /who " << it->second->getChannel() << " again to get current away states.");
 			sendCommand(IrcCommand::createWho(FROM_UTF8(it->second->getChannel())));
+		}
+	}
+}
 void MyIrcSession::onMessageReceived(IrcMessage *message) {
 	LOG4CXX_INFO(logger, user << ": " << TO_UTF8(message->toString()));
 	switch (message->type()) {
 		case IrcMessage::Join:
 			on_joined(message);
 			break;
 		case IrcMessage::Part:
 			on_parted(message);
 			break;
 		case IrcMessage::Quit:
 			on_quit(message);
 			break;

backends/libcommuni/session.h

➞

Show inline comments

@@ @@ -6,69 +6,83 @@ @@
  * 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 <transport/networkplugin.h>
 #include "Swiften/Swiften.h"
 #include <boost/smart_ptr/make_shared.hpp>
 #include <QTimer>
 using namespace Transport;
 class IRCNetworkPlugin;
 class MyIrcSession : public IrcSession
+{
     Q_OBJECT
 public:
 	class AutoJoinChannel {
 		public:
 			AutoJoinChannel(const std::string &channel = "", const std::string &password = "") : m_channel(channel), m_password(password) {}
 			AutoJoinChannel(const std::string &channel = "", const std::string &password = "", int awayCycle = 12) : m_channel(channel), m_password(password),
 				m_awayCycle(awayCycle), m_currentAwayTick(0) {}
 			virtual ~AutoJoinChannel() {}
 			const std::string &getChannel() { return m_channel; }
 			const std::string &getPassword() { return m_password; }
 			bool shouldAskWho() {
 				if (m_currentAwayTick == m_awayCycle) {
 					m_currentAwayTick = 0;
 					return true;
+				}
 				m_currentAwayTick++;
 				return false;
+			}
 		private:
 			std::string m_channel;
 			std::string m_password;
 			int m_awayCycle;
 			int m_currentAwayTick;
 	};
 	class IRCBuddy {
 		public:
 			IRCBuddy(bool op = false, bool away = false) : m_op(op), m_away(away) {};
 			void setOp(bool op) { m_op = op; }
 			bool isOp() { return m_op; }
 			void setAway(bool away) { m_away = away; }
 			bool isAway() { return m_away; }
 		private:
 			bool m_op;
 			bool m_away;
 	};
 	typedef std::map<std::string, boost::shared_ptr<AutoJoinChannel> > AutoJoinMap;
 	typedef std::map<std::string, std::map<std::string, IRCBuddy> > IRCBuddyMap;
 	MyIrcSession(const std::string &user, IRCNetworkPlugin *np, const std::string &suffix = "", QObject* parent = 0);
 	virtual ~MyIrcSession();
 	std::string suffix;
 	int rooms;
 	void addAutoJoinChannel(const std::string &channel, const std::string &password) {
 		m_autoJoin[channel] = boost::make_shared<AutoJoinChannel>(channel, 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 setIdentify(const std::string &identify) {
 		m_identify = identify;
+	}
 	const std::string  &getIdentify() {
@@ @@ -95,26 +109,28 @@ public: @@
 	void on_nickChanged(IrcMessage *message);
 	void on_modeChanged(IrcMessage *message);
 	void on_topicChanged(IrcMessage *message);
 	void on_messageReceived(IrcMessage *message);
 	void on_numericMessageReceived(IrcMessage *message);
 protected Q_SLOTS:
 	void on_connected();
 	void on_disconnected();
 	void on_socketError(QAbstractSocket::SocketError error);
 	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;
 	IRCBuddyMap m_buddies;
 	QTimer *m_awayTimer;
 };
 #endif // SESSION_H

0 comments (0 inline, 0 general)