From fb0d2434d02a48a4df9b10a2173e86bb01e843fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 17 Nov 2022 10:57:30 -0500
Subject: [PATCH] swarm: remove members limit for swarms
Change-Id: I1b9a46fd524b2af4b795986491f5d2fd882437d5
---
src/app/constant/JamiStrings.qml | 2 --
src/app/contactadapter.cpp | 5 +---
.../mainview/components/ChatViewHeader.qml | 2 +-
src/app/mainview/components/SidePanel.qml | 24 -------------------
4 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index b6c8bfe1d..a134d841b 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -852,8 +852,6 @@ Item {
property string none: qsTr("None")
// NewSwarmPage
- property string youCanAdd7: qsTr("You can add 7 people in the swarm")
- property string youCanAddMore: qsTr("You can add %1 more people in the swarm")
property string createTheSwarm: qsTr("Create the swarm")
property string goToConversation: qsTr("Go to conversation")
property string promoteAdministrator: qsTr("Promote to administrator")
diff --git a/src/app/contactadapter.cpp b/src/app/contactadapter.cpp
index 2eec2f096..b52c6f278 100644
--- a/src/app/contactadapter.cpp
+++ b/src/app/contactadapter.cpp
@@ -154,12 +154,9 @@ ContactAdapter::contactSelected(int index)
switch (listModeltype_) {
case SmartListModel::Type::ADDCONVMEMBER: {
auto members = convModel->peersForConversation(lrcInstance_->get_selectedConvUid());
- auto cntMembers = members.size();
const auto uris = contactIndex.data(Role::Uris).toStringList();
for (const auto& uri : uris) {
- // TODO remove < 9
- if (!members.contains(uri) && cntMembers < 9) {
- cntMembers++;
+ if (!members.contains(uri)) {
convModel->addConversationMember(lrcInstance_->get_selectedConvUid(), uri);
}
}
diff --git a/src/app/mainview/components/ChatViewHeader.qml b/src/app/mainview/components/ChatViewHeader.qml
index a7cadb83a..b95fb6417 100644
--- a/src/app/mainview/components/ChatViewHeader.qml
+++ b/src/app/mainview/components/ChatViewHeader.qml
@@ -207,7 +207,7 @@ Rectangle {
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
- visible: interactionButtonsVisibility && CurrentConversationMembers.count < 8 && addMemberVisibility
+ visible: interactionButtonsVisibility && addMemberVisibility
onClicked: addToConversationClicked()
}
diff --git a/src/app/mainview/components/SidePanel.qml b/src/app/mainview/components/SidePanel.qml
index 768a36372..cd5b6166d 100644
--- a/src/app/mainview/components/SidePanel.qml
+++ b/src/app/mainview/components/SidePanel.qml
@@ -131,11 +131,6 @@ SidePanelBase {
newHm = Array.from(newHm).filter(r => r.convId !== convId)
}
- // We can't have more than 8 participants yet. (7 + self)
- if (newHm.length > 7) {
- return false
- }
-
newH.push(convId)
root.highlighted = newH
root.highlightedMembers = newHm
@@ -397,25 +392,6 @@ SidePanelBase {
spacing: 4
- Text {
- font.bold: true
- font.pointSize: JamiTheme.contactEventPointSize
-
- Layout.margins: 16
- Layout.maximumHeight: 24
- Layout.alignment: Qt.AlignTop
- Layout.fillWidth: true
-
- wrapMode: Text.Wrap
-
- text: {
- if (highlightedMembers.length === 0)
- return JamiStrings.youCanAdd7
- return JamiStrings.youCanAddMore.arg(7 - Math.min(highlightedMembers.length, 7))
- }
- color: JamiTheme.textColor
- }
-
JamiListView {
id: swarmCurrentConversationList
--
GitLab