4 files changed, 28 insertions, 7 deletions
diff --git a/Swiften/VCards/VCardManager.cpp b/Swiften/VCards/VCardManager.cpp
index 52447a1..5a65dcd 100644
--- a/Swiften/VCards/VCardManager.cpp
+++ b/Swiften/VCards/VCardManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -8,6 +8,7 @@
 
 #include <boost/bind.hpp>
 
+#include <Swiften/Base/Log.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/VCards/VCardStorage.h>
 #include <Swiften/VCards/GetVCardRequest.h>
@@ -25,9 +26,11 @@ VCard::ref VCardManager::getVCard(const JID& jid) const {
 	return storage->getVCard(jid);
 }
 
-VCard::ref VCardManager::getVCardAndRequestWhenNeeded(const JID& jid) {
+VCard::ref VCardManager::getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge) {
 	VCard::ref vcard = storage->getVCard(jid);
-	if (!vcard) {
+	boost::posix_time::ptime vcardFetchedTime = storage->getVCardWriteTime(jid);
+	bool vcardTooOld = vcard && (vcardFetchedTime.is_special() || ((boost::posix_time::second_clock::universal_time() - vcardFetchedTime) > allowedAge));
+	if (!vcard || vcardTooOld) {
 		requestVCard(jid);
 	}
 	return vcard;
diff --git a/Swiften/VCards/VCardManager.h b/Swiften/VCards/VCardManager.h
index b7e3c32..78e0f3e 100644
--- a/Swiften/VCards/VCardManager.h
+++ b/Swiften/VCards/VCardManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -8,6 +8,8 @@
 
 #include <set>
 
+#include <boost/date_time/posix_time/posix_time.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Elements/VCard.h>
@@ -26,7 +28,7 @@ namespace Swift {
 			~VCardManager();
 
 			VCard::ref getVCard(const JID& jid) const;
-			VCard::ref getVCardAndRequestWhenNeeded(const JID& jid);
+			VCard::ref getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge = boost::posix_time::time_duration(boost::date_time::pos_infin));
 			void requestVCard(const JID& jid);
 			void requestOwnVCard();
 
diff --git a/Swiften/VCards/VCardMemoryStorage.h b/Swiften/VCards/VCardMemoryStorage.h
index 86ae1b2..f538fc1 100644
--- a/Swiften/VCards/VCardMemoryStorage.h
+++ b/Swiften/VCards/VCardMemoryStorage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <boost/shared_ptr.hpp>
+
 #include <map>
 
 #include <Swiften/JID/JID.h>
@@ -27,12 +28,24 @@ namespace Swift {
 				}
 			}
 
+			virtual boost::posix_time::ptime getVCardWriteTime(const JID& jid) const {
+				if (vcardWriteTimes.find(jid) == vcardWriteTimes.end()) {
+					return boost::posix_time::ptime();
+				}
+				else {
+					return vcardWriteTimes.at(jid);
+				}
+			}
+
 			virtual void setVCard(const JID& jid, VCard::ref v) {
 				vcards[jid] = v;
+				vcardWriteTimes[jid] = boost::posix_time::second_clock::universal_time();
 			}
 
 		private:
 			typedef std::map<JID, VCard::ref> VCardMap;
+			typedef std::map<JID, boost::posix_time::ptime> VCardWriteTimeMap;
 			VCardMap vcards;
+			VCardWriteTimeMap vcardWriteTimes;
 	};
 }
diff --git a/Swiften/VCards/VCardStorage.h b/Swiften/VCards/VCardStorage.h
index 924204c..e6c84f4 100644
--- a/Swiften/VCards/VCardStorage.h
+++ b/Swiften/VCards/VCardStorage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -7,7 +7,9 @@
 #pragma once
 
 #include <string>
+
 #include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/VCard.h>
@@ -22,6 +24,7 @@ namespace Swift {
 			virtual ~VCardStorage();
 
 			virtual VCard::ref getVCard(const JID& jid) const = 0;
+			virtual boost::posix_time::ptime getVCardWriteTime(const JID& jid) const = 0;
 			virtual void setVCard(const JID&, VCard::ref) = 0;
 
 			virtual std::string getPhotoHash(const JID&) const;