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, true,
false, false,
); );
users.sort((a, b) => a.powerLevel.compareTo(b.powerLevel)); users.sort((a, b) => a.powerLevel.level.compareTo(b.powerLevel.level));
final via = users final via = users
.map((user) => user.id.domain) .map((user) => user.id.domain)
.whereType<String>() .whereType<String>()

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

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

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

@ -44,7 +44,7 @@ class ChatDetailsView extends StatelessWidget {
), ),
builder: (context, snapshot) { builder: (context, snapshot) {
var members = room.getParticipants().toList() 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(); members = members.take(10).toList();
final actualMembersCount = final actualMembersCount =
(room.summary.mInvitedMemberCount ?? 0) + (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, Membership.leave => L10n.of(context).leftTheChat,
}; };
final permissionBatch = user.room.creatorUserIds.contains(user.id) final permissionBatch = switch (user.powerLevel.role) {
? L10n.of(context).owner PowerLevelRole.user => '',
: user.powerLevel >= 100 PowerLevelRole.moderator => L10n.of(context).moderator,
? L10n.of(context).admin PowerLevelRole.admin => L10n.of(context).admin,
: user.powerLevel >= 50 PowerLevelRole.owner => L10n.of(context).owner,
? L10n.of(context).moderator };
: '';
final isAdminOrOwner =
user.powerLevel.role == PowerLevelRole.admin ||
user.powerLevel.role == PowerLevelRole.owner;
return ListTile( return ListTile(
onTap: () => showMemberActionsPopupMenu(context: context, user: user), onTap: () => showMemberActionsPopupMenu(context: context, user: user),
@ -45,7 +48,7 @@ class ParticipantListItem extends StatelessWidget {
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
decoration: BoxDecoration( decoration: BoxDecoration(
color: user.powerLevel >= 100 color: isAdminOrOwner
? theme.colorScheme.tertiary ? theme.colorScheme.tertiary
: theme.colorScheme.tertiaryContainer, : theme.colorScheme.tertiaryContainer,
borderRadius: BorderRadius.circular(AppConfig.borderRadius), borderRadius: BorderRadius.circular(AppConfig.borderRadius),
@ -53,7 +56,7 @@ class ParticipantListItem extends StatelessWidget {
child: Text( child: Text(
permissionBatch, permissionBatch,
style: theme.textTheme.labelSmall?.copyWith( style: theme.textTheme.labelSmall?.copyWith(
color: user.powerLevel >= 100 color: isAdminOrOwner
? theme.colorScheme.onTertiary ? theme.colorScheme.onTertiary
: theme.colorScheme.onTertiaryContainer, : theme.colorScheme.onTertiaryContainer,
), ),

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

@ -1,7 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
import '../../widgets/matrix.dart'; import '../../widgets/matrix.dart';
@ -39,7 +38,7 @@ class ChatMembersController extends State<ChatMembersPage> {
if (filter.isEmpty) { if (filter.isEmpty) {
setState(() { setState(() {
filteredMembers = members filteredMembers = members
?..sort((b, a) => a.powerLevel.compareTo(b.powerLevel)); ?..sort((b, a) => a.powerLevel.level.compareTo(b.powerLevel.level));
}); });
return; return;
} }
@ -52,7 +51,7 @@ class ChatMembersController extends State<ChatMembersPage> {
user.id.toLowerCase().contains(filter), user.id.toLowerCase().contains(filter),
) )
.toList() .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.canChangeUserPowerLevel) ...[
if (user.powerLevel < 100) if (user.powerLevel.level < 100)
PopupMenuItem( PopupMenuItem(
value: _MemberActions.makeAdmin, value: _MemberActions.makeAdmin,
child: Row( child: Row(
@ -92,7 +92,7 @@ Future<void> showMemberActionsPopupMenu({
], ],
), ),
), ),
if (user.powerLevel < 50) if (user.powerLevel.level < 50)
PopupMenuItem( PopupMenuItem(
value: _MemberActions.makeModerator, value: _MemberActions.makeModerator,
child: Row( child: Row(
@ -103,7 +103,7 @@ Future<void> showMemberActionsPopupMenu({
], ],
), ),
), ),
if (user.powerLevel >= 100) if (user.powerLevel.role == PowerLevelRole.admin)
PopupMenuItem( PopupMenuItem(
value: _MemberActions.removeAdmin, value: _MemberActions.removeAdmin,
child: Row( child: Row(
@ -114,7 +114,7 @@ Future<void> showMemberActionsPopupMenu({
], ],
), ),
) )
else if (user.powerLevel >= 50) else if (user.powerLevel.role == PowerLevelRole.moderator)
PopupMenuItem( PopupMenuItem(
value: _MemberActions.removeModerator, value: _MemberActions.removeModerator,
child: Row( child: Row(
@ -127,7 +127,7 @@ Future<void> showMemberActionsPopupMenu({
), ),
], ],
if (user.canChangeUserPowerLevel || if (user.canChangeUserPowerLevel ||
!defaultPowerLevels.contains(user.powerLevel)) !defaultPowerLevels.contains(user.powerLevel.level))
PopupMenuItem( PopupMenuItem(
value: _MemberActions.setPowerLevel, value: _MemberActions.setPowerLevel,
enabled: user.canChangeUserPowerLevel, enabled: user.canChangeUserPowerLevel,
@ -140,7 +140,7 @@ Future<void> showMemberActionsPopupMenu({
? L10n.of(context).setPowerLevel ? L10n.of(context).setPowerLevel
: L10n.of(context).powerLevel, : L10n.of(context).powerLevel,
), ),
if (!defaultPowerLevels.contains(user.powerLevel)) if (!defaultPowerLevels.contains(user.powerLevel.level))
Text(' (${user.powerLevel})'), Text(' (${user.powerLevel})'),
], ],
), ),
@ -219,8 +219,8 @@ Future<void> showMemberActionsPopupMenu({
case _MemberActions.setPowerLevel: case _MemberActions.setPowerLevel:
final power = await showPermissionChooser( final power = await showPermissionChooser(
context, context,
currentLevel: user.powerLevel, currentLevel: user.powerLevel.level,
maxLevel: user.room.ownPowerLevel, maxLevel: user.room.ownPowerLevel.level,
); );
if (power == null) return; if (power == null) return;
if (!context.mounted) return; if (!context.mounted) return;
@ -323,7 +323,7 @@ Future<void> showMemberActionsPopupMenu({
); );
} }
case _MemberActions.makeAdmin: case _MemberActions.makeAdmin:
if (user.room.ownPowerLevel <= 100) { if (user.room.ownPowerLevel.level <= 100) {
final consent = await showOkCancelAlertDialog( final consent = await showOkCancelAlertDialog(
context: context, context: context,
title: L10n.of(context).areYouSure, title: L10n.of(context).areYouSure,

4
pubspec.lock
View file

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

2
pubspec.yaml
View file

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