libtransport.git Changeset - 3c53e1f86e45

Changeset - 3c53e1f86e45

Parent rev.

Child rev.

[Not reviewed]

Merge

0 1 0

vitalyster - 11 years ago 2014-09-02 18:42:28
vitalyster@gmail.com

Merge pull request #51 from drJeckyll/poll_messages

Skype: check for new messages every 10 seconds

1 file changed with 24 insertions and 1 deletions:

backends/skype/skype.cpp

0 comments (0 inline, 0 general)

backends/skype/skype.cpp

➞

Show inline comments

@@ @@ -36,48 +36,56 @@ @@
 #include "transport/networkplugin.h"
 #include <boost/filesystem.hpp>
 #include "sys/wait.h"
 #include "sys/signal.h"
 // #include "valgrind/memcheck.h"
 #ifndef __FreeBSD__
 #include "malloc.h"
 #endif
 DEFINE_LOGGER(logger, "Skype");
 Skype::Skype(SkypePlugin *np, const std::string &user, const std::string &username, const std::string &password) {
 	m_username = username;
 	m_user = user;
 	m_password = password;
 	m_pid = 0;
 	m_connection = 0;
 	m_proxy = 0;
 	m_timer = -1;
 	m_counter = 0;
 	m_np = np;
+}
 static gboolean skype_check_missedmessages(gpointer data) {
 	Skype *skype = (Skype *) data;
 	skype->send_command("SEARCH MISSEDCHATMESSAGES");
 	return TRUE;
+}
 static gboolean load_skype_buddies(gpointer data) {
 	Skype *skype = (Skype *) data;
 	return skype->loadSkypeBuddies();
+}
 static gboolean create_dbus_proxy(gpointer data) {
 	Skype *skype = (Skype *) data;
 	return skype->createDBusProxy();
+}
 static pbnetwork::StatusType getStatus(const std::string &st) {
 	pbnetwork::StatusType status = pbnetwork::STATUS_ONLINE;
 	if (st == "SKYPEOUT" || st == "OFFLINE") {
 		status = pbnetwork::STATUS_NONE;
+	}
 	else if (st == "DND") {
 		status = pbnetwork::STATUS_DND;
+	}
 	else if (st == "NA") {
 		status = pbnetwork::STATUS_XA;
+	}
 	else if (st == "AWAY") {
 		status = pbnetwork::STATUS_AWAY;
+	}
@@ @@ -128,48 +136,49 @@ bool Skype::createDBusProxy() { @@
 		GError *error = NULL;
 		m_proxy = dbus_g_proxy_new_for_name_owner(m_connection, "com.Skype.API", "/com/Skype", "com.Skype.API", &error);
 		if (m_proxy == NULL && error != NULL) {
 			LOG4CXX_INFO(logger,  m_username << ":" << error->message);
 			if (m_counter == 15) {
 				LOG4CXX_ERROR(logger, "Logging out, proxy couldn't be created: " << error->message);
 				m_np->handleDisconnected(m_user, pbnetwork::CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, error->message);
 				logout();
 				g_error_free(error);
 				return FALSE;
+			}
 			g_error_free(error);
+		}
 		if (m_proxy) {
 			LOG4CXX_INFO(logger, "Proxy created.");
 			DBusObjectPathVTable vtable;
 			vtable.message_function = &skype_notify_handler;
 			dbus_connection_register_object_path(dbus_g_connection_get_connection(m_connection), "/com/Skype/Client", &vtable, this);
 			m_counter = 0;
 			m_timer = g_timeout_add_seconds(1, load_skype_buddies, this);
 			g_timeout_add_seconds(10, skype_check_missedmessages, this);
 			return FALSE;
+		}
 		return TRUE;
+	}
 	return FALSE;
+}
 bool Skype::loadSkypeBuddies() {
 //	std::string re = "CONNSTATUS OFFLINE";
 //	while (re == "CONNSTATUS OFFLINE" || re.empty()) {
 //		sleep(1);
 	gchar buffer[1024];
 	int bytes_read = read(fd_output, buffer, 1023);
 	if (bytes_read > 0) {
 		buffer[bytes_read] = 0;
 		std::string b(buffer);
 		LOG4CXX_WARN(logger, "Skype wrote this on stdout '" << b << "'");
 		if (b.find("Incorrect Password") != std::string::npos) {
 			LOG4CXX_INFO(logger, "Incorrect password, logging out")
 			m_np->handleDisconnected(m_user, pbnetwork::CONNECTION_ERROR_AUTHENTICATION_FAILED, "Incorrect password");
 			close(fd_output);
 			logout();
 			return FALSE;
@@ @@ -412,55 +421,69 @@ void Skype::handleSkypeMessage(std::string &message) { @@
 		if (cmd[2] == "NROFUSERS" && cmd[3] != "0") {
 			GET_PROPERTY(grp, "GROUP", cmd[1], "DISPLAYNAME");
 			std::string users = 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);
 				m_np->handleBuddyChanged(getUser(), u, alias, groups, status, mood_text);
+			}
+		}
+	}
 	else if ((cmd[0] == "MESSAGES") || (cmd[0] == "CHATMESSAGES")) {
 		std::string msgs = GET_RESPONSE_DATA(message, "CHATMESSAGES");
 		std::vector<std::string> data;
 		boost::split(data, msgs, boost::is_any_of(","));
 		BOOST_FOREACH(std::string str, data) {
 			boost::trim(str);
 			if (!str.empty()) {
 			    std::string re = send_command("GET CHATMESSAGE " + str + " STATUS");
 			    handleSkypeMessage(re);
+			}
+		}
+	}
 	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 == getUsername())
 			if (from_handle == getUsername()) {
 				send_command("SET CHATMESSAGE " + cmd[1] + " SEEN");
 				return;
+			}
 			m_np->handleMessage(getUser(), from_handle, body);
 			send_command("SET CHATMESSAGE " + cmd[1] + " SEEN");
+		}
+	}
 	else if (cmd[0] == "CALL") {
 		// CALL 884 STATUS RINGING
 		if (cmd[2] == "STATUS") {
 			if (cmd[3] == "RINGING" || cmd[3] == "MISSED") {
 				// handle only incoming calls
 				GET_PROPERTY(type, "CALL", cmd[1], "TYPE");
 				if (type.find("INCOMING") != 0) {
 					return;
+				}
 				GET_PROPERTY(from, "CALL", cmd[1], "PARTNER_HANDLE");
 				GET_PROPERTY(dispname, "CALL", cmd[1], "PARTNER_DISPNAME");
 				if (cmd[3] == "RINGING") {
 					m_np->handleMessage(getUser(), from, "User " + dispname + " is calling you.");
+				}
 				else {
 					m_np->handleMessage(getUser(), from, "You have missed call from user " + dispname + ".");

0 comments (0 inline, 0 general)