progress

lib/controllers/events_controller.dart

@@ -18,10 +18,8 @@ class EventsController extends AsyncNotifier<GetRoomEventsResponse> {
     return response;
   }
 
-  Future<GetRoomEventsResponse> prev() async {
+  Future<GetRoomEventsResponse> prev() async =>
-    final resp = await build(from: ref.read(FromController.provider(room)));
+      build(from: ref.read(FromController.provider(room)));
-    return resp;
-  }
 
   static final provider = AsyncNotifierProvider.autoDispose
       .family<EventsController, GetRoomEventsResponse, Room>(

lib/controllers/message_controller.dart

@@ -9,17 +9,15 @@ class MessageController extends AsyncNotifier<TextMessage?> {
 
   @override
   Future<TextMessage?> build() async {
-    final room = await ref.watch(
+    final room = await ref.watch(SelectedRoomController.provider.future);
-      SelectedRoomController.provider.selectAsync((a) => a),
-    );
     if (room == null) return null;
 
     final event = await room.roomData.getEventById(id);
     return (await event?.toMessage(mustBeText: true)) as TextMessage?;
   }
 
-  static final provider =
+  static final provider = AsyncNotifierProvider.family
-      AsyncNotifierProvider.family<MessageController, TextMessage?, String>(
+      .autoDispose<MessageController, TextMessage?, String>(
         MessageController.new,
       );
 }

lib/controllers/room_chat_controller.dart

@@ -3,6 +3,7 @@ import "package:flutter_chat_core/flutter_chat_core.dart";
 import "package:flutter_chat_core/flutter_chat_core.dart" as chat;
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:matrix/matrix.dart";
+import "package:nexus/controllers/avatar_controller.dart";
 import "package:nexus/controllers/events_controller.dart";
 import "package:nexus/helpers/extensions/event_to_message.dart";
 import "package:nexus/helpers/extensions/list_to_messages.dart";
@@ -13,7 +14,9 @@ class RoomChatController extends AsyncNotifier<ChatController> {
 
   @override
   Future<ChatController> build() async {
-    final response = await ref.watch(EventsController.provider(room).future);
+    final response = await ref.watch(
+      EventsController.provider(room).selectAsync((a) => a),
+    );
 
     ref.onDispose(
       room.client.onTimelineEvent.stream.listen((event) async {
@@ -75,10 +78,10 @@ class RoomChatController extends AsyncNotifier<ChatController> {
         .watch(EventsController.provider(room).notifier)
         .prev();
 
-    await controller.insertAllMessages(
+    final messages = await response.chunk.toMessages(room);
-      await response.chunk.toMessages(room),
+
-      index: 0,
+    await controller.insertAllMessages(messages, index: 0);
-    );
+    ref.notifyListeners();
   }
 
   Future<void> markRead() async {
@@ -92,30 +95,22 @@ class RoomChatController extends AsyncNotifier<ChatController> {
   Future<void> updateMessage(Message message, Message newMessage) async =>
       (await future).updateMessage(message, newMessage);
 
-  Future<void> send(Message message, {Message? replyTo}) async {
+  Future<void> send(String message, {Message? replyTo}) async =>
-    final controller = await future;
+      room.sendTextEvent(
-    controller.insertMessage(message);
+        message,
-
-    if (message is TextMessage) {
-      await room.sendTextEvent(
-        message.text,
         inReplyTo: replyTo == null ? null : await room.getEventById(replyTo.id),
       );
-    }
-    // TODO: Handle other types of message
-  }
 
   Future<chat.User> resolveUser(String id) async {
     final user = await room.client.getUserProfile(id);
     return chat.User(
       id: id,
       name: user.displayname,
-      imageSource: (await user.avatarUrl?.getThumbnailUri(
+      imageSource: user.avatarUrl == null
-        // TODO: Fix use of account avatar not room avatar
+          ? null
-        room.client,
+          : (await ref.watch(
-        width: 24,
+              AvatarController.provider(user.avatarUrl!.toString()).future,
-        height: 24,
+            )).toString(),
-      ))?.toString(),
     );
   }
 

lib/controllers/selected_space_controller.dart

@@ -7,7 +7,9 @@ import "package:nexus/models/space.dart";
 class SelectedSpaceController extends AsyncNotifier<Space> {
   @override
   Future<Space> build() async {
-    final spaces = await ref.watch(SpacesController.provider.future);
+    final spaces = await ref.watch(
+      SpacesController.provider.selectAsync((data) => data),
+    );
     final selectedSpaceId = ref.watch(
       KeyController.provider(KeyController.spaceKey),
     );

lib/controllers/spaces_controller.dart

@@ -41,7 +41,7 @@ class SpacesController extends AsyncNotifier<IList<Space>> {
         title: "Home",
         id: "home",
         children: topLevelRooms,
-        icon: Icon(Icons.home),
+        icon: Icons.home,
       ),
       Space(
         client: client,
@@ -54,7 +54,7 @@ class SpacesController extends AsyncNotifier<IList<Space>> {
                 .map((room) => room.fullRoom),
           ),
         ),
-        icon: Icon(Icons.person),
+        icon: Icons.person,
       ),
       ...(await Future.wait(
         topLevelSpaces.map(

lib/controllers/thumbnail_controller.dart

@@ -10,9 +10,7 @@ class ThumbnailController extends AsyncNotifier<String?> {
   @override
   Future<String?> build({String? from}) async {
     final client = await ref.watch(ClientController.provider.future);
-    final uri = await Uri.tryParse(data.uri)?.getDownloadUri(
+    final uri = await Uri.tryParse(data.uri)?.getDownloadUri(client);
-      client,
-    ); // TODO: Should use thumb when c10y fixes animated thumbs
 
     return uri.toString();
   }

lib/helpers/extensions/event_to_message.dart

@@ -25,7 +25,7 @@ extension EventToMessage on Event {
     final editedAt = relationshipType == RelationshipTypes.edit
         ? originServerTs
         : null;
-    final body = newContent?["body"] as String? ?? this.body;
+    final body = (newContent?["body"] ?? content["body"]).toString();
     final eventId = editedAt == null
         ? this.eventId
         : relationshipEventId ?? this.eventId;

lib/main.dart

@@ -20,17 +20,15 @@ final class Logger extends ProviderObserver {
     ProviderObserverContext context,
     Object? previousValue,
     Object? newValue,
-  ) {
+  ) => debugPrint("""
-    print('''{
+Time: ${DateTime.now().toIso8601String()}
-  "provider": "${context.provider}",
+Provider: ${context.provider}
-  "changed": ${previousValue != newValue}
+Previous Value: ${previousValue is AsyncData ? previousValue.value : previousValue}
-  "type": ${previousValue.runtimeType}
+New Value: ${newValue is AsyncData ? newValue.value : newValue}
-}''');
+}""");
-  }
 }
 
 void showError(Object error, [StackTrace? stackTrace]) {
-  if (error.toString().contains("ParentDataWidget")) return;
   if (error.toString().contains("DioException")) return;
   if (error.toString().contains("UTF-16")) return;
 

lib/models/space.dart

@@ -15,6 +15,6 @@ abstract class Space with _$Space {
     required Client client,
     Room? roomData,
     Uri? avatar,
-    Icon? icon,
+    IconData? icon,
   }) = _Space;
 }

lib/pages/login_page.dart

@@ -132,7 +132,11 @@ class LoginPage extends HookConsumerWidget {
                 (homeserver) => Card(
                   child: ListTile(
                     title: Text(homeserver.name),
-                    leading: Image.network(homeserver.iconUrl, height: 32),
+                    leading: Image.network(
+                      homeserver.iconUrl,
+                      errorBuilder: (_, _, _) => SizedBox.shrink(),
+                      height: 32,
+                    ),
                     subtitle: Text(homeserver.description),
                     onTap: isLoading.value
                         ? null

lib/widgets/chat_page/chat_box.dart

@@ -1,13 +1,14 @@
+import "dart:io";
 import "package:flutter/material.dart";
+import "package:flutter/services.dart";
 import "package:flutter_chat_core/flutter_chat_core.dart";
-import "package:flutter_chat_ui/flutter_chat_ui.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:fluttertagger/fluttertagger.dart";
+import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:matrix/matrix.dart";
-import "package:nexus/helpers/extensions/get_headers.dart";
+import "package:nexus/controllers/room_chat_controller.dart";
-import "package:nexus/widgets/form_text_input.dart";
 
-class ChatBox extends HookWidget {
+class ChatBox extends HookConsumerWidget {
   final Message? replyToMessage;
   final VoidCallback onDismiss;
   final Room room;
@@ -19,30 +20,88 @@ class ChatBox extends HookWidget {
   });
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final theme = Theme.of(context);
     final controller = useRef(FlutterTaggerController());
-    final trigger = useState<String?>(null);
+
+    Future<void> send() => ref
+        .watch(RoomChatController.provider(room).notifier)
+        .send(controller.value.text);
+
+    final node = useFocusNode(
+      onKeyEvent: (_, event) {
+        if (event is KeyDownEvent &&
+            event.logicalKey == LogicalKeyboardKey.enter &&
+            !(Platform.isAndroid || Platform.isIOS) ^
+                HardwareKeyboard.instance.isShiftPressed) {
+          send();
+          return KeyEventResult.handled;
+        }
+        return KeyEventResult.ignored;
+      },
+    );
+
     final style = TextStyle(
       color: theme.colorScheme.primary,
       fontWeight: FontWeight.bold,
     );
 
-    return Column(
+    return Positioned(
-      mainAxisAlignment: MainAxisAlignment.end,
+      bottom: 0,
+      left: 0,
+      right: 0,
+      child: Padding(
+        padding: EdgeInsetsGeometry.all(12),
+        child: ClipRRect(
+          borderRadius: BorderRadius.all(Radius.circular(12)),
+          child: Container(
+            color: theme.colorScheme.surfaceContainerHighest,
+            padding: EdgeInsets.symmetric(horizontal: 8),
+            child: // TODO: This doesn't work?
+            room.canSendDefaultMessages
+                ? Row(
+                    spacing: 8,
                     children: [
-        FlutterTagger(
+                      PopupMenuButton(
+                        itemBuilder: (context) => [],
+                        icon: Icon(Icons.add),
+                      ),
+                      Expanded(
+                        child: FlutterTagger(
                           overlay: SizedBox(),
                           controller: controller.value,
                           onSearch: (query, triggerCharacter) {
                             triggerCharacter == "#";
-            if (controller.value.tags.isEmpty)
+                            if (controller.value.tags.isEmpty) {
-              controller.value.addTag(id: "id", name: "name");
+                              controller.value.addTag(
+                                id: "id",
+                                name: "name",
+                              ); // TODO: RM
+                            }
                           },
-          triggerCharacterAndStyles: {"@": style, "#": style},
+                          triggerCharacterAndStyles: {
-          builder: (context, key) => TextFormField(controller: controller.value, key: key,autofocus: true,onFieldSubmitted: (_) {
+                            "@": style,
-            
+                            "#": style,
-          },) 
+                            ":": style,
+                          },
+                          builder: (context, key) => TextFormField(
+                            maxLines: 12,
+                            minLines: 1,
+                            decoration: InputDecoration(
+                              hintText: "Your message here...",
+                              border: InputBorder.none,
+                            ),
+                            controller: controller.value,
+                            key: key,
+                            autofocus: true,
+                            focusNode: node,
+                          ),
+                        ),
+                      ),
+                      IconButton(onPressed: send, icon: Icon(Icons.send)),
+                    ],
+                  )
+                : Text("You don't have permission to send messages here..."),
             // Composer(
             //     textEditingController: controller.value,
             //     key: key,
@@ -95,7 +154,8 @@ class ChatBox extends HookWidget {
             //     autofocus: true,
             //   ),
           ),
-      ],
+        ),
+      ),
     );
   }
 }

lib/widgets/chat_page/html/spoiler_text.dart

@@ -1,5 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
+import "package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart";
 
 class SpoilerText extends HookWidget {
   final String text;
@@ -10,7 +11,8 @@ class SpoilerText extends HookWidget {
   Widget build(BuildContext context) {
     final revealed = useState(false);
 
-    return InkWell(
+    return InlineCustomWidget(
+      child: InkWell(
         onTap: () => revealed.value = !revealed.value,
         child: AnimatedContainer(
           duration: const Duration(milliseconds: 100),
@@ -24,6 +26,7 @@ class SpoilerText extends HookWidget {
             style: TextStyle(color: revealed.value ? null : Colors.transparent),
           ),
         ),
+      ),
     );
   }
 }

lib/widgets/chat_page/room_chat.dart

@@ -133,6 +133,9 @@ class RoomChat extends HookConsumerWidget {
                 },
               ),
               body: Row(
+                children: [
+                  Expanded(
+                    child: Column(
                       children: [
                         Expanded(
                           child: ref
@@ -140,10 +143,16 @@ class RoomChat extends HookConsumerWidget {
                               .betterWhen(
                                 data: (controller) => Chat(
                                   currentUserId: room.roomData.client.userID!,
-                            theme: ChatTheme.fromThemeData(theme).copyWith(
+                                  theme: ChatTheme.fromThemeData(theme)
-                              colors: ChatColors.fromThemeData(theme).copyWith(
+                                      .copyWith(
-                                primary: theme.colorScheme.primaryContainer,
+                                        colors: ChatColors.fromThemeData(theme)
-                                onPrimary: theme.colorScheme.onPrimaryContainer,
+                                            .copyWith(
+                                              primary: theme
+                                                  .colorScheme
+                                                  .primaryContainer,
+                                              onPrimary: theme
+                                                  .colorScheme
+                                                  .onPrimaryContainer,
                                             ),
                                       ),
                                   onMessageSecondaryTap:
@@ -173,10 +182,12 @@ class RoomChat extends HookConsumerWidget {
                                           itemBuilder: itemBuilder,
                                           onEndReached: notifier.loadOlder,
                                           onStartReached: notifier.markRead,
+                                          bottomPadding: 72,
                                         ),
                                     composerBuilder: (_) => ChatBox(
                                       replyToMessage: replyToMessage.value,
-                                onDismiss: () => replyToMessage.value = null,
+                                      onDismiss: () =>
+                                          replyToMessage.value = null,
                                       room: room.roomData,
                                     ),
                                     textMessageBuilder:
@@ -204,24 +215,28 @@ class RoomChat extends HookConsumerWidget {
                                           ),
                                           topWidget: TopWidget(
                                             message,
-                                      headers: room.roomData.client.headers,
+                                            headers:
+                                                room.roomData.client.headers,
                                             groupStatus: groupStatus,
                                           ),
                                           message: message,
                                           showTime: true,
                                           index: index,
                                         ),
-                              linkPreviewBuilder: (_, message, isSentByMe) =>
+                                    linkPreviewBuilder:
-                                  LinkPreview(
+                                        (_, message, isSentByMe) => LinkPreview(
                                           text: message.text,
                                           backgroundColor: isSentByMe
                                               ? theme.colorScheme.inversePrimary
-                                        : theme.colorScheme.surfaceContainerLow,
+                                              : theme
+                                                    .colorScheme
+                                                    .surfaceContainerLow,
                                           insidePadding: EdgeInsets.symmetric(
                                             vertical: 8,
                                             horizontal: 16,
                                           ),
-                                    linkPreviewData: message.linkPreviewData,
+                                          linkPreviewData:
+                                              message.linkPreviewData,
                                           onLinkPreviewDataFetched:
                                               (linkPreviewData) =>
                                                   notifier.updateMessage(
@@ -242,7 +257,8 @@ class RoomChat extends HookConsumerWidget {
                                         }) => FlyerChatImageMessage(
                                           topWidget: TopWidget(
                                             message,
-                                      headers: room.roomData.client.headers,
+                                            headers:
+                                                room.roomData.client.headers,
                                             groupStatus: groupStatus,
                                             alwaysShow: true,
                                           ),
@@ -264,7 +280,8 @@ class RoomChat extends HookConsumerWidget {
                                           child: FlyerChatFileMessage(
                                             topWidget: TopWidget(
                                               message,
-                                        headers: room.roomData.client.headers,
+                                              headers:
+                                                  room.roomData.client.headers,
                                               groupStatus: groupStatus,
                                             ),
                                             message: message,
@@ -291,9 +308,8 @@ class RoomChat extends HookConsumerWidget {
                                           MessageGroupStatus? groupStatus,
                                         }) => Text(
                                           "${message.authorId} sent ${message.metadata?["eventType"]}",
-                                    style: theme.textTheme.labelSmall?.copyWith(
+                                          style: theme.textTheme.labelSmall
-                                      color: Colors.grey,
+                                              ?.copyWith(color: Colors.grey),
-                                    ),
                                         ),
                                   ),
                                   resolveUser: notifier.resolveUser,
@@ -301,11 +317,15 @@ class RoomChat extends HookConsumerWidget {
                                 ),
                               ),
                         ),
+                      ],
+                    ),
+                  ),
 
                   if (memberListOpened.value == true && showMembersByDefault)
                     MemberList(room.roomData),
                 ],
               ),
+
               endDrawer: showMembersByDefault
                   ? null
                   : MemberList(room.roomData),

lib/widgets/chat_page/sidebar.dart

@@ -60,7 +60,9 @@ class Sidebar extends HookConsumerWidget {
                           (space) => NavigationRailDestination(
                             icon: AvatarOrHash(
                               space.avatar,
-                              fallback: space.icon,
+                              fallback: space.icon == null
+                                  ? null
+                                  : Icon(space.icon),
                               space.title,
                               headers: space.client.headers,
                               hasBadge:
@@ -126,7 +128,9 @@ class Sidebar extends HookConsumerWidget {
                       appBar: AppBar(
                         leading: AvatarOrHash(
                           space.avatar,
-                          fallback: space.icon,
+                          fallback: space.icon == null
+                              ? null
+                              : Icon(space.icon),
                           space.title,
                           headers: space.client.headers,
                         ),

lib/widgets/chat_page/top_widget.dart

@@ -3,8 +3,10 @@ import "package:flutter/material.dart";
 import "package:flutter_chat_core/flutter_chat_core.dart";
 import "package:flutter_chat_ui/flutter_chat_ui.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/avatar_controller.dart";
 import "package:nexus/controllers/message_controller.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
+import "package:nexus/widgets/avatar_or_hash.dart";
 import "package:nexus/widgets/chat_page/quoted.dart";
 
 class TopWidget extends ConsumerWidget {
@@ -62,10 +64,17 @@ class TopWidget extends ConsumerWidget {
                       mainAxisSize: MainAxisSize.min,
                       spacing: 8,
                       children: [
-                        Avatar(
+                        ref
-                          userId: replyMessage.authorId,
+                            .watch(
+                              AvatarController.provider(replyMessage.authorId),
+                            )
+                            .betterWhen(
+                              data: (avatar) => AvatarOrHash(
+                                avatar,
+                                replyMessage.metadata?["displayName"] ??
+                                    replyMessage.authorId,
                                 headers: headers,
-                          size: 16,
+                              ),
                             ),
                         Flexible(
                           child: Text(