lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-14 04:25:22 +02:00
Code Activity

swarm: make conversation filters great again

Browse source 
PENDING profile is no longer a valid filter criteria. isReqeust is
now used instead and the profile type is restricted to account
types and tracked as a separate property.

Change-Id: I4848e32f005ea7a6a8b5f2fa25d40b7e1e4d63b8
This commit is contained in:
Andreas Traczyk 2021-06-18 13:48:21 -04:00
parent 0e602266c8
commit 85bbcf37d6
7 changed files with 80 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/conversationlistmodel.cpp
View file

@ -102,20 +102,39 @@ ConversationListProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex& s
flags |= URI::Section::SCHEME;
}
rx.setPattern(uriStripper.format(flags));
auto uri = index.data(ConversationList::Role::URI).toString();
auto alias = index.data(ConversationList::Role::Alias).toString();
auto registeredName = index.data(ConversationList::Role::RegisteredName).toString();
auto itemProfileType = index.data(ConversationList::Role::ContactType).toInt();
auto typeFilter = static_cast<profile::Type>(itemProfileType) == currentTypeFilter_;
using namespace ConversationList;
// name/id
auto uri = index.data(Role::URI).toString();
auto alias = index.data(Role::Alias).toString();
auto registeredName = index.data(Role::RegisteredName).toString();
// account type
auto itemProfileType = static_cast<profile::Type>(index.data(Role::ContactType).toInt());
// this is workaround for profile::Type including both account types and extended types
// - PENDING is implicitly also JAMI
// - TEMPORARY should never be in this list
if (itemProfileType == profile::Type::PENDING)
itemProfileType = profile::Type::JAMI;
auto typeFilter = itemProfileType == profileTypeFilter_;
// requests
auto isRequest = index.data(Role::IsRequest).toBool();
bool requestFilter = filterRequests_ ? isRequest : !isRequest;
bool match {false};
if (index.data(ConversationList::Role::IsBanned).toBool()) {
// banned contacts require exact match
if (index.data(Role::IsBanned).toBool()) {
match = !rx.isEmpty()
&& (rx.exactMatch(uri) || rx.exactMatch(alias) || rx.exactMatch(registeredName));
} else {
match = (rx.indexIn(uri) != -1 || rx.indexIn(alias) != -1
|| rx.indexIn(registeredName) != -1);
}
return typeFilter && match;
return typeFilter && requestFilter && match;
}
bool
@ -128,10 +147,24 @@ ConversationListProxyModel::lessThan(const QModelIndex& left, const QModelIndex&
}
void
ConversationListProxyModel::setTypeFilter(const profile::Type& typeFilter)
ConversationListProxyModel::setProfileTypeFilter(const profile::Type& profileTypeFilter)
{
if (profileTypeFilter != lrc::api::profile::Type::JAMI
&& profileTypeFilter != lrc::api::profile::Type::SIP) {
qWarning() << "Profile filter parameter must be an account type";
return;
}
beginResetModel();
currentTypeFilter_ = typeFilter;
profileTypeFilter_ = profileTypeFilter;
endResetModel();
updateSelection();
};
void
ConversationListProxyModel::setFilterRequests(bool filterRequests)
{
beginResetModel();
filterRequests_ = filterRequests;
endResetModel();
updateSelection();
};

12
src/conversationlistmodel.h
View file

@ -48,8 +48,16 @@ public:
bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
Q_INVOKABLE void setTypeFilter(const profile::Type& typeFilter);
Q_INVOKABLE void setProfileTypeFilter(const profile::Type& profileTypeFilter);
Q_INVOKABLE void setFilterRequests(bool filterRequests);
private:
profile::Type currentTypeFilter_;
// With swarm in place, this filter should only ever be set to profile::Type::JAMI
// and profile::Type::SIP as profile::Type::PENDING should no longer be used to
// filter for invites, and instead use the isRequest property of a conversation.
profile::Type profileTypeFilter_;
// This flag can be toggled when switching tabs to show the current account's
// conversation invites.
bool filterRequests_ {false};
};

3
src/conversationlistmodelbase.cpp
View file

@ -165,6 +165,9 @@ ConversationListModelBase::dataForItem(item_t item, int role) const
}
return QVariant("");
}
case Role::IsRequest: {
return QVariant(item.isRequest);
}
}
return QVariant();
}

3
src/conversationlistmodelbase.h
View file

