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

refactor: Update dependencies

Browse source
This commit is contained in:
Krille 2023-07-13 19:46:10 +09:00
commit 91fc889bce
20 changed files with 422 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -869,8 +869,11 @@ class ChatController extends State<ChatPageWithRoom> {
setState(() => showEmojiPicker = false);
if (emoji == null) return;
// make sure we don't send the same emoji twice
if (_allReactionEvents
.any((e) => e.content['m.relates_to']['key'] == emoji.emoji)) return;
if (_allReactionEvents.any(
(e) => e.content.tryGetMap('m.relates_to')?['key'] == emoji.emoji,
)) {
return;
}
return sendEmojiAction(emoji.emoji);
}

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

@ -61,7 +61,7 @@ class MessageReactions extends StatelessWidget {
final evt = allReactionEvents.firstWhereOrNull(
(e) =>
e.senderId == e.room.client.userID &&
e.content['m.relates_to']['key'] == r.key,
e.content.tryGetMap('m.relates_to')?['key'] == r.key,
);
if (evt != null) {
showFutureLoadingDialog(

3
lib/pages/chat/events/video_player.dart
View file

@ -52,7 +52,8 @@ class EventVideoPlayerState extends State<EventVideoPlayer> {
final networkUri = _networkUri;
if (kIsWeb && networkUri != null && _chewieManager == null) {
_chewieManager ??= ChewieController(
videoPlayerController: VideoPlayerController.network(networkUri),
videoPlayerController:
VideoPlayerController.networkUrl(Uri.parse(networkUri)),
autoPlay: true,
autoInitialize: true,
);

5
lib/pages/chat/input_bar.dart
View file

@ -183,12 +183,13 @@ class InputBar extends StatelessWidget {
final state = r.getState(EventTypes.RoomCanonicalAlias);
if ((state != null &&
((state.content['alias'] is String &&
state.content['alias']
state.content
.tryGet<String>('alias')!
.split(':')[0]
.toLowerCase()
.contains(roomSearch)) ||
(state.content['alt_aliases'] is List &&
state.content['alt_aliases'].any(
(state.content['alt_aliases'] as List).any(
(l) =>
l is String &&
l

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

@ -52,7 +52,7 @@ class ReactionsPicker extends StatelessWidget {
for (final event in allReactionEvents) {
try {
emojis.remove(event.content['m.relates_to']['key']);
emojis.remove(event.content.tryGetMap('m.relates_to')!['key']);
} catch (_) {}
}
return Row(

4
lib/pages/chat_details/chat_details.dart
View file

@ -83,7 +83,9 @@ class ChatDetailsController extends State<ChatDetails> {
RequestType.GET,
'/client/unstable/org.matrix.msc2432/rooms/${Uri.encodeComponent(room.id)}/aliases',
)
.then((response) => List<String>.from(response['aliases'])),
.then(
(response) => List<String>.from(response['aliases'] as Iterable),
),
);
// Switch to the stable api once it is implemented.

6
lib/pages/chat_permissions_settings/chat_permissions_settings.dart
View file

@ -73,8 +73,10 @@ class ChatPermissionsSettingsController extends State<ChatPermissionsSettings> {
void updateRoomAction(Capabilities capabilities) async {
final room = Matrix.of(context).client.getRoomById(roomId!)!;
final String roomVersion =
room.getState(EventTypes.RoomCreate)!.content['room_version'] ?? '1';
final roomVersion = room
.getState(EventTypes.RoomCreate)!
.content['room_version'] as String? ??
'1';
final newVersion = await showConfirmationDialog<String>(
context: context,
title: L10n.of(context)!.replaceRoomWithNewerVersion,

4
lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart
View file

@ -127,9 +127,9 @@ class ChatPermissionsSettingsView extends StatelessWidget {
),
);
}
final String roomVersion = room
final roomVersion = room
.getState(EventTypes.RoomCreate)!
.content['room_version'] ??
.content['room_version'] as String? ??
'1';
return ListTile(

4
lib/pages/key_verification/key_verification_dialog.dart
View file

@ -109,6 +109,10 @@ class KeyVerificationPageState extends State<KeyVerificationDialog> {
Widget body;
final buttons = <Widget>[];
switch (widget.request.state) {
case KeyVerificationState.showQRSuccess:
case KeyVerificationState.confirmQRScan:
case KeyVerificationState.askChoice:
throw 'Not implemented';
case KeyVerificationState.askSSSS:
// prompt the user for their ssss passphrase / key
final textEditingController = TextEditingController();

2
lib/pages/new_private_chat/new_private_chat_view.dart
View file

@ -59,7 +59,7 @@ class NewPrivateChatView extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
QrImage(
QrImageView(
data:
'https://matrix.to/#/${Matrix.of(context).client.userID}',
version: QrVersions.auto,

11
lib/pages/settings_emotes/settings_emotes.dart
View file

@ -151,12 +151,11 @@ class EmotesSettingsController extends State<EmotesSettings> {
bool isGloballyActive(Client? client) =>
room != null &&
client!.accountData['im.ponies.emote_rooms']?.content is Map &&
client.accountData['im.ponies.emote_rooms']!.content['rooms'] is Map &&
client.accountData['im.ponies.emote_rooms']!.content['rooms'][room!.id]
is Map &&
client.accountData['im.ponies.emote_rooms']!.content['rooms'][room!.id]
[stateKey ?? ''] is Map;
client!.accountData['im.ponies.emote_rooms']?.content
.tryGetMap<String, Object?>('rooms')
?.tryGetMap<String, Object?>(room!.id)
?.tryGetMap<String, Object?>(stateKey ?? '') !=
null;
bool get readonly =>
room == null ? false : !(room!.canSendEvent('im.ponies.room_emotes'));

16
lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart
View file

@ -40,16 +40,14 @@ class MultipleEmotesSettingsView extends StatelessWidget {
itemCount: keys.length,
itemBuilder: (BuildContext context, int i) {
final event = packs[keys[i]];
String? packName = keys[i].isNotEmpty ? keys[i] : 'Default Pack';
if (event != null && event.content['pack'] is Map) {
if (event.content['pack']['displayname'] is String) {
packName = event.content['pack']['displayname'];
} else if (event.content['pack']['name'] is String) {
packName = event.content['pack']['name'];
}
}
final eventPack =
event?.content.tryGetMap<String, Object?>('pack');
final packName = eventPack?.tryGet<String>('displayname') ??
eventPack?.tryGet<String>('name') ??
(keys[i].isNotEmpty ? keys[i] : 'Default Pack');
return ListTile(
title: Text(packName!),
title: Text(packName),
onTap: () async {
VRouter.of(context).toSegments(
['rooms', room.id, 'details', 'emotes', keys[i]],

14
lib/utils/matrix_sdk_extensions/matrix_locals.dart
View file

@ -182,8 +182,12 @@ class MatrixLocals extends MatrixLocalizations {
String get noPermission => l10n.noKeyForThisMessage;
@override
String redactedAnEvent(String senderName) {
return l10n.redactedAnEvent(senderName);
String redactedAnEvent(Event redactedEvent) {
return l10n.redactedAnEvent(
redactedEvent.redactedBecause?.senderFromMemoryOrFallback
.calcLocalizedBodyFallback(this) ??
l10n.user,
);
}
@override
@ -192,8 +196,10 @@ class MatrixLocals extends MatrixLocalizations {
}
@override
String removedBy(String calcDisplayname) {
return l10n.removedBy(calcDisplayname);
String removedBy(Event redactedEvent) {
return l10n.removedBy(
redactedEvent.senderFromMemoryOrFallback.calcLocalizedBodyFallback(this),
);
}
@override