libtransport.git Changeset - 9ff51c193cc3

Changeset - 9ff51c193cc3

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 10 years ago 2016-01-05 15:44:18
jkaluza@redhat.com

Twitter: Fix joining room by disabling sending raw xml to backends which do not need it

3 files changed with 10 insertions and 1 deletions:

backends/twitter/TwitterPlugin.cpp

libtransport/NetworkPluginServer.cpp

tests/twitter/twitter_test.py

0 comments (0 inline, 0 general)

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

 										userdb[user].connectionState == WAITING_FOR_PIN)) {
 		LOG4CXX_INFO(logger, std::string("A session corresponding to ") + user + std::string(" is already active"))
 		return;
+	}
 	LOG4CXX_INFO(logger, std::string("Received login request for ") + user)
 	initUserSession(user, legacyName, password);
 	handleConnected(user);
 	LOG4CXX_INFO(logger, "SPECTRUM 1 USER? - " << (userdb[user].spectrum1User? "true" : "false"))
 	LOG4CXX_INFO(logger, user << ": Adding Buddy " << adminLegacyName << " " << adminAlias)
 	handleBuddyChanged(user, adminLegacyName, adminAlias, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
 	userdb[user].nickName = "";
 	LOG4CXX_INFO(logger, "Querying database for usersettings of " << user)
 	std::string key, secret;
 	getUserOAuthKeyAndSecret(user, key, secret);
 	if(key == "" || secret == "") {
 		LOG4CXX_INFO(logger, "Intiating OAuth Flow for user " << user)
 		setTwitterMode(user, 0);
 		tp->runAsThread(new OAuthFlow(np, userdb[user].sessions, user, userdb[user].sessions->getTwitterUsername()));
 	} else {
 		LOG4CXX_INFO(logger, user << " is already registerd. Using the stored oauth key and secret")
 		LOG4CXX_INFO(logger, key << " " << secret)
 		pinExchangeComplete(user, key, secret);
+	}
+}
 // User logging out
 void TwitterPlugin::handleLogoutRequest(const std::string &user, const std::string &legacyName)
+{
 	if (userdb.count(user)) {
 		delete userdb[user].sessions;
 		userdb[user].sessions = NULL;
 		userdb[user].connectionState = DISCONNECTED;
+	}
 	if(onlineUsers.count(user)) {
 		onlineUsers.erase(user);
+	}
+}
 // User joining a Chatroom
 void TwitterPlugin::handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password)
+{
 	if(room == adminChatRoom) {
 		LOG4CXX_INFO(logger, "Received Join Twitter room request for " << user)
+		LOG4CXX_INFO(logger, "Received Join Twitter room request for " << user << " '" << nickname << "'")
 		setTwitterMode(user, 2);
 		handleParticipantChanged(user, nickname, room, 0, pbnetwork::STATUS_ONLINE);
 		handleParticipantChanged(user, adminNickName, room, 0, pbnetwork::STATUS_ONLINE);
 		userdb[user].nickName = nickname;
 		handleMessage(user, adminChatRoom, "Connected to Twitter room! Populating your followers list", adminNickName);
 		tp->runAsThread(new FetchFriends(userdb[user].sessions, user,
 										 boost::bind(&TwitterPlugin::populateRoster, this, _1, _2, _3, _4)));
 	} else {
 		setTwitterMode(user, 0);
 		LOG4CXX_ERROR(logger, "Couldn't connect to chatroom - " << room <<"! Try twitter-chatroom as the chatroom to access Twitter account")
 		handleMessage(user, adminLegacyName, "Couldn't connect to chatroom! Try twitter-chatroom as the chatroom to access Twitter account");
+	}
+}
 // User leaving a Chatroom
 void TwitterPlugin::handleLeaveRoomRequest(const std::string &user, const std::string &room)
+{
 	if(room == adminChatRoom && onlineUsers.count(user)) {
 		LOG4CXX_INFO(logger, "Leaving chatroom! Switching back to default mode 0")
 		setTwitterMode(user, 0);
 		handleBuddyChanged(user, adminLegacyName, adminAlias, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
+	}
+}
 // Messages to be sent to Twitter
 void TwitterPlugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml, const std::string &/*id*/)
