libtransport.git Changeset - 0deb1626d7ec

Changeset - 0deb1626d7ec

Parent rev.

Child rev.

[Not reviewed]

Merge

0 15 0

Vitaly Takmazov - 13 years ago 2012-11-28 07:10:19
vitalyster@gmail.com

merge

14 files changed with 113 insertions and 22 deletions:

backends/libcommuni/ircnetworkplugin.cpp

backends/libcommuni/ircnetworkplugin.h

backends/libcommuni/session.cpp

backends/twitter/TwitterPlugin.cpp

backends/twitter/TwitterPlugin.h

backends/twitter/TwitterResponseParser.cpp

backends/twitter/main.cpp

include/transport/conversation.h

include/transport/networkplugin.h

plugin/cpp/networkplugin.cpp

src/conversation.cpp

src/networkpluginserver.cpp

src/tests/conversationmanager.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

backends/libcommuni/ircnetworkplugin.cpp

➞

Show inline comments

@@ @@ -8,12 +8,13 @@ DEFINE_LOGGER(logger, "IRCNetworkPlugin"); @@
 #define FROM_UTF8(WHAT) QString::fromUtf8((WHAT).c_str(), (WHAT).size())
 #define TO_UTF8(WHAT) std::string((WHAT).toUtf8().data(), (WHAT).toUtf8().size())
 IRCNetworkPlugin::IRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port) {
 	this->config = config;
 	m_currentServer = 0;
 	m_firstPing = true;
 	m_socket = new QTcpSocket();
 	m_socket->connectToHost(FROM_UTF8(host), port);
 	connect(m_socket, SIGNAL(readyRead()), this, SLOT(readData()));
 	std::string server = CONFIG_STRING_DEFAULTED(config, "service.irc_server", "");
 	if (!server.empty()) {
@@ @@ -45,12 +46,23 @@ void IRCNetworkPlugin::tryNextServer() { @@
 void IRCNetworkPlugin::readData() {
 	size_t availableBytes = m_socket->bytesAvailable();
 	if (availableBytes == 0)
 		return;
 	if (m_firstPing) {
 		m_firstPing = false;
 		// Users can join the network without registering if we allow
 		// one user to connect multiple IRC networks.
 		if (m_servers.empty()) {
 			NetworkPlugin::PluginConfig cfg;
 			cfg.setNeedRegistration(false);
 			sendConfig(cfg);
+		}
+	}
 	std::string d = std::string(m_socket->readAll().data(), availableBytes);
 	handleDataRead(d);
+}
 void IRCNetworkPlugin::sendData(const std::string &string) {
 	m_socket->write(string.c_str(), string.size());

backends/libcommuni/ircnetworkplugin.h

➞

Show inline comments

 		Config *config;
 		QTcpSocket *m_socket;
 		std::map<std::string, MyIrcSession *> m_sessions;
 		std::vector<std::string> m_servers;
 		int m_currentServer;
 		std::string m_identify;
 		bool m_firstPing;
 };
@@ \ No newline at end of file @@

backends/libcommuni/session.cpp

➞

Show inline comments

+	}
+}
 void MyIrcSession::on_numericMessageReceived(IrcMessage *message) {
 	QString channel;
 	QStringList members;
 	std::string nick;
 	IrcNumericMessage *m = (IrcNumericMessage *) message;
 	switch (m->code()) {
 		case 332:
 			m_topicData = TO_UTF8(m->parameters().value(2));
 			break;
 		case 333:
 			 np->handleSubject(user, TO_UTF8(m->parameters().value(1)) + suffix, m_topicData, TO_UTF8(m->parameters().value(2)));
 			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 353:
 			channel = m->parameters().value(2);
 			members = m->parameters().value(3).split(" ");
 			LOG4CXX_INFO(logger, user << ": Received members for " << TO_UTF8(channel) << suffix);

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

 void TwitterPlugin::pollForTweets()
+{
 	boost::mutex::scoped_lock lock(userlock);
 	std::set<std::string>::iterator it = onlineUsers.begin();
 	while(it != onlineUsers.end()) {
 		std::string user = *it;
-		tp->runAsThread(new TimelineRequest(userdb[user].sessions, user, "", userdb[user].mostRecentTweetID,
+		tp->runAsThread(new TimelineRequest(userdb[user].sessions, user, "", getMostRecentTweetIDUnsafe(user),
 											boost::bind(&TwitterPlugin::displayTweets, this, _1, _2, _3, _4)));
 		it++;
+	}
 	tweet_timer->start();
+}
+}
 void TwitterPlugin::updateLastTweetID(const std::string user, const std::string ID)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	userdb[user].mostRecentTweetID = ID;
 	UserInfo info;
 	if(storagebackend->getUser(user, info) == false) {
 		LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!")
 		return;
+	}
 	storagebackend->updateUserSetting((long)info.id, "twitter_last_tweet", ID);
+}
 std::string TwitterPlugin::getMostRecentTweetIDUnsafe(const std::string user)
+{
 	std::string ID = "";
 	if(onlineUsers.count(user)) {
 		ID = userdb[user].mostRecentTweetID;
 		if (ID.empty()) {
 			int type;
 			UserInfo info;
 			if(storagebackend->getUser(user, info) == false) {
 				LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!")
+			}
 			else {
 				storagebackend->getUserSetting(info.id, "twitter_last_tweet", type, ID);
+			}
+		}
+	}
 	return ID;
+}
 std::string TwitterPlugin::getMostRecentTweetID(const std::string user)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	std::string ID = "-1";
 	if(onlineUsers.count(user)) ID = userdb[user].mostRecentTweetID;
 	return ID;
 	return getMostRecentTweetIDUnsafe(user);
+}
 void TwitterPlugin::updateLastDMID(const std::string user, const std::string ID)
+{
 	boost::mutex::scoped_lock lock(userlock);
 	userdb[user].mostRecentDirectMessageID = ID;
 	if(errMsg.getMessage().length() == 0) {
 		std::string timeline = "";
 		std::map<std::string, int> lastTweet;
 		std::map<std::string, int>::iterator it;
-		for(int i=0 ; i<tweets.size() ; i++) {
+		for(int i = tweets.size() - 1 ; i >= 0 ; i--) {
 			if(userdb[user].twitterMode != CHATROOM) {
 				timeline += " - " + tweets[i].getUserData().getScreenName() + ": " + tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")\n";
 				std::string m = " - " + tweets[i].getUserData().getScreenName() + ": " + tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")\n";
 				handleMessage(user, adminLegacyName, m, "", "", tweets[i].getCreationTime());
 				std::string scrname = tweets[i].getUserData().getScreenName();
 				if(lastTweet.count(scrname) == 0 || cmp(tweets[lastTweet[scrname]].getID(), tweets[i].getID()) <= 0) lastTweet[scrname] = i;
 			} else {
 				handleMessage(user, userdb[user].twitterMode == CHATROOM ? adminChatRoom : adminLegacyName,
 									tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")", tweets[i].getUserData().getScreenName());
+									tweets[i].getTweet() + " (MsgId: " + tweets[i].getID() + ")", tweets[i].getUserData().getScreenName(), "", tweets[i].getCreationTime());
+			}
+		}
 		if(userdb[user].twitterMode == MULTIPLECONTACT) {
 			//Set as status user's last tweet
 			for(it=lastTweet.begin() ; it!=lastTweet.end() ; it++) {

backends/twitter/TwitterPlugin.h

➞

Show inline comments

@@ @@ -132,12 +132,14 @@ class TwitterPlugin : public NetworkPlugin { @@
 		void RetweetResponse(std::string &user, Error &errMsg);
 		void profileImageResponse(std::string &user, std::string &buddy, std::string &img, unsigned int reqID, Error &errMsg);
 		/***********************************************************************************/
 	private:
 		std::string getMostRecentTweetIDUnsafe(const std::string user);
 		enum status {NEW, WAITING_FOR_PIN, CONNECTED, DISCONNECTED};
 		enum mode {SINGLECONTACT, MULTIPLECONTACT, CHATROOM};
 		Config *config;
 		std::string adminLegacyName;
 		std::string adminChatRoom;

backends/twitter/TwitterResponseParser.cpp

➞

Show inline comments

@@ @@ -8,21 +8,31 @@ static std::string tolowercase(std::string inp) @@
+{
 	std::string out = inp;
 	for(int i=0 ; i<out.size() ; i++) out[i] = tolower(out[i]);
 	return out;
+}
 static std::string toIsoTime(std::string in) {
 	time_t now = time(0);
 	struct tm *mtime = gmtime(&now);
 	strptime(in.c_str(), "%a %b %d %H:%M:%S %z %Y", mtime);
 	char buf[80];
 	strftime(buf, sizeof(buf), "%Y%m%dT%H%M%S", mtime);
 	return buf;
+}
 EmbeddedStatus getEmbeddedStatus(const Swift::ParserElement::ref &element, const std::string xmlns)
+{
 	EmbeddedStatus status;
 	if(element->getName() != TwitterReponseTypes::status) {
 		LOG4CXX_ERROR(logger, "Not a status element!")
 		return status;
+	}
 	status.setCreationTime( std::string( element->getChild(TwitterReponseTypes::created_at, xmlns)->getText() ) );
 	status.setCreationTime( toIsoTime(std::string( element->getChild(TwitterReponseTypes::created_at, xmlns)->getText() ) ) );
 	status.setID( std::string( element->getChild(TwitterReponseTypes::id, xmlns)->getText() ) );
 	status.setTweet( std::string( element->getChild(TwitterReponseTypes::text, xmlns)->getText() ) );
 	status.setTruncated( std::string( element->getChild(TwitterReponseTypes::truncated, xmlns)->getText() )=="true" );
 	status.setReplyToStatusID( std::string( element->getChild(TwitterReponseTypes::in_reply_to_status_id, xmlns)->getText() ) );
 	status.setReplyToUserID( std::string( element->getChild(TwitterReponseTypes::in_reply_to_user_id, xmlns)->getText() ) );
 	status.setReplyToScreenName( std::string( element->getChild(TwitterReponseTypes::in_reply_to_screen_name, xmlns)->getText() ) );
 	Status status;
 	if(element->getName() != "status") {
 		LOG4CXX_ERROR(logger, "Not a status element!")
 		return status;
+	}
 	status.setCreationTime( std::string( element->getChild(TwitterReponseTypes::created_at, xmlns)->getText() ) );
+	status.setCreationTime( toIsoTime ( std::string( element->getChild(TwitterReponseTypes::created_at, xmlns)->getText() ) ) );
 	status.setID( std::string( element->getChild(TwitterReponseTypes::id, xmlns)->getText() ) );
 	status.setTweet( std::string( element->getChild(TwitterReponseTypes::text, xmlns)->getText() ) );
 	status.setTruncated( std::string( element->getChild(TwitterReponseTypes::truncated, xmlns)->getText() )=="true" );
 	status.setReplyToStatusID( std::string( element->getChild(TwitterReponseTypes::in_reply_to_status_id, xmlns)->getText() ) );
 	status.setReplyToUserID( std::string( element->getChild(TwitterReponseTypes::in_reply_to_user_id, xmlns)->getText() ) );
 	status.setReplyToScreenName( std::string( element->getChild(TwitterReponseTypes::in_reply_to_screen_name, xmlns)->getText() ) );
 	DirectMessage DM;
 	if(element->getName() != TwitterReponseTypes::direct_message) {
 		LOG4CXX_ERROR(logger, "Not a direct_message element!")
 		return DM;
+	}
 	DM.setCreationTime( std::string( element->getChild(TwitterReponseTypes::created_at, xmlns)->getText() ) );
+	DM.setCreationTime( toIsoTime ( std::string( element->getChild(TwitterReponseTypes::created_at, xmlns)->getText() ) ) );
 	DM.setID( std::string( element->getChild(TwitterReponseTypes::id, xmlns)->getText() ) );
 	DM.setMessage( std::string( element->getChild(TwitterReponseTypes::text, xmlns)->getText() ) );
 	DM.setSenderID( std::string( element->getChild(TwitterReponseTypes::sender_id, xmlns)->getText() ) );
 	DM.setRecipientID( std::string( element->getChild(TwitterReponseTypes::recipient_id, xmlns)->getText() ) );
 	DM.setSenderScreenName( std::string( element->getChild(TwitterReponseTypes::sender_screen_name, xmlns)->getText() ) );
 	DM.setRecipientScreenName( std::string( element->getChild(TwitterReponseTypes::recipient_screen_name, xmlns)->getText() ) );

backends/twitter/main.cpp

➞

Show inline comments

@@ @@ -39,14 +39,15 @@ int main (int argc, char* argv[]) { @@
 	Logging::initBackendLogging(cfg);
 	StorageBackend *storagebackend;
 	storagebackend = StorageBackend::createBackend(cfg, error);
 	if (storagebackend == NULL) {
 		LOG4CXX_ERROR(logger, "Error creating StorageBackend! " << error)
 		return -2;
 		LOG4CXX_ERROR(logger, "Error creating StorageBackend! " << error);
 		LOG4CXX_ERROR(logger, "Twitter backend needs storage backend configured to work! " << error);
 		return NetworkPlugin::StorageBackendNeeded;
+	}
 	else if (!storagebackend->connect()) {
 		LOG4CXX_ERROR(logger, "Can't connect to database!")
 		return -1;
+	}

include/transport/conversation.h

➞

Show inline comments

@@ @@ -145,9 +145,11 @@ class Conversation { @@
 		std::string m_nickname;
 		std::string m_room;
 		bool m_muc;
 		Swift::JID m_jid;
 		std::list<Swift::JID> m_jids;
 		std::map<std::string, Participant> m_participants;
 		boost::shared_ptr<Swift::Message> m_subject;
 		bool m_sentInitialPresence;
 };
+}

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -32,12 +32,13 @@ namespace Transport { @@
 /// This class is base class for all C++ legacy network plugins. It provides a way to connect
 /// Spectrum2 NetworkPluginServer and allows to use high-level API for legacy network plugins
 /// development.
 class NetworkPlugin {
 	public:
 		enum ExitCode { StorageBackendNeeded = -2 };
 		class PluginConfig {
 			public:
 				PluginConfig() : m_needPassword(true), m_needRegistration(false) {}
 				virtual ~PluginConfig() {}

plugin/cpp/networkplugin.cpp

➞

Show inline comments

@@ @@ -60,13 +60,13 @@ NetworkPlugin::NetworkPlugin() { @@
+}
 NetworkPlugin::~NetworkPlugin() {
+}
 void NetworkPlugin::sendConfig(const PluginConfig &cfg) {
 	std::string data = "[registration]";
+	std::string data = "[registration]\n";
 	data += std::string("needPassword=") + (cfg.m_needPassword ? "1" : "0") + "\n";
 	data += std::string("needRegistration=") + (cfg.m_needRegistration ? "1" : "0") + "\n";
 	for (std::vector<std::string>::const_iterator it = cfg.m_extraFields.begin(); it != cfg.m_extraFields.end(); it++) {
 		data += std::string("extraField=") + (*it) + "\n";
+	}

src/conversation.cpp

➞

Show inline comments

@@ @@ -30,12 +30,13 @@ namespace Transport { @@
 Conversation::Conversation(ConversationManager *conversationManager, const std::string &legacyName, bool isMUC) : m_conversationManager(conversationManager) {
 	m_legacyName = legacyName;
 // 	m_conversationManager->addConversation(this);
 	m_muc = isMUC;
 	m_jid = m_conversationManager->getUser()->getJID().toBare();
 	m_sentInitialPresence = false;
+}
 Conversation::~Conversation() {
+}
 void Conversation::destroyRoom() {
 		if (n.empty()) {
 			n = " ";
+		}
 		BOOST_FOREACH(const Swift::JID &jid, m_jids) {
 			message->setTo(jid);
 			message->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), n));
 			// Subject has to be sent after our own presence (the one with code 110)
 			if (!message->getSubject().empty() && m_sentInitialPresence == false) {
 				m_subject = message;
 				return;
+			}
 			m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(message);
+		}
+	}
+}
 void Conversation::sendParticipants(const Swift::JID &to) {
 	Swift::MUCUserPayload *p = new Swift::MUCUserPayload ();
 	if (m_nickname == nickname) {
 		Swift::MUCUserPayload::StatusCode c;
 		c.code = 110;
 		p->addStatusCode(c);
 		m_sentInitialPresence = true;
+	}
 	Swift::MUCItem item;
 	item.affiliation = Swift::MUCOccupant::Member;
 		presence->setTo(jid);
 		m_conversationManager->getComponent()->getStanzaChannel()->sendPresence(presence);
+	}
 	if (!newname.empty()) {
 		handleParticipantChanged(newname, flag, status, statusMessage);
+	}
 	if (m_sentInitialPresence && m_subject) {
 		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(m_subject);
 		m_subject.reset();
+	}
+}
+}

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -329,13 +329,19 @@ void NetworkPluginServer::start() { @@
 		pid_t result;
 		int status;
 		result = waitpid(-1, &status, WNOHANG);
 		if (result != 0) {
 			if (WIFEXITED(status)) {
 				if (WEXITSTATUS(status) != 0) {
 					if (status == 254) {
 						LOG4CXX_ERROR(logger, "Backend can not be started, because it needs database to store data, but the database backend is not configured.");
+					}
 					else {
 						LOG4CXX_ERROR(logger, "Backend can not be started, exit_code=" << WEXITSTATUS(status) << ", possible error: " << strerror(WEXITSTATUS(status)));
+					}
 					LOG4CXX_ERROR(logger, "Check backend log for more details");
 					continue;
+				}
+			}
 			else {
 				LOG4CXX_ERROR(logger, "Backend can not be started");
 				continue;

src/tests/conversationmanager.cpp

➞

Show inline comments

 		received.clear();
+	}
 	void handleSubjectMessages() {
 		User *user = userManager->getUser("user@localhost");
 		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);
 		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "buddy1");
 		user->getConversationManager()->addConversation(conv);
 		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));
 		conv->setNickname("nickname");
 		conv->addJID("user@localhost/resource");
 		boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 		msg->setSubject("subject");
 		msg->setType(Swift::Message::Groupchat);
 		// Forward it
 		conv->handleMessage(msg);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
 		CPPUNIT_ASSERT_EQUAL(std::string("subject"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getSubject());
 		// No response, because presence with code 110 has not been sent yet and we must not send
 		// subject before this one.
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		// this user presence - status code 110
 		conv->handleParticipantChanged("nickname", 1, Swift::StatusShow::Away, "my status message");
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(2, (int) received.size());
 		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));
 		CPPUNIT_ASSERT_EQUAL(std::string("subject"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getSubject());
 		received.clear();
 		// send response
 		msg->setFrom("user@localhost/resource");
-		msg->setTo("buddy1@localhost/bot");
+		msg->setTo("#room@localhost");
 		injectMessage(msg);
 		loop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 		CPPUNIT_ASSERT(m_msg);
 		CPPUNIT_ASSERT_EQUAL(std::string("subject"), m_msg->getSubject());

src/usermanager.cpp

➞

Show inline comments

 			res.password = m_userRegistry->getUserPassword(userkey);
+		}
 		// We allow auto_register feature in gateway-mode. This allows IRC user to register
 		// the transport just by joining the room.
 		if (!m_component->inServerMode()) {
 			if (!registered && CONFIG_BOOL(m_component->getConfig(), "registration.auto_register")) {
 			if (!registered && (CONFIG_BOOL(m_component->getConfig(), "registration.auto_register") ||
 				!CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", true))) {
 				res.password = "";
 				res.jid = userkey;
 				bool isMUC = presence->getPayload<Swift::MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';
 				if (isMUC) {
 					res.uin = presence->getTo().getResource();

0 comments (0 inline, 0 general)