libtransport.git Changeset - 2c526db0f32e

Changeset - 2c526db0f32e

Parent rev.

Child rev.

[Not reviewed]

0 7 0

Jan Kaluza - 14 years ago 2011-05-18 15:32:54
hanzz.k@gmail.com

leaving the room works

7 files changed with 55 insertions and 2 deletions:

backends/libircclient-qt/main.cpp

include/transport/networkplugin.h

include/transport/networkpluginserver.h

src/networkplugin.cpp

src/networkpluginserver.cpp

src/pbnetwork.proto

src/user.cpp

0 comments (0 inline, 0 general)

backends/libircclient-qt/main.cpp

➞

Show inline comments

@@ @@ -53,12 +53,19 @@ class IRCNetworkPlugin : public NetworkPlugin { @@
 			m_sessions[user]->addAutoJoinChannel(QString::fromStdString(room));
 			m_sessions[user]->join(QString::fromStdString(room), QString::fromStdString(password));
 			// update nickname, because we have nickname per session, no nickname per room.
 			handleRoomChanged(user, room, m_sessions[user]->nick().toStdString());
+		}
 		void handleLeaveRoomRequest(const std::string &user, const std::string &room) {
 			std::cout << "PART\n";
 			if (m_sessions[user] == NULL)
 				return;
 			m_sessions[user]->part(QString::fromStdString(room));
+		}
 		std::map<std::string, MyIrcSession *> m_sessions;
 	private:
 		Config *config;
 };

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -53,20 +53,22 @@ class NetworkPlugin { @@
 		void handleRoomChanged(const std::string &user, const std::string &room, const std::string &nickname);
 		virtual void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) = 0;
 		virtual void handleLogoutRequest(const std::string &user, const std::string &legacyName) = 0;
 		virtual void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message) = 0;
 		virtual void handleJoinRoomRequest(const std::string &/*user*/, const std::string &/*room*/, const std::string &/*nickname*/, const std::string &/*pasword*/) {}
 		virtual void handleLeaveRoomRequest(const std::string &/*user*/, const std::string &/*room*/) {}
 	private:
 		void connect();
 		void handleLoginPayload(const std::string &payload);
 		void handleLogoutPayload(const std::string &payload);
 		void handleConvMessagePayload(const std::string &payload);
 		void handleJoinRoomPayload(const std::string &payload);
 		void handleLeaveRoomPayload(const std::string &payload);
 		void handleDataRead(const Swift::ByteArray&);
 		void handleConnected(bool error);
 		void handleDisconnected();
 		void send(const std::string &data);
 		void sendPong();

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -57,12 +57,13 @@ class NetworkPluginServer { @@
 		void handleConvMessagePayload(const std::string &payload);
 		void handleParticipantChangedPayload(const std::string &payload);
 		void handleRoomChangedPayload(const std::string &payload);
 		void handleUserCreated(User *user);
 		void handleRoomJoined(User *user, const std::string &room, const std::string &nickname, const std::string &password);
 		void handleRoomLeft(User *user, const std::string &room);
 		void handleUserReadyToConnect(User *user);
 		void handleUserDestroyed(User *user);
 		void send(boost::shared_ptr<Swift::Connection> &, const std::string &data);
 		void pingTimeout();

src/networkplugin.cpp

➞

Show inline comments

 		return;
+	}
 	handleJoinRoomRequest(payload.username(), payload.room(), payload.nickname(), payload.password());
+}
 void NetworkPlugin::handleLeaveRoomPayload(const std::string &data) {
 	pbnetwork::Room payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	handleLeaveRoomRequest(payload.username(), payload.room());
+}
 void NetworkPlugin::handleDataRead(const Swift::ByteArray &data) {
 	long expected_size = 0;
 	m_data += data.toString();
 // 	std::cout << "received data; size = " << m_data.size() << "\n";
 	while (m_data.size() != 0) {
 		if (m_data.size() >= 4) {
 			case pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE:
 				handleConvMessagePayload(wrapper.payload());
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_JOIN_ROOM:
 				handleJoinRoomPayload(wrapper.payload());
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_LEAVE_ROOM:
 				handleLeaveRoomPayload(wrapper.payload());
 				break;
 			default:
 				return;
+		}
+	}
+}

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -339,12 +339,13 @@ void NetworkPluginServer::pingTimeout() { @@
+}
 void NetworkPluginServer::handleUserCreated(User *user) {
 // 	UserInfo userInfo = user->getUserInfo();
 	user->onReadyToConnect.connect(boost::bind(&NetworkPluginServer::handleUserReadyToConnect, this, user));
 	user->onRoomJoined.connect(boost::bind(&NetworkPluginServer::handleRoomJoined, this, user, _1, _2, _3));
 	user->onRoomLeft.connect(boost::bind(&NetworkPluginServer::handleRoomLeft, this, user, _1));
+}
 void NetworkPluginServer::handleUserReadyToConnect(User *user) {
 	UserInfo userInfo = user->getUserInfo();
 	pbnetwork::Login login;
 	NetworkConversation *conv = new NetworkConversation(user->getConversationManager(), r);
 	conv->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, this, _1, _2));
 	conv->setNickname(nickname);
+}
 void NetworkPluginServer::handleRoomLeft(User *user, const std::string &r) {
 	UserInfo userInfo = user->getUserInfo();
 	pbnetwork::Room room;
 	room.set_username(user->getJID().toBare());
 	room.set_nickname("");
 	room.set_room(r);
 	room.set_password("");
 	std::string message;
 	room.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LEAVE_ROOM);
 	send(m_client, message);
 	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(r);
 	if (!conv) {
 		return;
+	}
 	delete conv;
+}
 void NetworkPluginServer::handleUserDestroyed(User *user) {
 	UserInfo userInfo = user->getUserInfo();
 	pbnetwork::Logout logout;
 	logout.set_user(user->getJID().toBare());
 	logout.set_legacyname(userInfo.uin);

src/pbnetwork.proto

➞

Show inline comments

@@ @@ -62,13 +62,13 @@ message WrapperMessage { @@
 		TYPE_BUDDY_CHANGED			= 6;
 		TYPE_BUDDY_REMOVED			= 7;
 		TYPE_CONV_MESSAGE			= 8;
 		TYPE_PING					= 9;
 		TYPE_PONG					= 10;
 		TYPE_JOIN_ROOM				= 11;
-		TYPE_PART_ROOM				= 12;
+		TYPE_LEAVE_ROOM				= 12;
 		TYPE_PARTICIPANT_CHANGED	= 13;
 		TYPE_PARTICIPANT_LEFT		= 14;
 		TYPE_ROOM_NICKNAME_CHANGED	= 15;
+	}
 	required Type type = 1;
 	optional bytes payload = 2;

src/user.cpp

➞

Show inline comments

@@ @@ -83,13 +83,18 @@ void User::handlePresence(Swift::Presence::ref presence) { @@
+		}
+	}
 	std::cout << "HANDLE PRESENCE\n";
 	bool isMUC = presence->getPayload<Swift::MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';
 	if (isMUC) {
 		std::cout << "AAAAAAAAA\n";
 		onRoomJoined(presence->getTo().getNode(), presence->getTo().getResource(), "");
 		if (presence->getType() == Swift::Presence::Unavailable) {
 			onRoomLeft(presence->getTo().getNode());
+		}
 		else {
 			onRoomJoined(presence->getTo().getNode(), presence->getTo().getResource(), "");
+		}
 		return;
+	}
 	if (highest) {
 		highest->setTo(presence->getFrom().toBare());

0 comments (0 inline, 0 general)