From 5460eefe4c196cc1159b3013ee3b7f8d31e0ae49 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 5 Sep 2018 10:11:00 +0200
Subject: [PATCH] Use new filter for OneToOne chat room

---
 src/chat/chat-room/client-group-chat-room.cpp | 23 +++++++++++++++++++
 src/chat/chat-room/client-group-chat-room.h   |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/src/chat/chat-room/client-group-chat-room.cpp b/src/chat/chat-room/client-group-chat-room.cpp
index 21cc156d2..b9d4a50d8 100644
--- a/src/chat/chat-room/client-group-chat-room.cpp
+++ b/src/chat/chat-room/client-group-chat-room.cpp
@@ -375,6 +375,29 @@ void ClientGroupChatRoom::deleteFromDb () {
 	d->chatRoomListener->onChatRoomDeleteRequested(getSharedFromThis());
 }
 
+list<shared_ptr<EventLog>> ClientGroupChatRoom::getHistory (int nLast) const {
+	L_D();
+	return getCore()->getPrivate()->mainDb->getHistory(
+		getConferenceId(),
+		nLast,
+		(d->capabilities & Capabilities::OneToOne) ?
+			MainDb::Filter::ConferenceChatMessageSecurityFilter :
+			MainDb::FilterMask({MainDb::Filter::ConferenceChatMessageFilter, MainDb::Filter::ConferenceInfoNoDeviceFilter})
+	);
+}
+
+list<shared_ptr<EventLog>> ClientGroupChatRoom::getHistoryRange (int begin, int end) const {
+	L_D();
+	return getCore()->getPrivate()->mainDb->getHistoryRange(
+		getConferenceId(),
+		begin,
+		end,
+		(d->capabilities & Capabilities::OneToOne) ?
+			MainDb::Filter::ConferenceChatMessageSecurityFilter :
+			MainDb::FilterMask({MainDb::Filter::ConferenceChatMessageFilter, MainDb::Filter::ConferenceInfoNoDeviceFilter})
+	);
+}
+
 void ClientGroupChatRoom::addParticipant (const IdentityAddress &addr, const CallSessionParams *params, bool hasMedia) {
 	L_D();
 
diff --git a/src/chat/chat-room/client-group-chat-room.h b/src/chat/chat-room/client-group-chat-room.h
index 0659ad795..296684d57 100644
--- a/src/chat/chat-room/client-group-chat-room.h
+++ b/src/chat/chat-room/client-group-chat-room.h
@@ -80,6 +80,9 @@ public:
 
 	void deleteFromDb () override;
 
+	std::list<std::shared_ptr<EventLog>> getHistory (int nLast) const override;
+	std::list<std::shared_ptr<EventLog>> getHistoryRange (int begin, int end) const override;
+
 	void addParticipant (const IdentityAddress &addr, const CallSessionParams *params, bool hasMedia) override;
 	void addParticipants (const std::list<IdentityAddress> &addresses, const CallSessionParams *params, bool hasMedia) override;
 
-- 
GitLab