From 844f1b95b12540aa99225eff48f88b1c51e4c713 Mon Sep 17 00:00:00 2001 From: Matthieu Tanon Date: Tue, 4 Sep 2018 17:44:36 +0200 Subject: [PATCH] Add new history filter for one to one chatrooms --- src/db/main-db.cpp | 8 +++++++- src/db/main-db.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp index 64f970307..a778af079 100644 --- a/src/db/main-db.cpp +++ b/src/db/main-db.cpp @@ -159,6 +159,7 @@ namespace { constexpr char ConferenceChatMessageFilter[] = "5"; constexpr char ConferenceInfoNoDeviceFilter[] = "1,2,6,7,8,9,12,13"; constexpr char ConferenceInfoFilter[] = "1,2,6,7,8,9,10,11,12"; + constexpr char ConferenceChatMessageSecurityFilter[] = "5,13"; #else constexpr auto ConferenceCallFilter = SqlEventFilterBuilder< EventLog::Type::ConferenceCallStart, @@ -182,13 +183,18 @@ namespace { EventLog::Type::ConferenceParticipantDeviceAdded, EventLog::Type::ConferenceParticipantDeviceRemoved >::get(); + + constexpr auto ConferenceChatMessageSecurityFilter = ConferenceChatMessageFilter + "," + SqlEventFilterBuilder< + EventLog::Type::ConferenceSecurityEvent + >::get(); #endif // ifdef _WIN32 constexpr EnumToSql EventFilterToSql[] = { { MainDb::ConferenceCallFilter, ConferenceCallFilter }, { MainDb::ConferenceChatMessageFilter, ConferenceChatMessageFilter }, { MainDb::ConferenceInfoNoDeviceFilter, ConferenceInfoNoDeviceFilter }, - { MainDb::ConferenceInfoFilter, ConferenceInfoFilter } + { MainDb::ConferenceInfoFilter, ConferenceInfoFilter }, + { MainDb::ConferenceChatMessageSecurityFilter, ConferenceChatMessageSecurityFilter } }; } diff --git a/src/db/main-db.h b/src/db/main-db.h index df325aa83..3d87c48de 100644 --- a/src/db/main-db.h +++ b/src/db/main-db.h @@ -55,7 +55,8 @@ public: ConferenceCallFilter = 0x1, ConferenceChatMessageFilter = 0x2, ConferenceInfoFilter = 0x4, - ConferenceInfoNoDeviceFilter = 0x8 + ConferenceInfoNoDeviceFilter = 0x8, + ConferenceChatMessageSecurityFilter = 0x10 }; typedef EnumMask FilterMask; -- GitLab