1 files changed, 17 insertions, 10 deletions
diff --git a/Swift/Controllers/HistoryController.cpp b/Swift/Controllers/HistoryController.cpp
index a19e321..c82892a 100644
--- a/Swift/Controllers/HistoryController.cpp
+++ b/Swift/Controllers/HistoryController.cpp
@@ -6,19 +6,26 @@
 
 #include <Swift/Controllers/HistoryController.h>
 #include <Swiften/History/SQLiteHistoryManager.h>
+#include <Swiften/History/HistoryMessage.h>
 
 namespace Swift {
-	HistoryController::HistoryController() : remoteArchiveSupported_(false) {
-		std::string file("testDB.db");
-		localHistory_ = new SQLiteHistoryManager(file);
-	}
 
-	HistoryController::~HistoryController() {
-		delete localHistory_;
-	}
+HistoryController::HistoryController() : remoteArchiveSupported_(false) {
+	std::string file("testDB.db");
+	localHistory_ = new SQLiteHistoryManager(file);
+}
+
+HistoryController::~HistoryController() {
+	delete localHistory_;
+}
 
-	void HistoryController::addMessage(const JID& baseJID, const JID& fromJID, const JID& toJID, std::string messageBody, boost::posix_time::ptime timeStamp) {
-		std::cout << baseJID << " " << fromJID << " " << toJID << " " << messageBody << " " << to_simple_string(timeStamp);
-	}
+void HistoryController::addMessage(const JID& baseJID, const JID& fromJID, const std::string& displayNick, const std::string& messageBody, boost::posix_time::ptime timeStamp) {
+	HistoryMessage message(messageBody, baseJID, fromJID, displayNick, timeStamp);
+	localHistory_->addMessage(message);
+}
+
+std::vector<HistoryMessage> HistoryController::getMessages() const {
+	return localHistory_->getMessages();
+}
 
 }