refactor: /simplify — 22 fixes from 3-agent code review
Critical: - Fix MXC URI resolution: all avatars/images now resolve mxc:// to HTTP - Sync persistence: only write changed rooms, batch message upserts - lastActivityAt uses room.lastEvent.originServerTs, not creation time High: - Shared MatrixAvatar widget replaces 6 duplicate implementations - CallScreen decodes roomId before LiveKit JWT fetch - Decline button actually dismisses incoming call overlay - EventTypes constants replace raw string literals - LiveKitService uses lazy auth reads, onDispose disconnects Medium: - CallController is keepAlive with timer/room cleanup - authRepository is keepAlive (used from keepAlive notifier) - StreamController not closed in stopListening (crash fix) - Index on messages.roomId for query performance - 400ms debounce on user search - Static DateFormat in MessageBubble - Hardcoded strings replaced with AppConfig refs - Duplicate isDirectMessage field removed from RoomModel - E2EE profile claim corrected to Phase 3 Shared utilities: - lib/shared/widgets/matrix_avatar.dart - lib/shared/utils/mxc_url.dart - lib/shared/utils/room_preview.dart - lib/shared/utils/matrix_id.dart rawJson column removed (unused, caused main-thread jsonEncode) Schema migrated to v2 with roomId index. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
// Version: 1.0.1 | Created: 2026-04-01
|
||||
// Version: 1.2.0 | Created: 2026-04-01 | Updated: 2026-04-02
|
||||
// Rooms repository. Reads room list from the Matrix SDK client.
|
||||
|
||||
import 'package:matrix/matrix.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
||||
import '../../../core/network/matrix_client.dart';
|
||||
import '../../../shared/utils/mxc_url.dart';
|
||||
import '../../../shared/utils/room_preview.dart';
|
||||
import '../domain/room_model.dart';
|
||||
|
||||
part 'rooms_repository.g.dart';
|
||||
@@ -49,24 +51,11 @@ class RoomsRepository {
|
||||
return RoomModel(
|
||||
id: room.id,
|
||||
displayName: room.getLocalizedDisplayname(),
|
||||
avatarUrl: room.avatar?.toString(),
|
||||
lastMessagePreview: _lastMessagePreview(room),
|
||||
lastActivityAt: room.timeCreated,
|
||||
avatarUrl: resolveMxcUrl(_client, room.avatar),
|
||||
lastMessagePreview: lastMessagePreview(room),
|
||||
lastActivityAt: room.lastEvent?.originServerTs ?? room.timeCreated,
|
||||
unreadCount: room.notificationCount,
|
||||
isDirectMessage: room.isDirectChat,
|
||||
isDirect: room.isDirectChat,
|
||||
);
|
||||
}
|
||||
|
||||
String? _lastMessagePreview(Room room) {
|
||||
final lastEvent = room.lastEvent;
|
||||
if (lastEvent == null) return null;
|
||||
|
||||
return switch (lastEvent.type) {
|
||||
'm.room.message' => lastEvent.body,
|
||||
'm.room.encrypted' => 'Encrypted message',
|
||||
'm.sticker' => 'Sticker',
|
||||
_ => null,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Version: 1.0.0 | Created: 2026-04-01
|
||||
// Version: 1.1.0 | Created: 2026-04-01 | Updated: 2026-04-02
|
||||
// Immutable room model. Wraps the data the rooms screen needs to display.
|
||||
// Derived from the Matrix SDK's Room object in the repository layer.
|
||||
|
||||
@@ -15,7 +15,6 @@ abstract class RoomModel with _$RoomModel {
|
||||
String? lastMessagePreview,
|
||||
DateTime? lastActivityAt,
|
||||
@Default(0) int unreadCount,
|
||||
@Default(false) bool isDirectMessage,
|
||||
@Default(false) bool isDirect,
|
||||
}) = _RoomModel;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
// Version: 1.0.0 | Created: 2026-04-01
|
||||
// Version: 1.1.0 | Created: 2026-04-01 | Updated: 2026-04-02
|
||||
// Individual room list tile. Kept under 100 lines.
|
||||
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:timeago/timeago.dart' as timeago;
|
||||
|
||||
import '../../../shared/widgets/matrix_avatar.dart';
|
||||
import '../domain/room_model.dart';
|
||||
|
||||
class RoomTile extends StatelessWidget {
|
||||
@@ -19,7 +19,11 @@ class RoomTile extends StatelessWidget {
|
||||
final hasUnread = room.unreadCount > 0;
|
||||
|
||||
return ListTile(
|
||||
leading: _RoomAvatar(room: room),
|
||||
leading: MatrixAvatar(
|
||||
name: room.displayName,
|
||||
avatarUrl: room.avatarUrl,
|
||||
radius: 24,
|
||||
),
|
||||
title: Text(
|
||||
room.displayName,
|
||||
style: theme.textTheme.bodyLarge?.copyWith(
|
||||
@@ -62,40 +66,6 @@ class RoomTile extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _RoomAvatar extends StatelessWidget {
|
||||
const _RoomAvatar({required this.room});
|
||||
|
||||
final RoomModel room;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final initials = room.displayName.isNotEmpty
|
||||
? room.displayName[0].toUpperCase()
|
||||
: '?';
|
||||
|
||||
if (room.avatarUrl != null) {
|
||||
return CircleAvatar(
|
||||
radius: 24,
|
||||
backgroundImage: CachedNetworkImageProvider(room.avatarUrl!),
|
||||
backgroundColor: theme.colorScheme.surfaceContainerHighest,
|
||||
);
|
||||
}
|
||||
|
||||
return CircleAvatar(
|
||||
radius: 24,
|
||||
backgroundColor: theme.colorScheme.primary.withAlpha(51),
|
||||
child: Text(
|
||||
initials,
|
||||
style: TextStyle(
|
||||
color: theme.colorScheme.primary,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _UnreadBadge extends StatelessWidget {
|
||||
const _UnreadBadge({required this.count});
|
||||
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
// Version: 1.1.0 | Created: 2026-04-01
|
||||
// Version: 1.2.0 | Created: 2026-04-01 | Updated: 2026-04-02
|
||||
// User search dialog — search Matrix user directory and start a DM.
|
||||
// Triggered from the rooms screen "New message" button.
|
||||
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
@@ -9,6 +11,8 @@ import 'package:matrix/matrix_api_lite.dart' show Profile;
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
||||
import '../../../core/network/matrix_client.dart';
|
||||
import '../../../shared/utils/mxc_url.dart';
|
||||
import '../../../shared/widgets/matrix_avatar.dart';
|
||||
|
||||
part 'user_search_dialog.g.dart';
|
||||
|
||||
@@ -47,13 +51,22 @@ class _UserSearchDialogState extends ConsumerState<_UserSearchDialog> {
|
||||
final _controller = TextEditingController();
|
||||
String _searchTerm = '';
|
||||
bool _isStartingDm = false;
|
||||
Timer? _debounce;
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_debounce?.cancel();
|
||||
_controller.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _onSearchChanged(String val) {
|
||||
_debounce?.cancel();
|
||||
_debounce = Timer(const Duration(milliseconds: 400), () {
|
||||
if (mounted) setState(() => _searchTerm = val);
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _startDm(String userId) async {
|
||||
if (_isStartingDm) return;
|
||||
setState(() => _isStartingDm = true);
|
||||
@@ -112,10 +125,10 @@ class _UserSearchDialogState extends ConsumerState<_UserSearchDialog> {
|
||||
controller: _controller,
|
||||
autofocus: true,
|
||||
decoration: const InputDecoration(
|
||||
hintText: 'Search by name or user ID…',
|
||||
hintText: 'Search by name or user ID...',
|
||||
prefixIcon: Icon(Icons.search),
|
||||
),
|
||||
onChanged: (val) => setState(() => _searchTerm = val),
|
||||
onChanged: _onSearchChanged,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -160,6 +173,7 @@ class _SearchResults extends ConsumerWidget {
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final resultsAsync = ref.watch(searchUsersProvider(term));
|
||||
final theme = Theme.of(context);
|
||||
final client = ref.watch(matrixClientProvider);
|
||||
|
||||
return resultsAsync.when(
|
||||
loading: () => const Center(child: CircularProgressIndicator()),
|
||||
@@ -186,24 +200,13 @@ class _SearchResults extends ConsumerWidget {
|
||||
itemBuilder: (context, index) {
|
||||
final profile = profiles[index];
|
||||
final displayName = profile.displayName ?? profile.userId;
|
||||
final initials = displayName.isNotEmpty
|
||||
? displayName[0].toUpperCase()
|
||||
: '?';
|
||||
|
||||
return ListTile(
|
||||
leading: profile.avatarUrl != null
|
||||
? CircleAvatar(
|
||||
backgroundImage: NetworkImage(
|
||||
profile.avatarUrl.toString(),
|
||||
),
|
||||
)
|
||||
: CircleAvatar(
|
||||
backgroundColor: theme.colorScheme.primary.withAlpha(51),
|
||||
child: Text(
|
||||
initials,
|
||||
style: TextStyle(color: theme.colorScheme.primary),
|
||||
),
|
||||
),
|
||||
leading: MatrixAvatar(
|
||||
name: displayName,
|
||||
avatarUrl: resolveMxcUrl(client, profile.avatarUrl),
|
||||
radius: 20,
|
||||
),
|
||||
title: Text(displayName),
|
||||
subtitle: Text(
|
||||
profile.userId,
|
||||
|
||||
Reference in New Issue
Block a user