1 files changed, 88 insertions, 11 deletions
diff --git a/Swift/Controllers/Roster/ContactRosterItem.cpp b/Swift/Controllers/Roster/ContactRosterItem.cpp
index 8c388bf..e0651bc 100644
--- a/Swift/Controllers/Roster/ContactRosterItem.cpp
+++ b/Swift/Controllers/Roster/ContactRosterItem.cpp
@@ -5,13 +5,20 @@
  */
 
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
-#include "Swift/Controllers/Roster/GroupRosterItem.h"
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+
+#include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <Swiften/Base/foreach.h>
+#include <Swiften/Base/DateTime.h>
+#include <Swiften/Elements/Idle.h>
+#include <Swift/Controllers/Intl.h>
+#include <Swift/Controllers/Roster/GroupRosterItem.h>
 
 namespace Swift {
 
 
-ContactRosterItem::ContactRosterItem(const JID& jid, const JID& displayJID, const std::string& name, GroupRosterItem* parent) : RosterItem(name, parent), jid_(jid), displayJID_(displayJID) {
+ContactRosterItem::ContactRosterItem(const JID& jid, const JID& displayJID, const std::string& name, GroupRosterItem* parent)
+: RosterItem(name, parent), jid_(jid), displayJID_(displayJID.toBare()), mucRole_(MUCOccupant::NoRole), mucAffiliation_(MUCOccupant::NoAffiliation), blockState_(BlockingNotSupported)
+{
 }
 
@@ -25,10 +32,10 @@ StatusShow::Type ContactRosterItem::getStatusShow() const {
 StatusShow::Type ContactRosterItem::getSimplifiedStatusShow() const {
 	switch (shownPresence_ ? shownPresence_->getShow() : StatusShow::None) {
-		case StatusShow::Online: return StatusShow::Online; break;
-		case StatusShow::Away: return StatusShow::Away; break;
-	 	case StatusShow::XA: return StatusShow::Away; break;
-		case StatusShow::FFC: return StatusShow::Online; break;
-		case StatusShow::DND: return StatusShow::DND; break;
-		case StatusShow::None: return StatusShow::None; break;
+		case StatusShow::Online: return StatusShow::Online;
+		case StatusShow::Away: return StatusShow::Away;
+	 	case StatusShow::XA: return StatusShow::Away;
+		case StatusShow::FFC: return StatusShow::Online;
+		case StatusShow::DND: return StatusShow::DND;
+		case StatusShow::None: return StatusShow::None;
 	}
 	assert(false);
@@ -40,9 +47,28 @@ std::string ContactRosterItem::getStatusText() const {
 }
 
-void ContactRosterItem::setAvatarPath(const std::string& path) {
+std::string ContactRosterItem::getIdleText() const {
+	Idle::ref idle = shownPresence_ ? shownPresence_->getPayload<Idle>() : Idle::ref();
+	if (!idle || idle->getSince().is_not_a_date_time()) {
+		return "";
+	} else {
+		return dateTimeToLocalString(idle->getSince());
+	}
+}
+
+std::string ContactRosterItem::getOfflineSinceText() const {
+	if (offlinePresence_) {
+		boost::optional<boost::posix_time::ptime> delay = offlinePresence_->getTimestamp();
+		if (offlinePresence_->getType() == Presence::Unavailable && delay) {
+			return dateTimeToLocalString(*delay);
+		}
+	}
+	return "";
+}
+
+void ContactRosterItem::setAvatarPath(const boost::filesystem::path& path) {
 	avatarPath_ = path;
 	onDataChanged();
 }
-const std::string& ContactRosterItem::getAvatarPath() const {
+const boost::filesystem::path& ContactRosterItem::getAvatarPath() const {
 	return avatarPath_;
 }
@@ -114,6 +140,41 @@ void ContactRosterItem::removeGroup(const std::string& group) {
 }
 
+MUCOccupant::Role ContactRosterItem::getMUCRole() const
+{
+	return mucRole_;
+}
+
+void ContactRosterItem::setMUCRole(const MUCOccupant::Role& role)
+{
+	mucRole_ = role;
+}
+
+MUCOccupant::Affiliation ContactRosterItem::getMUCAffiliation() const
+{
+	return mucAffiliation_;
+}
+
+void ContactRosterItem::setMUCAffiliation(const MUCOccupant::Affiliation& affiliation)
+{
+	mucAffiliation_ = affiliation;
+}
+
+std::string ContactRosterItem::getMUCAffiliationText() const
+{
+	std::string affiliationString;
+	switch (mucAffiliation_) {
+		case MUCOccupant::Owner: affiliationString = QT_TRANSLATE_NOOP("", "Owner"); break;
+		case MUCOccupant::Admin: affiliationString = QT_TRANSLATE_NOOP("", "Admin"); break;
+		case MUCOccupant::Member: affiliationString = QT_TRANSLATE_NOOP("", "Member"); break;
+		case MUCOccupant::Outcast: affiliationString = QT_TRANSLATE_NOOP("", "Outcast"); break;
+		case MUCOccupant::NoAffiliation: affiliationString = ""; break;
+	}
+
+	return affiliationString;
+}
+
 void ContactRosterItem::setSupportedFeatures(const std::set<Feature>& features) {
 	features_ = features;
+	onDataChanged();
 }
 
@@ -122,5 +183,21 @@ bool ContactRosterItem::supportsFeature(const Feature feature) const {
 }
 
+void ContactRosterItem::setBlockState(BlockState state) {
+	blockState_ = state;
+	onDataChanged();
 }
 
+ContactRosterItem::BlockState ContactRosterItem::blockState() const {
+	return blockState_;
+}
+
+VCard::ref ContactRosterItem::getVCard() const {
+	return vcard_;
+}
 
+void ContactRosterItem::setVCard(VCard::ref vcard) {
+	vcard_ = vcard;
+	onDataChanged();
+}
+
+}