Merge commit '6aaa2bc2db7f2c6f8d87bb25a64d07a21bd2fc82' into fluffychat-merge

This commit is contained in:
ggurdin 2025-06-04 15:33:13 -04:00
commit 91b069c4f4
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
2 changed files with 11 additions and 9 deletions

View file

@ -34,11 +34,7 @@ class ChatMembersController extends State<ChatMembersPage> {
final members = this
.members
?.where(
(member) =>
membershipFilter == Membership.join ||
member.membership == membershipFilter,
)
?.where((member) => member.membership == membershipFilter)
.toList();
if (filter.isEmpty) {

View file

@ -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 =>