libtransport.git Changeset - 88c5bce5babe

Changeset - 88c5bce5babe

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Jan Kaluza - 13 years ago 2013-01-30 10:35:01
hanzz.k@gmail.com

Ask for groups after we receive NROFUSERS, not before

1 file changed with 29 insertions and 6 deletions:

backends/skype/main.cpp

0 comments (0 inline, 0 general)

backends/skype/main.cpp

➞

Show inline comments

 			np->handleBuddyChanged(sk->getUser(), cmd[1], "", groups, status, mood_text);
+		}
 		else if (cmd[2] == "BUDDYSTATUS" && cmd[3] == "3") {
 			GET_PROPERTY(mood_text, "USER", cmd[1], "MOOD_TEXT");
 			GET_PROPERTY(st, "USER", cmd[1], "ONLINESTATUS");
 			pbnetwork::StatusType status = getStatus(st);
 			std::vector<std::string> groups;
 			np->handleBuddyChanged(sk->getUser(), cmd[1], "", groups, status, mood_text);
+		}
 		else if (cmd[2] == "FULLNAME") {
 			GET_PROPERTY(alias, "USER", cmd[1], "FULLNAME");
 			GET_PROPERTY(mood_text, "USER", cmd[1], "MOOD_TEXT");
 			GET_PROPERTY(st, "USER", cmd[1], "ONLINESTATUS");
 			pbnetwork::StatusType status = getStatus(st);
 			std::vector<std::string> groups;
 			np->handleBuddyChanged(sk->getUser(), cmd[1], alias, groups, status, mood_text);
+		}
 		else if(cmd[2] == "RECEIVEDAUTHREQUEST") {
 			np->handleAuthorization(sk->getUser(), cmd[1]);
+		}
+	}
 	else if (cmd[0] == "GROUP") {
 		if (cmd[2] == "DISPLAYNAME") {
 			//GROUP 810 DISPLAYNAME My Friends
 			std::string grp = GET_RESPONSE_DATA(message, "DISPLAYNAME");
 // 		if (cmd[2] == "DISPLAYNAME") {
 // 			//GROUP 810 DISPLAYNAME My Friends
 // 			std::string grp = GET_RESPONSE_DATA(message, "DISPLAYNAME");
 // 			std::string users = sk->send_command("GET GROUP " + cmd[1] + " USERS");
 // 			try {
 // 				users = GET_RESPONSE_DATA(users, "USERS");
 // 			}
 // 			catch (std::out_of_range& oor) {
 // 				return;
 // 			}
 //
 // 			std::vector<std::string> data;
 // 			boost::split(data, users, boost::is_any_of(","));
 // 			BOOST_FOREACH(std::string u, data) {
 // 				GET_PROPERTY(alias, "USER", u, "FULLNAME");
 // 				GET_PROPERTY(mood_text, "USER", u, "MOOD_TEXT");
 // 				GET_PROPERTY(st, "USER", u, "ONLINESTATUS");
 // 				pbnetwork::StatusType status = getStatus(st);
 //
 // 				std::vector<std::string> groups;
 // 				groups.push_back(grp);
 // 				np->handleBuddyChanged(sk->getUser(), u, alias, groups, status, mood_text);
 // 			}
 // 		}
 		if (cmd[2] == "NROFUSERS" && cmd[3] != "0") {
 			GET_PROPERTY(grp, "GROUP", cmd[1], "DISPLAYNAME");
 			std::string users = sk->send_command("GET GROUP " + cmd[1] + " USERS");
 			try {
 				users = GET_RESPONSE_DATA(users, "USERS");
+			}
 			catch (std::out_of_range& oor) {
 				return;
+			}
 			std::vector<std::string> data;
 			boost::split(data, users, boost::is_any_of(","));
 			BOOST_FOREACH(std::string u, data) {
 				GET_PROPERTY(alias, "USER", cmd[1], "FULLNAME");
 				GET_PROPERTY(mood_text, "USER", cmd[1], "MOOD_TEXT");
 				GET_PROPERTY(st, "USER", cmd[1], "ONLINESTATUS");
 				GET_PROPERTY(alias, "USER", u, "FULLNAME");
 				GET_PROPERTY(mood_text, "USER", u, "MOOD_TEXT");
 				GET_PROPERTY(st, "USER", u, "ONLINESTATUS");
 				pbnetwork::StatusType status = getStatus(st);
 				std::vector<std::string> groups;
 				groups.push_back(grp);
 				np->handleBuddyChanged(sk->getUser(), u, alias, groups, status, mood_text);
+			}
+		}
+	}
 	else if (cmd[0] == "CHATMESSAGE") {
 		if (cmd[3] == "RECEIVED") {
 			GET_PROPERTY(body, "CHATMESSAGE", cmd[1], "BODY");
 			GET_PROPERTY(from_handle, "CHATMESSAGE", cmd[1], "FROM_HANDLE");
 			if (from_handle == sk->getUsername())
 				return;
 			np->handleMessage(sk->getUser(), from_handle, body);
 			sk->send_command("SET CHATMESSAGE " + cmd[1] + " SEEN");
+		}
+	}
 	else if (cmd[0] == "CALL") {
 		// CALL 884 STATUS RINGING
 		if (cmd[2] == "STATUS") {

0 comments (0 inline, 0 general)