libtransport.git Changeset - 18a72df6850b

Changeset - 18a72df6850b

Parent rev.

Child rev.

[Not reviewed]

0 7 0

HanzZ - 14 years ago 2011-03-30 21:23:39
hanzz.k@gmail.com

Working presence forwarding

7 files changed with 107 insertions and 8 deletions:

include/transport/abstractbuddy.h

include/transport/rostermanager.h

include/transport/transport.h

spectrum/src/main.cpp

spectrum/src/spectrumbuddy.cpp

src/abstractbuddy.cpp

src/rostermanager.cpp

0 comments (0 inline, 0 general)

include/transport/abstractbuddy.h

➞

Show inline comments

@@ @@ -59,7 +59,7 @@ class AbstractBuddy { @@
 		/// Returns full JID of this buddy.
 		/// \param hostname hostname used as domain in returned JID
 		/// \return full JID of this buddy
-		const Swift::JID &getJID(const std::string &hostname);
 		const Swift::JID &getJID();
 		/// Generates whole Presennce stanza with current status/show for this buddy.
 		/// Presence stanza does not containt "to" attribute, it has to be added manually.
@@ @@ -103,6 +103,8 @@ class AbstractBuddy { @@
 		/// so it can be used in JIDs.
 		std::string getSafeName();
 		void buddyChanged();
 		/// Returns legacy network username of this buddy. (for example UIN for ICQ,
 		/// JID for Jabber, ...).
 		/// \return legacy network username

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -69,6 +69,9 @@ class RosterManager { @@
 	private:
 		void setBuddyCallback(AbstractBuddy *buddy);
 		void sendBuddyRosterPush(AbstractBuddy *buddy);
 		void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key);
 		std::map<std::string, AbstractBuddy *> m_buddies;
 		Component *m_component;
 		User *m_user;

include/transport/transport.h

➞

Show inline comments

@@ @@ -73,6 +73,8 @@ namespace Transport { @@
 			/// \return Swift::Component associated with this Transport::Component
 			Swift::StanzaChannel *getStanzaChannel();
 			Swift::IQRouter *getIQRouter() { return m_iqRouter; }
 			/// Returns Swift::PresenceOracle associated with this Transport::Component.
 			/// You can use it to check current resource connected for particular user.
 			/// \return Swift::PresenceOracle associated with this Transport::Component

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -71,6 +71,39 @@ static void buddyListNewNode(PurpleBlistNode *node) { @@
+	}
+}
 static void buddyStatusChanged(PurpleBuddy *buddy, PurpleStatus *status, PurpleStatus *old_status) {
 	SpectrumBuddy *s_buddy = (SpectrumBuddy *) buddy->node.ui_data;
 	PurpleAccount *account = purple_buddy_get_account(buddy);
 	User *user = (User *) account->ui_data;
 	if (!user || !s_buddy)
 		return;
 	s_buddy->buddyChanged();
+}
 static void buddySignedOn(PurpleBuddy *buddy) {
 	SpectrumBuddy *s_buddy = (SpectrumBuddy *) buddy->node.ui_data;
 	PurpleAccount *account = purple_buddy_get_account(buddy);
 	User *user = (User *) account->ui_data;
 	if (!user || !s_buddy)
 		return;
 	s_buddy->buddyChanged();
+}
 static void buddySignedOff(PurpleBuddy *buddy) {
 	SpectrumBuddy *s_buddy = (SpectrumBuddy *) buddy->node.ui_data;
 	PurpleAccount *account = purple_buddy_get_account(buddy);
 	User *user = (User *) account->ui_data;
 	if (!user || !s_buddy)
 		return;
 	s_buddy->buddyChanged();
+}
 static void NodeRemoved(PurpleBlistNode *node, void *data) {
 	if (!PURPLE_BLIST_NODE_IS_BUDDY(node))
 		return;
@@ @@ -205,9 +238,9 @@ static bool initPurple(Config &cfg) { @@
 // 		purple_signal_connect(purple_conversations_get_handle(), "buddy-typing-stopped", &conversation_handle, PURPLE_CALLBACK(buddyTypingStopped), NULL);
 // 		purple_signal_connect(purple_connections_get_handle(), "signed-on", &conn_handle,PURPLE_CALLBACK(signed_on), NULL);
 // 		purple_signal_connect(purple_blist_get_handle(), "buddy-removed", &blist_handle,PURPLE_CALLBACK(buddyRemoved), NULL);
 // 		purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on", &blist_handle,PURPLE_CALLBACK(buddySignedOn), NULL);
 // 		purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", &blist_handle,PURPLE_CALLBACK(buddySignedOff), NULL);
 // 		purple_signal_connect(purple_blist_get_handle(), "buddy-status-changed", &blist_handle,PURPLE_CALLBACK(buddyStatusChanged), NULL);
 		purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on", &blist_handle,PURPLE_CALLBACK(buddySignedOn), NULL);
 		purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", &blist_handle,PURPLE_CALLBACK(buddySignedOff), NULL);
 		purple_signal_connect(purple_blist_get_handle(), "buddy-status-changed", &blist_handle,PURPLE_CALLBACK(buddyStatusChanged), NULL);
 		purple_signal_connect(purple_blist_get_handle(), "blist-node-removed", &blist_handle,PURPLE_CALLBACK(NodeRemoved), NULL);
 // 		purple_signal_connect(purple_conversations_get_handle(), "chat-topic-changed", &conversation_handle, PURPLE_CALLBACK(conv_chat_topic_changed), NULL);
 //

spectrum/src/spectrumbuddy.cpp

➞

Show inline comments

 	if (stat == NULL)
 		return false;
 	int st = purple_status_type_get_primitive(purple_status_get_type(stat));
 	// TODO: populate status
 	switch(st) {
 		case PURPLE_STATUS_AVAILABLE: {
 			break;
+		}
 		case PURPLE_STATUS_AWAY: {
 			status = Swift::StatusShow::Away;
 			break;
+		}
 		case PURPLE_STATUS_UNAVAILABLE: {
 			status = Swift::StatusShow::DND;
 			break;
+		}
 		case PURPLE_STATUS_EXTENDED_AWAY: {
 			status = Swift::StatusShow::XA;
 			break;
+		}
 		case PURPLE_STATUS_OFFLINE: {
 			status = Swift::StatusShow::None;
 			break;
+		}
 		default:
 			break;
+	}
 	const char *message = purple_status_get_attr_string(stat, "message");
 	if (message != NULL) {

src/abstractbuddy.cpp

➞

Show inline comments

@@ @@ -56,7 +56,7 @@ BuddyFlag AbstractBuddy::getFlags() { @@
 	return m_flags;
+}
-const Swift::JID &AbstractBuddy::getJID(const std::string &hostname) {
 const Swift::JID &AbstractBuddy::getJID() {
 	if (!m_jid.isValid()) {
 		generateJID();
+	}
 		return Swift::Presence::ref();
 	Swift::Presence::ref presence = Swift::Presence::create();
 // 	presence->setFrom(getJID());
  	presence->setFrom(m_jid);
 	presence->setTo(m_rosterManager->getUser()->getJID().toBare());
 	presence->setType(Swift::Presence::Available);
 	if (!statusMessage.empty())
@@ @@ -145,4 +146,11 @@ std::string AbstractBuddy::getSafeName() { @@
 	return name;
+}
 void AbstractBuddy::buddyChanged() {
 	Swift::Presence::ref presence = generatePresenceStanza(255);
 	if (presence) {
 		m_rosterManager->getUser()->getComponent()->getStanzaChannel()->sendPresence(presence);
+	}
+}
+}

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -23,13 +23,16 @@ @@
 #include "transport/usermanager.h"
 #include "transport/abstractbuddy.h"
 #include "transport/user.h"
 #include "Swiften/Roster/SetRosterRequest.h"
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Elements/RosterItemPayload.h"
 namespace Transport {
 RosterManager::RosterManager(User *user, Component *component){
 	m_user = user;
 	m_component = component;
-	m_setBuddyTimer = m_component->getFactories()->getTimerFactory()->createTimer(10);
+	m_setBuddyTimer = m_component->getFactories()->getTimerFactory()->createTimer(1000);
+}
 RosterManager::~RosterManager() {
@@ @@ -40,12 +43,30 @@ void RosterManager::setBuddy(AbstractBuddy *buddy) { @@
 	m_setBuddyTimer->start();
+}
 void RosterManager::sendBuddyRosterPush(AbstractBuddy *buddy) {
 	Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 	Swift::RosterItemPayload item;
 	item.setJID(buddy->getJID().toBare());
 	item.setName(buddy->getAlias());
 	item.setGroups(buddy->getGroups());
 	payload->addItem(item);
 	Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, m_component->getIQRouter(), m_user->getJID().toBare());
 	request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, buddy->getSafeName()));
 	request->send();
+}
 void RosterManager::setBuddyCallback(AbstractBuddy *buddy) {
 	m_setBuddyTimer->onTick.disconnect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 	m_buddies[buddy->getSafeName()] = buddy;
 	onBuddySet(buddy);
 	if (m_component->inServerMode()) {
 		sendBuddyRosterPush(buddy);
+	}
 	if (m_setBuddyTimer->onTick.empty()) {
 		m_setBuddyTimer->stop();
+	}
@@ @@ -56,4 +77,10 @@ void RosterManager::unsetBuddy(AbstractBuddy *buddy) { @@
 	onBuddyUnset(buddy);
+}
 void RosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key) {
 	if (m_buddies[key] != NULL) {
 		m_buddies[key]->buddyChanged();
+	}
+}
+}
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)