2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2869 from krille-chan/dependabot/pub/matrix-7.0.0

Browse source 
build: (deps): bump matrix from 6.2.0 to 7.0.0
This commit is contained in:
Krille-chan 2026-04-19 12:13:13 +09:00 • committed by GitHub
commit 382ffb145f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pages/chat/chat.dart
View file

@ -1155,7 +1155,7 @@ class ChatController extends State<ChatPageWithRoom>
true,
false,
);
users.sort((a, b) => a.powerLevel.compareTo(b.powerLevel));
users.sort((a, b) => a.powerLevel.level.compareTo(b.powerLevel.level));
final via = users
.map((user) => user.id.domain)
.whereType<String>()

11
lib/pages/chat/events/message.dart
View file

@ -385,17 +385,20 @@ class Message extends StatelessWidget {
? const SizedBox(height: 12)
: Row(
children: [
if (sender.powerLevel >= 50)
if (sender.powerLevel.role !=
PowerLevelRole.user)
Padding(
padding: const EdgeInsets.only(
right: 2.0,
),
child: Icon(
sender.powerLevel >= 100
sender.powerLevel.role ==
PowerLevelRole
.moderator
? Icons
.admin_panel_settings
.add_moderator_outlined
: Icons
.add_moderator_outlined,
.admin_panel_settings,
size: 14,
color: theme
.colorScheme

2
lib/pages/chat_details/chat_details_view.dart
View file

@ -44,7 +44,7 @@ class ChatDetailsView extends StatelessWidget {
),
builder: (context, snapshot) {
var members = room.getParticipants().toList()
..sort((b, a) => a.powerLevel.compareTo(b.powerLevel));
..sort((b, a) => a.powerLevel.level.compareTo(b.powerLevel.level));
members = members.take(10).toList();
final actualMembersCount =
(room.summary.mInvitedMemberCount ?? 0) +

21
lib/pages/chat_details/participant_list_item.dart
View file

@ -23,13 +23,16 @@ class ParticipantListItem extends StatelessWidget {
Membership.leave => L10n.of(context).leftTheChat,
};
final permissionBatch = user.room.creatorUserIds.contains(user.id)
? L10n.of(context).owner
: user.powerLevel >= 100
? L10n.of(context).admin
: user.powerLevel >= 50
? L10n.of(context).moderator
: '';
final permissionBatch = switch (user.powerLevel.role) {
PowerLevelRole.user => '',
PowerLevelRole.moderator => L10n.of(context).moderator,
PowerLevelRole.admin => L10n.of(context).admin,
PowerLevelRole.owner => L10n.of(context).owner,
};
final isAdminOrOwner =
user.powerLevel.role == PowerLevelRole.admin ||
user.powerLevel.role == PowerLevelRole.owner;
return ListTile(
onTap: () => showMemberActionsPopupMenu(context: context, user: user),
@ -45,7 +48,7 @@ class ParticipantListItem extends StatelessWidget {
Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
decoration: BoxDecoration(
color: user.powerLevel >= 100
color: isAdminOrOwner
? theme.colorScheme.tertiary
: theme.colorScheme.tertiaryContainer,
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
@ -53,7 +56,7 @@ class ParticipantListItem extends StatelessWidget {
child: Text(
permissionBatch,
style: theme.textTheme.labelSmall?.copyWith(
color: user.powerLevel >= 100
color: isAdminOrOwner
? theme.colorScheme.onTertiary
: theme.colorScheme.onTertiaryContainer,
),

5
lib/pages/chat_members/chat_members.dart
View file

@ -1,7 +1,6 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:matrix/matrix.dart';
import '../../widgets/matrix.dart';
@ -39,7 +38,7 @@ class ChatMembersController extends State<ChatMembersPage> {
if (filter.isEmpty) {
setState(() {
filteredMembers = members
?..sort((b, a) => a.powerLevel.compareTo(b.powerLevel));
?..sort((b, a) => a.powerLevel.level.compareTo(b.powerLevel.level));
});
return;
}
@ -52,7 +51,7 @@ class ChatMembersController extends State<ChatMembersPage> {
user.id.toLowerCase().contains(filter),
)
.toList()
?..sort((b, a) => a.powerLevel.compareTo(b.powerLevel));
?..sort((b, a) => a.powerLevel.level.compareTo(b.powerLevel.level));
});
}

18
lib/widgets/member_actions_popup_menu_button.dart
View file

@ -81,7 +81,7 @@ Future<void> showMemberActionsPopupMenu({
),
),
if (user.canChangeUserPowerLevel) ...[
if (user.powerLevel < 100)
if (user.powerLevel.level < 100)
PopupMenuItem(
value: _MemberActions.makeAdmin,
child: Row(
@ -92,7 +92,7 @@ Future<void> showMemberActionsPopupMenu({
],
),
),
if (user.powerLevel < 50)
if (user.powerLevel.level < 50)
PopupMenuItem(
value: _MemberActions.makeModerator,
child: Row(
@ -103,7 +103,7 @@ Future<void> showMemberActionsPopupMenu({
],
),
),
if (user.powerLevel >= 100)
if (user.powerLevel.role == PowerLevelRole.admin)
PopupMenuItem(
value: _MemberActions.removeAdmin,
child: Row(
@ -114,7 +114,7 @@ Future<void> showMemberActionsPopupMenu({
],
),
)
else if (user.powerLevel >= 50)
else if (user.powerLevel.role == PowerLevelRole.moderator)
PopupMenuItem(
value: _MemberActions.removeModerator,
child: Row(
@ -127,7 +127,7 @@ Future<void> showMemberActionsPopupMenu({
),
],
if (user.canChangeUserPowerLevel ||
!defaultPowerLevels.contains(user.powerLevel))
!defaultPowerLevels.contains(user.powerLevel.level))
PopupMenuItem(
value: _MemberActions.setPowerLevel,
enabled: user.canChangeUserPowerLevel,
@ -140,7 +140,7 @@ Future<void> showMemberActionsPopupMenu({
? L10n.of(context).setPowerLevel
: L10n.of(context).powerLevel,
),
if (!defaultPowerLevels.contains(user.powerLevel))
if (!defaultPowerLevels.contains(user.powerLevel.level))
Text(' (${user.powerLevel})'),
],
),
@ -219,8 +219,8 @@ Future<void> showMemberActionsPopupMenu({
case _MemberActions.setPowerLevel:
final power = await showPermissionChooser(
context,
currentLevel: user.powerLevel,
maxLevel: user.room.ownPowerLevel,
currentLevel: user.powerLevel.level,
maxLevel: user.room.ownPowerLevel.level,
);
if (power == null) return;
if (!context.mounted) return;
@ -323,7 +323,7 @@ Future<void> showMemberActionsPopupMenu({
);
}
case _MemberActions.makeAdmin:
if (user.room.ownPowerLevel <= 100) {
if (user.room.ownPowerLevel.level <= 100) {
final consent = await showOkCancelAlertDialog(
context: context,
title: L10n.of(context).areYouSure,

4
pubspec.lock
View file

@ -1072,10 +1072,10 @@ packages:
dependency: "direct main"
description:
name: matrix
sha256: "5bb38e98212bc4c3244c762a1af787f7239a38d2cfdf44488258283ff899f77c"
sha256: "0da5f65016c704bda81eae807cdadc18a046a444fa7e5cec83e60e5d04006d17"
url: "https://pub.dev"
source: hosted
version: "6.2.0"
version: "7.0.0"
meta:
dependency: transitive
description:

2
pubspec.yaml
View file

@ -49,7 +49,7 @@ dependencies:
intl: any
just_audio: ^0.10.5
latlong2: ^0.9.1
matrix: ^6.2.0
matrix: ^7.0.0
mime: ^2.0.0
native_imaging: ^0.4.0
opus_caf_converter_dart: ^1.0.1