1 files changed, 47 insertions, 11 deletions
diff --git a/Swift/Controllers/Roster/ContactRosterItem.h b/Swift/Controllers/Roster/ContactRosterItem.h
index 9932dc4..ab10c66 100644
--- a/Swift/Controllers/Roster/ContactRosterItem.h
+++ b/Swift/Controllers/Roster/ContactRosterItem.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2013 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -7,16 +7,22 @@
 #pragma once
 
-#include <string>
-#include "Swiften/JID/JID.h"
-#include "Swift/Controllers/Roster/RosterItem.h"
-#include "Swiften/Elements/StatusShow.h"
-#include "Swiften/Elements/Presence.h"
-
 #include <map>
 #include <set>
+#include <string>
+
 #include <boost/bind.hpp>
-#include "Swiften/Base/boost_bsignals.h"
+#include <boost/date_time/posix_time/ptime.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/Elements/StatusShow.h>
+#include <Swiften/Elements/MUCOccupant.h>
+#include <Swiften/Elements/VCard.h>
+#include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/Roster/RosterItem.h>
+
 namespace Swift {
 
@@ -26,4 +32,12 @@ class ContactRosterItem : public RosterItem {
 		enum Feature {
 			FileTransferFeature,
+			WhiteboardFeature
+		};
+
+		enum BlockState {
+			BlockingNotSupported,
+			IsBlocked,
+			IsUnblocked,
+			IsDomainBlocked
 		};
 		
@@ -35,6 +49,8 @@ class ContactRosterItem : public RosterItem {
 		StatusShow::Type getSimplifiedStatusShow() const;
 		std::string getStatusText() const;
-		void setAvatarPath(const std::string& path);
-		const std::string& getAvatarPath() const;
+		std::string getIdleText() const;
+		std::string getOfflineSinceText() const;
+		void setAvatarPath(const boost::filesystem::path& path);
+		const boost::filesystem::path& getAvatarPath() const;
 		const JID& getJID() const;
 		void setDisplayJID(const JID& jid);
@@ -48,15 +64,35 @@ class ContactRosterItem : public RosterItem {
 		void removeGroup(const std::string& group);
 
+		MUCOccupant::Role getMUCRole() const;
+		void setMUCRole(const MUCOccupant::Role& role);
+		MUCOccupant::Affiliation getMUCAffiliation() const;
+		void setMUCAffiliation(const MUCOccupant::Affiliation& affiliation);
+		std::string getMUCAffiliationText() const;
+
 		void setSupportedFeatures(const std::set<Feature>& features);
 		bool supportsFeature(Feature feature) const;
+
+		void setBlockState(BlockState state);
+		BlockState blockState() const;
+
+		VCard::ref getVCard() const;
+		void setVCard(VCard::ref vcard);
+
+		boost::signal<void ()> onVCardRequested;
+
 	private:
 		JID jid_;
 		JID displayJID_;
-		std::string avatarPath_;
+		boost::posix_time::ptime lastAvailableTime_;
+		boost::filesystem::path avatarPath_;
 		std::map<std::string, boost::shared_ptr<Presence> > presences_;
 		boost::shared_ptr<Presence> offlinePresence_;
 		boost::shared_ptr<Presence> shownPresence_;
 		std::vector<std::string> groups_;
+		MUCOccupant::Role mucRole_;
+		MUCOccupant::Affiliation mucAffiliation_;
 		std::set<Feature> features_;
+		BlockState blockState_;
+		VCard::ref vcard_;
 };