+{
 	LOG4CXX_INFO(logger, "Received " << user << " --> " << legacyName << " - " << message)
 	if(legacyName == adminLegacyName || legacyName == adminChatRoom)  {
 		std::string cmd = "", data = "";
 		/** Parsing the message - Assuming message format to be <cmd>[ ]*<data>**/
 		int i;
 		for(i=0 ; i<message.size() && message[i] != ' '; i++) cmd += message[i];
 		while(i<message.size() && message[i] == ' ') i++;
 		data = message.substr(i);
 		/***********************************************************************/
 		if(cmd == "#pin")
 			tp->runAsThread(new PINExchangeProcess(np, userdb[user].sessions, user, data));
 		else if(cmd == "#help")
 			tp->runAsThread(new HelpMessageRequest(user, CONFIG_STRING(config, "service.jid"), boost::bind(&TwitterPlugin::helpMessageResponse, this, _1, _2)));
 		else if(cmd[0] == '@') {
 			std::string username = cmd.substr(1);
 			tp->runAsThread(new DirectMessageRequest(userdb[user].sessions, user, username, data,
 												     boost::bind(&TwitterPlugin::directMessageResponse, this, _1, _2, _3, _4)));
+		}
 		else if(cmd == "#status")

libtransport/NetworkPluginServer.cpp

➞

Show inline comments

 		m_component->getFrontend()->sendMessage(message);
 		return;
+	}
 	boost::shared_ptr<Swift::Presence> presence = boost::dynamic_pointer_cast<Swift::Presence>(stanza);
 	if (presence) {
 		if (buddy) {
 			if (!buddy->isAvailable() && presence->getType() != Swift::Presence::Unavailable) {
 				buddy->m_status.setType(Swift::StatusShow::Online);
+			}
 			buddy->handleRawPresence(presence);
+		}
 		else if (conv) {
 			conv->handleRawPresence(presence);
+		}
 		else {
 			m_component->getFrontend()->sendPresence(presence);
+		}
 		return;
+	}
 	// TODO: FIX TO MAKE RAW XML BACKENDS WORKING AGAIN.
 // 	boost::shared_ptr<Swift::IQ> iq = boost::dynamic_pointer_cast<Swift::IQ>(stanza);
 // 	if (iq) {
 // 		if (m_id2resource.find(stanza->getTo().toBare().toString() + stanza->getID()) != m_id2resource.end()) {
 // 			iq->setTo(Swift::JID(iq->getTo().getNode(), iq->getTo().getDomain(), m_id2resource[stanza->getTo().toBare().toString() + stanza->getID()]));
 // 			m_id2resource.erase(stanza->getTo().toBare().toString() + stanza->getID());
 // 		}
 // 		else {
 // 			Swift::Presence::ref highest = m_component->getPresenceOracle()->getHighestPriorityPresence(user->getJID());
 // 			if (highest) {
 // 			    iq->setTo(highest->getFrom());
 // 			} else {
 // 			    iq->setTo(user->getJID());
 // 			}
 // 		}
 // 		m_component->getFrontend()->sendIQ(iq);
 // 		return;
 // 	}
+}
 void NetworkPluginServer::handleRawXML(const std::string &xml) {
 	m_xmppParser->parse(xml);
+}
 void NetworkPluginServer::handleRawPresenceReceived(boost::shared_ptr<Swift::Presence> presence) {
 	if (!CONFIG_BOOL_DEFAULTED(m_config, "features.rawxml", false)) {
 		return;
+	}
 	User *user = m_userManager->getUser(presence->getFrom().toBare());
 	if (!user)
 		return;
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	Swift::JID legacyname = Swift::JID(Buddy::JIDToLegacyName(presence->getTo()));
 	if (!presence->getTo().getResource().empty()) {
 		presence->setTo(Swift::JID(legacyname.getNode(), legacyname.getDomain(), presence->getTo().getResource()));
+	}
 	else {
 		presence->setTo(Swift::JID(legacyname.getNode(), legacyname.getDomain()));
+	}
 	std::string xml = safeByteArrayToString(m_serializer->serializeElement(presence));
 	WRAP(xml, pbnetwork::WrapperMessage_Type_TYPE_RAW_XML);
 	send(c->connection, xml);
+}
 void NetworkPluginServer::handleRawIQReceived(boost::shared_ptr<Swift::IQ> iq) {
 	User *user = m_userManager->getUser(iq->getFrom().toBare());
 	if (!user)
 		return;
 	Backend *c = (Backend *) user->getData();
 	if (!c) {
 		return;
+	}
 	if (iq->getType() == Swift::IQ::Get) {
 		m_id2resource[iq->getFrom().toBare().toString() + iq->getID()] = iq->getFrom().getResource();
+	}
 	Swift::JID legacyname = Swift::JID(Buddy::JIDToLegacyName(iq->getTo()));
 	if (!iq->getTo().getResource().empty()) {
 		iq->setTo(Swift::JID(legacyname.getNode(), legacyname.getDomain(), iq->getTo().getResource()));
+	}
 	else {
 		iq->setTo(Swift::JID(legacyname.getNode(), legacyname.getDomain()));
+	}
 	std::string xml = safeByteArrayToString(m_serializer->serializeElement(iq));
 	WRAP(xml, pbnetwork::WrapperMessage_Type_TYPE_RAW_XML);
 	send(c->connection, xml);
+}

