🐛 Fix chat messages

.roadsignrc

@@ -1,6 +1,6 @@
 {
   "sync": {
-    "region": "solian-next",
+    "region": "solian",
     "configPath": "roadsign.toml"
   },
   "deployments": [

lib/controllers/chat_message_controller.dart

@@ -74,6 +74,7 @@ class ChatMessageController extends ChangeNotifier {
     _wsSubscription = _ws.stream.stream.listen((event) {
       switch (event.method) {
         case 'events.new':
+          if (event.payload?['channel_id'] != channel?.id) break;
           final payload = SnChatMessage.fromJson(event.payload!);
           _addMessage(payload);
           break;

lib/screens/chat.dart

@@ -236,7 +236,7 @@ class _ChatScreenState extends State<ChatScreen> {
                             'alias': channel.alias,
                           },
                         ).then((value) {
-                          if (value == true) _refreshChannels();
+                          if (mounted) _refreshChannels();
                         });
                       },
                     );

lib/widgets/attachment/attachment_list.dart

@@ -106,6 +106,44 @@ class _AttachmentListState extends State<AttachmentList> {
         }
 
         if (widget.gridded) {
+          final fullOfImage =
+              widget.data.where((ele) => ele?.mediaType == SnMediaType.image).length == widget.data.length;
+          if(!fullOfImage) {
+            return Container(
+              margin: widget.padding ?? EdgeInsets.zero,
+              decoration: BoxDecoration(
+                color: backgroundColor,
+                border: Border(
+                  top: borderSide,
+                  bottom: borderSide,
+                ),
+                borderRadius: AttachmentList.kDefaultRadius,
+              ),
+              child: ClipRRect(
+                borderRadius: AttachmentList.kDefaultRadius,
+                child: Column(
+                  spacing: 4,
+                  children: widget.data
+                      .mapIndexed(
+                        (idx, ele) => GestureDetector(
+                          child: AspectRatio(
+                            aspectRatio: ele?.data['ratio']?.toDouble() ?? 1,
+                            child: Container(
+                              constraints: constraints,
+                              child: AttachmentItem(
+                                data: ele,
+                                heroTag: heroTags[idx],
+                                fit: BoxFit.cover,
+                              ),
+                            ),
+                          ),
+                        ),
+                      )
+                      .toList(),
+                ),
+              ),
+            );
+          }
           return Container(
             margin: widget.padding ?? EdgeInsets.zero,
             decoration: BoxDecoration(

lib/widgets/chat/chat_message.dart

@@ -128,6 +128,9 @@ class ChatMessage extends StatelessWidget {
                           if (isCompact) const Gap(8),
                           if (data.preload?.quoteEvent != null)
                             StyledWidget(Container(
+                              constraints: BoxConstraints(
+                                maxWidth: 480,
+                              ),
                               decoration: BoxDecoration(
                                 borderRadius: const BorderRadius.all(Radius.circular(8)),
                                 border: Border.all(
@@ -248,9 +251,12 @@ class _ChatMessageText extends StatelessWidget {
                 buttonItems: items,
               );
             },
-            child: MarkdownTextContent(
+            child: Container(
-              content: data.body['text'],
+              constraints: const BoxConstraints(maxWidth: 480),
-              isAutoWarp: true,
+              child: MarkdownTextContent(
+                content: data.body['text'],
+                isAutoWarp: true,
+              ),
             ),
           ),
           if (data.updatedAt != data.createdAt)

lib/widgets/chat/chat_message_input.dart

@@ -48,6 +48,8 @@ class ChatMessageInputState extends State<ChatMessageInput> {
 
   void setEdit(SnChatMessage? value) {
     _contentController.text = value?.body['text'] ?? '';
+    _attachments.clear();
+    _attachments.addAll(value?.preload?.attachments?.map((e) => PostWriteMedia(e)) ?? []);
     setState(() => _editingMessage = value);
   }
 
@@ -101,7 +103,9 @@ class ChatMessageInputState extends State<ChatMessageInput> {
           },
         );
 
-        _attachments[i] = PostWriteMedia(item);
+        setState(() {
+          _attachments[i] = PostWriteMedia(item);
+        });
       }
     } catch (err) {
       if (!mounted) return;
@@ -113,7 +117,7 @@ class ChatMessageInputState extends State<ChatMessageInput> {
     // Send the message
     // NOTICE This future should not be awaited, so that the message can be sent in the background and the user can continue to type
     widget.controller.sendMessage(
-      'messages.new',
+      _editingMessage != null ? 'messages.edit' : 'messages.new',
       _contentController.text,
       attachments: _attachments.where((e) => e.attachment != null).map((e) => e.attachment!.rid).toList(),
       relatedId: _editingMessage?.id,
@@ -197,6 +201,7 @@ class ChatMessageInputState extends State<ChatMessageInput> {
                       InkWell(
                         child: Text('cancel'.tr()),
                         onTap: () {
+                          _attachments.clear();
                           setState(() => _replyingMessage = null);
                         },
                       ),
@@ -236,6 +241,7 @@ class ChatMessageInputState extends State<ChatMessageInput> {
                       InkWell(
                         child: Text('cancel'.tr()),
                         onTap: () {
+                          _attachments.clear();
                           _contentController.clear();
                           setState(() => _editingMessage = null);
                         },

lib/widgets/navigation/app_drawer_navigation.dart

@@ -49,7 +49,7 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
           backgroundColor: backgroundColor,
           selectedIndex: nav.currentIndex,
           children: [
-            if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS))
+            if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS) && !cfg.drawerIsExpanded)
               Container(
                 decoration: BoxDecoration(
                   border: Border(

lib/widgets/post/post_item.dart

@@ -880,6 +880,7 @@ class _PostContentBody extends StatelessWidget {
   Widget build(BuildContext context) {
     if (data.body['content'] == null) return const SizedBox.shrink();
     final content = MarkdownTextContent(
+      isAutoWarp: data.type == 'story',
       isEnlargeSticker: true,
       textScaler: isEnlarge ? TextScaler.linear(1.1) : null,
       content: data.body['content'],

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.2.2+51
+version: 2.2.2+52
 
 environment:
   sdk: ^3.5.4

roadsign.toml

@@ -1,9 +1,9 @@
-id = "solian-next"
+id = "solian"
 
 [[locations]]
-id = "solian-next"
+id = "solian"
-host = ["sn-next.solsynth.dev"]
+host = ["sn.solsynth.dev"]
 path = ["/"]
 [[locations.destinations]]
-id = "solian-next-web"
+id = "solian-web"
-uri = "files:///workdir/solian-next?fallback=index.html&index=index.html"
+uri = "files:///workdir/solian?fallback=index.html&index=index.html"