From d90c1e6fd854a7a45226cb5898eec713a4e33895 Mon Sep 17 00:00:00 2001 From: Krille Date: Sat, 3 May 2025 07:22:37 +0200 Subject: [PATCH] chore: Only show joined members in members list by default Signed-off-by: Krille --- lib/pages/chat_members/chat_members.dart | 6 +----- lib/pages/chat_members/chat_members_view.dart | 14 ++++++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/pages/chat_members/chat_members.dart b/lib/pages/chat_members/chat_members.dart index d320f1431..028cbc19d 100644 --- a/lib/pages/chat_members/chat_members.dart +++ b/lib/pages/chat_members/chat_members.dart @@ -34,11 +34,7 @@ class ChatMembersController extends State { final members = this .members - ?.where( - (member) => - membershipFilter == Membership.join || - member.membership == membershipFilter, - ) + ?.where((member) => member.membership == membershipFilter) .toList(); if (filter.isEmpty) { diff --git a/lib/pages/chat_members/chat_members_view.dart b/lib/pages/chat_members/chat_members_view.dart index e1598344c..ef55411d9 100644 --- a/lib/pages/chat_members/chat_members_view.dart +++ b/lib/pages/chat_members/chat_members_view.dart @@ -1,10 +1,9 @@ +import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:go_router/go_router.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; import '../../widgets/layouts/max_width_body.dart'; import '../../widgets/matrix.dart'; import '../chat_details/participant_list_item.dart'; @@ -145,8 +144,15 @@ class ChatMembersView extends StatelessWidget { L10n.of(context).banned, Membership.invite => L10n.of(context).invited, - Membership.join => - L10n.of(context).all, + Membership.join => L10n.of(context) + .countParticipants(room.summary + .mJoinedMemberCount ?? + controller.members + ?.where((member) => + member.membership == + Membership.join) + .length ?? + 0), Membership.knock => L10n.of(context).knocking, Membership.leave =>