tests/twitter/twitter_test.py

➞

Show inline comments

 import optparse
 import sys
 import time
 import subprocess
 import os
 import sleekxmpp
 from sleekxmpp.xmlstream.matcher import StanzaPath, MatchXPath
 from sleekxmpp.xmlstream.handler import Callback
 class Responder(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, room_password, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.room_password = room_password
 		self.nick = nick
 		self.finished = False
 		self.tests = {}
 class Client(sleekxmpp.ClientXMPP):
 	def __init__(self, jid, password, room, nick):
 		sleekxmpp.ClientXMPP.__init__(self, jid, password)
 		self.room = room
 		self.nick = nick
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("message", self.message)
 		self.add_event_handler('roster_update', self.roster_update)
 		self.finished = False
 		self.tests = {}
 		self.tests["timeline_poll"] = ["Timeline received automatically", False]
 		self.tests["help"] = ["#help command", False]
 		self.tests["status1"] = ["#status command response", False]
 		self.tests["status2"] = ["#status command pushes status", False]
 		self.tests["follow"] = ["#follow command", False]
 		self.tests["friends"] = ["#friends command", False]
 		self.tests["unfollow"] = ["#unfollow command", False]
 		self.tests["friends2"] = ["#friends after unfollow command", False]
 		self.tests["mode1"] = ["#mode 1 response", False]
 		self.tests["mode1buddy"] = ["#mode 1 buddy added", False]
 		self.tests["mode2"] = ["#mode 2 join room", False]
 		self.status = "timeline"
 		self.timestamp = int(time.time())
 	def message(self, msg):
 		if self.status == "timeline" and msg['body'].find("spectrum2tests") != -1 and msg['body'].find("MsgId") != -1:
 			self.tests["timeline_poll"][1] = True
 			self.send_message(mto=msg['from'], mbody="#help")
 			self.status = "help"
 		elif self.status == "help" and msg['body'].find("You will receive tweets of people you follow") != -1:
 			self.tests["help"][1] = True
 			self.send_message(mto=msg['from'], mbody="#status My testing status " + str(self.timestamp))
 			self.status = "status"
 		elif self.status == "status" and msg['body'].find("Status Update successful") != -1:
 			self.tests["status1"][1] = True
 		elif self.status == "status" and msg['body'].find("spectrum2tests") != -1 and msg['body'].find("MsgId") != -1:
 			self.tests["status2"][1] = True
 			self.status = "follow"
 			self.send_message(mto=msg['from'], mbody="#follow colinpwheeler")
 		elif self.status == "follow" and msg['body'] == "You are now following colinpwheeler":
 			self.status = "friends"
 			self.tests["follow"][1] = True
 			self.send_message(mto=msg['from'], mbody="#friends")
 		elif self.status == "friends" and msg['body'].find("USER LIST") != -1 and msg['body'].find("colinpwheeler") != -1:
 			self.status = "mode1"
 			self.tests["friends"][1] = True
 			self.send_message(mto=msg['from'], mbody="#mode 1")
 		elif self.status == "mode1" and msg['body'] == "Changed mode to 1":
 			self.tests["mode1"][1] = True
 		elif self.status == "unfollow" and msg['body'] == "You are not following colinpwheeler anymore":
 			self.status = "friends2"
 			self.tests["unfollow"][1] = True
 			self.send_message(mto=msg['from'], mbody="#friends")
 		elif self.status == "friends2" and msg['body'].find("USER LIST") != -1 and msg['body'].find("colinpwheeler") == -1:
 			self.status = "mode1"
 			self.tests["friends2"][1] = True
 			self.finished = True
 	def roster_update(self, iq):
 		roster = iq['roster']['items']
 		if self.status == "mode1" and roster.has_key("colinpwheeler@localhost"):
 			self.plugin['xep_0045'].joinMUC("#twitter@localhost", "client", wait=True)
 			self.tests["mode2"][1] = True
 			self.plugin['xep_0045'].leaveMUC("#twitter@localhost", "client")
 			self.status = "unfollow"
 			self.tests["mode1buddy"][1] = True
 			self.send_message(mto="twitter.com@localhost", mbody="#unfollow colinpwheeler")
 	def start(self, event):
 		self.getRoster()
 		self.sendPresence()

0 comments (0 inline, 0 general)