@ -44,7 +44,8 @@
X(SectionName) \
X(AccountId) \
X(PictureUid) \
X(Draft)
X(Draft) \
X(IsRequest)
namespace ConversationList {
Q_NAMESPACE

36
src/conversationsadapter.cpp
View file

@ -33,7 +33,6 @@ ConversationsAdapter::ConversationsAdapter(SystemTray* systemTray,
LRCInstance* instance,
QObject* parent)
: QmlAdapterBase(instance, parent)
, currentTypeFilter_(profile::Type::JAMI)
, systemTray_(systemTray)
, convSrcModel_(new ConversationListModel(lrcInstance_))
, convModel_(new ConversationListProxyModel(convSrcModel_.get()))
@ -45,9 +44,16 @@ ConversationsAdapter::ConversationsAdapter(SystemTray* systemTray,
new SelectableListProxyGroupModel({convModel_.data(), searchModel_.data()}, this);
setTypeFilter(currentTypeFilter_);
connect(this, &ConversationsAdapter::currentTypeFilterChanged, [this]() {
setTypeFilter(currentTypeFilter_);
// this will trigger when the conversations filter tab is selected
connect(this, &ConversationsAdapter::profileTypeFilterChanged, [this]() {
convModel_->setProfileTypeFilter(profileTypeFilter_);
});
set_profileTypeFilter(profile::Type::JAMI);
// this will trigger when the invite filter tab is selected
connect(this, &ConversationsAdapter::filterRequestsChanged, [this]() {
// it is assumed that profileTypeFilter is profile::Type::JAMI here
convModel_->setFilterRequests(filterRequests_);
});
connect(lrcInstance_, &LRCInstance::selectedConvUidChanged, [this]() {
@ -73,7 +79,7 @@ ConversationsAdapter::ConversationsAdapter(SystemTray* systemTray,
auto& contact = accInfo.contactModel->getContact(convInfo.participants.front());
if (contact.profileInfo.type != profile::Type::INVALID
&& contact.profileInfo.type != profile::Type::TEMPORARY)
set_currentTypeFilter(contact.profileInfo.type);
set_profileTypeFilter(contact.profileInfo.type);
} catch (const std::out_of_range& e) {
qWarning() << e.what();
}
@ -167,7 +173,7 @@ ConversationsAdapter::safeInit()
connectConversationModel();
set_currentTypeFilter(lrcInstance_->getCurrentAccountInfo().profileInfo.type);
set_profileTypeFilter(lrcInstance_->getCurrentAccountInfo().profileInfo.type);
}
void
@ -177,7 +183,7 @@ ConversationsAdapter::onCurrentAccountIdChanged()
connectConversationModel();
set_currentTypeFilter(lrcInstance_->getCurrentAccountInfo().profileInfo.type);
set_profileTypeFilter(lrcInstance_->getCurrentAccountInfo().profileInfo.type);
}
void
@ -346,8 +352,8 @@ ConversationsAdapter::updateConversationFilterData()
}
set_totalUnreadMessageCount(totalUnreadMessages);
set_pendingRequestCount(accountInfo.conversationModel->pendingRequestCount());
if (pendingRequestCount_ == 0 && currentTypeFilter_ == profile::Type::PENDING) {
set_currentTypeFilter(profile::Type::JAMI);
if (pendingRequestCount_ == 0 && profileTypeFilter_ == profile::Type::PENDING) {
set_profileTypeFilter(profile::Type::JAMI);
}
}
@ -358,12 +364,6 @@ ConversationsAdapter::setFilter(const QString& filterString)
searchSrcModel_->setFilter(filterString);
}
void
ConversationsAdapter::setTypeFilter(const profile::Type& typeFilter)
{
convModel_->setTypeFilter(typeFilter);
}
QVariantMap
ConversationsAdapter::getConvInfoMap(const QString& convId)
{
@ -414,7 +414,7 @@ ConversationsAdapter::getConvInfoMap(const QString& convId)
}
bool
ConversationsAdapter::connectConversationModel(bool updateFilter)
ConversationsAdapter::connectConversationModel()
{
// Signal connections
auto currentConversationModel = lrcInstance_->getCurrentConversationModel();
@ -467,10 +467,6 @@ ConversationsAdapter::connectConversationModel(bool updateFilter)
&ConversationsAdapter::onSearchResultUpdated,
Qt::UniqueConnection);
if (updateFilter) {
currentTypeFilter_ = profile::Type::INVALID;
}
convSrcModel_.reset(new ConversationListModel(lrcInstance_));
convModel_->bindSourceModel(convSrcModel_.get());
searchSrcModel_.reset(new SearchResultsListModel(lrcInstance_));

6
src/conversationsadapter.h
View file

@ -33,7 +33,8 @@ class SystemTray;
class ConversationsAdapter final : public QmlAdapterBase
{
Q_OBJECT
QML_PROPERTY(lrc::api::profile::Type, currentTypeFilter)
QML_PROPERTY(lrc::api::profile::Type, profileTypeFilter)
QML_PROPERTY(bool, filterRequests)
QML_PROPERTY(int, totalUnreadMessageCount)
QML_PROPERTY(int, pendingRequestCount)
@ -47,9 +48,8 @@ protected:
void safeInit() override;
public:
Q_INVOKABLE bool connectConversationModel(bool updateFilter = true);
Q_INVOKABLE bool connectConversationModel();
Q_INVOKABLE void setFilter(const QString& filterString);
Q_INVOKABLE void setTypeFilter(const profile::Type& typeFilter);
Q_INVOKABLE QVariantMap getConvInfoMap(const QString& convId);
Q_SIGNALS:

12
src/mainview/components/SidePanelTabBar.qml
View file

@ -31,8 +31,6 @@ import "../../commoncomponents"
TabBar {
id: tabBar
property int currentTypeFilter: ConversationsAdapter.currentTypeFilter
currentIndex: 0
enum TabIndex {
@ -40,17 +38,15 @@ TabBar {
Requests
}
function selectTab(tabIndex) {
ConversationsAdapter.currentTypeFilter =
(tabIndex === SidePanelTabBar.Conversations) ?
LRCInstance.currentAccountType :
Profile.Type.PENDING
function selectTab(idx) {
ConversationsAdapter.profileTypeFilter = LRCInstance.currentAccountType
ConversationsAdapter.filterRequests = (idx === SidePanelTabBar.Requests)
}
FilterTabButton {
id: conversationsTabButton
down: currentTypeFilter !== Profile.Type.PENDING
down: !ConversationsAdapter.filterRequests
tabBar: parent
labelText: JamiStrings.conversations
onSelected: selectTab(SidePanelTabBar.Conversations)