🚀 Launch 2.2.2+53

.roadsignrc

@@ -1,12 +1,12 @@
 {
   "sync": {
-    "region": "solian-next",
+    "region": "solian",
     "configPath": "roadsign.toml"
   },
   "deployments": [
     {
-      "region": "solian-next",
-      "site": "solian-next-web",
+      "region": "solian",
+      "site": "solian-web",
       "path": "build/web"
     }
   ]

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/router.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:surface/screens/abuse_report.dart';
 import 'package:surface/screens/account.dart';
-import 'package:surface/screens/account/pfp.dart';
+import 'package:surface/screens/account/profile_page.dart';
 import 'package:surface/screens/account/profile_edit.dart';
 import 'package:surface/screens/account/publishers/publisher_edit.dart';
 import 'package:surface/screens/account/publishers/publisher_new.dart';

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/screens/post/post_editor.dart

@@ -303,19 +303,22 @@ class _PostEditorScreenState extends State<PostEditorScreen> {
                           ],
                         ),
                       // Content Input Area
-                      TextField(
-                        controller: _writeController.contentController,
-                        maxLines: null,
-                        decoration: InputDecoration(
-                          hintText: 'fieldPostContent'.tr(),
-                          hintStyle: TextStyle(fontSize: 14),
-                          isCollapsed: true,
-                          contentPadding: const EdgeInsets.symmetric(
-                            horizontal: 16,
+                      Container(
+                        constraints: const BoxConstraints(maxWidth: 640),
+                        child: TextField(
+                          controller: _writeController.contentController,
+                          maxLines: null,
+                          decoration: InputDecoration(
+                            hintText: 'fieldPostContent'.tr(),
+                            hintStyle: TextStyle(fontSize: 14),
+                            isCollapsed: true,
+                            contentPadding: const EdgeInsets.symmetric(
+                              horizontal: 16,
+                            ),
+                            border: InputBorder.none,
                           ),
-                          border: InputBorder.none,
+                          onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
                         ),
-                        onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
                       ),
                     ]
                         .expandIndexed(
@@ -366,6 +369,15 @@ class _PostEditorScreenState extends State<PostEditorScreen> {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
+                    LoadingIndicator(isActive: _isLoading),
+                    if (_writeController.isBusy && _writeController.progress != null)
+                      TweenAnimationBuilder<double>(
+                        tween: Tween(begin: 0, end: _writeController.progress),
+                        duration: Duration(milliseconds: 300),
+                        builder: (context, value, _) => LinearProgressIndicator(value: value, minHeight: 2),
+                      )
+                    else if (_writeController.isBusy)
+                      const LinearProgressIndicator(value: null, minHeight: 2),
                     Container(
                       child: _writeController.temporaryRestored
                           ? Container(
@@ -396,15 +408,6 @@ class _PostEditorScreenState extends State<PostEditorScreen> {
                     )
                         .height(_writeController.temporaryRestored ? 32 : 0, animate: true)
                         .animate(const Duration(milliseconds: 300), Curves.fastLinearToSlowEaseIn),
-                    LoadingIndicator(isActive: _isLoading),
-                    if (_writeController.isBusy && _writeController.progress != null)
-                      TweenAnimationBuilder<double>(
-                        tween: Tween(begin: 0, end: _writeController.progress),
-                        duration: Duration(milliseconds: 300),
-                        builder: (context, value, _) => LinearProgressIndicator(value: value, minHeight: 2),
-                      )
-                    else if (_writeController.isBusy)
-                      const LinearProgressIndicator(value: null, minHeight: 2),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [

lib/widgets/account/account_popover.dart

@@ -0,0 +1,165 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import 'package:relative_time/relative_time.dart';
+import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/experience.dart';
+import 'package:surface/providers/sn_network.dart';
+import 'package:surface/screens/account/profile_page.dart';
+import 'package:surface/types/account.dart';
+import 'package:surface/types/post.dart';
+import 'package:surface/widgets/account/account_image.dart';
+import 'package:surface/widgets/universal_image.dart';
+
+class AccountPopoverCard extends StatelessWidget {
+  final SnAccount data;
+
+  const AccountPopoverCard({super.key, required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    final sn = context.read<SnNetworkProvider>();
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        if (data.banner.isNotEmpty)
+          Container(
+            color: Theme.of(context).colorScheme.surfaceContainer,
+            child: AspectRatio(
+              aspectRatio: 16 / 7,
+              child: AutoResizeUniversalImage(
+                sn.getAttachmentUrl(data.banner),
+                fit: BoxFit.cover,
+              ),
+            ),
+          ),
+        // Top padding
+        Gap(16),
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            AccountImage(
+              content: data.avatar,
+              radius: 20,
+            ),
+            Gap(16),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(data.nick).bold(),
+                  Text('@${data.name}').fontSize(13).opacity(0.75),
+                ],
+              ),
+            ),
+            IconButton(
+              onPressed: () {
+                Navigator.pop(context);
+                GoRouter.of(context).pushNamed(
+                  'accountProfilePage',
+                  pathParameters: {'name': data.name},
+                );
+              },
+              icon: const Icon(Symbols.chevron_right),
+              padding: EdgeInsets.zero,
+              visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
+            ),
+            const Gap(8)
+          ],
+        ).padding(horizontal: 16),
+        const Gap(16),
+        Wrap(
+          children: data.badges
+              .map(
+                (ele) => Tooltip(
+              richMessage: TextSpan(
+                children: [
+                  TextSpan(text: kBadgesMeta[ele.type]?.$1.tr() ?? 'unknown'.tr()),
+                  if (ele.metadata['title'] != null)
+                    TextSpan(
+                      text: '\n${ele.metadata['title']}',
+                      style: const TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                  TextSpan(text: '\n'),
+                  TextSpan(
+                    text: DateFormat.yMEd().format(ele.createdAt),
+                  ),
+                ],
+              ),
+              child: Icon(
+                kBadgesMeta[ele.type]?.$2 ?? Symbols.question_mark,
+                color: kBadgesMeta[ele.type]?.$3,
+                fill: 1,
+              ),
+            ),
+          )
+              .toList(),
+        ).padding(horizontal: 24),
+        const Gap(8),
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            const Icon(Symbols.star),
+            const Gap(8),
+            Text('Lv${getLevelFromExp(data.profile?.experience ?? 0)}'),
+            const Gap(8),
+            Text(calcLevelUpProgressLevel(data.profile?.experience ?? 0)).fontSize(11).opacity(0.5),
+            const Gap(8),
+            Container(
+              width: double.infinity,
+              constraints: const BoxConstraints(maxWidth: 160),
+              child: LinearProgressIndicator(
+                value: calcLevelUpProgress(data.profile?.experience ?? 0),
+                borderRadius: BorderRadius.circular(8),
+                backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
+              ).alignment(Alignment.centerLeft),
+            ),
+          ],
+        ).padding(horizontal: 24),
+        FutureBuilder(
+          future: sn.client.get('/cgi/id/users/${data.name}/status'),
+          builder: (context, snapshot) {
+            final SnAccountStatusInfo? status =
+                snapshot.hasData ? SnAccountStatusInfo.fromJson(snapshot.data!.data) : null;
+            return Row(
+                children: [
+                  Icon(
+                    Symbols.circle,
+                    fill: 1,
+                    size: 16,
+                    color: (status?.isOnline ?? false) ? Colors.green : Colors.grey,
+                  ).padding(all: 4),
+                  const Gap(8),
+                  Text(
+                    status != null
+                        ? status.isOnline
+                            ? 'accountStatusOnline'.tr()
+                            : 'accountStatusOffline'.tr()
+                        : 'loading'.tr(),
+                  ),
+                  if (status != null && !status.isOnline && status.lastSeenAt != null)
+                    Text(
+                      'accountStatusLastSeen'.tr(args: [
+                        status.lastSeenAt != null
+                            ? RelativeTime(context).format(
+                                status.lastSeenAt!.toLocal(),
+                              )
+                            : 'unknown',
+                      ]),
+                    ).padding(left: 6).opacity(0.75),
+                ],
+              ).padding(horizontal: 24);
+          },
+        ),
+        // Bottom padding
+        const Gap(16),
+      ],
+    );
+  }
+}

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

@@ -1,14 +1,18 @@
+import 'dart:math' as math;
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_context_menu/flutter_context_menu.dart';
 import 'package:gap/gap.dart';
 import 'package:material_symbols_icons/symbols.dart';
+import 'package:popover/popover.dart';
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/user_directory.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/chat.dart';
 import 'package:surface/widgets/account/account_image.dart';
+import 'package:surface/widgets/account/account_popover.dart';
 import 'package:surface/widgets/attachment/attachment_list.dart';
 import 'package:surface/widgets/context_menu.dart';
 import 'package:surface/widgets/link_preview.dart';
@@ -95,8 +99,28 @@ class ChatMessage extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   if (!isMerged && !isCompact)
-                    AccountImage(
-                      content: user?.avatar,
+                    GestureDetector(
+                      child: AccountImage(
+                        content: user?.avatar,
+                      ),
+                      onTap: () {
+                        if (user == null) return;
+                        showPopover(
+                          backgroundColor: Theme.of(context).colorScheme.surface,
+                          context: context,
+                          transition: PopoverTransition.other,
+                          bodyBuilder: (context) => SizedBox(
+                            width: math.min(400, MediaQuery.of(context).size.width - 10),
+                            child: AccountPopoverCard(
+                              data: user,
+                            ),
+                          ),
+                          direction: PopoverDirection.bottom,
+                          arrowHeight: 5,
+                          arrowWidth: 15,
+                          arrowDxOffset: -190,
+                        );
+                      },
                     )
                   else if (isMerged)
                     const Gap(40),
@@ -128,6 +152,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 +275,12 @@ class _ChatMessageText extends StatelessWidget {
                 buttonItems: items,
               );
             },
-            child: MarkdownTextContent(
-              content: data.body['text'],
-              isAutoWarp: true,
+            child: Container(
+              constraints: const BoxConstraints(maxWidth: 480),
+              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

@@ -1,9 +1,13 @@
+import 'dart:io';
+
+import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
-import 'package:responsive_framework/responsive_framework.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/config.dart';
 import 'package:surface/providers/navigation.dart';
 import 'package:surface/widgets/version_label.dart';
 
@@ -28,8 +32,9 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
   @override
   Widget build(BuildContext context) {
     final nav = context.watch<NavigationProvider>();
+    final cfg = context.watch<ConfigProvider>();
 
-    final backgroundColor = ResponsiveBreakpoints.of(context).largerThan(TABLET) ? Colors.transparent : null;
+    final backgroundColor = cfg.drawerIsExpanded ? Colors.transparent : null;
 
     return ListenableBuilder(
       listenable: nav,
@@ -44,6 +49,18 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
           backgroundColor: backgroundColor,
           selectedIndex: nav.currentIndex,
           children: [
+            if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS) && !cfg.drawerIsExpanded)
+              Container(
+                decoration: BoxDecoration(
+                  border: Border(
+                    bottom: BorderSide(
+                      color: Theme.of(context).dividerColor,
+                      width: 1 / MediaQuery.of(context).devicePixelRatio,
+                    ),
+                  ),
+                ),
+                child: WindowTitleBarBox(),
+              ),
             Column(
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,

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.lock

@@ -618,10 +618,10 @@ packages:
     dependency: "direct main"
     description:
       name: fl_chart
-      sha256: c724234b05e378383e958f3e82ca84a3e1e3c06a0898462044dd8a24b1ee9864
+      sha256: "10ddaf334fe84d59333a12d153043e366f243e0bdfff2df0313e1e249f5bf926"
       url: "https://pub.dev"
     source: hosted
-    version: "0.70.0"
+    version: "0.70.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -822,10 +822,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539"
+      sha256: "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.6.2"
+    version: "14.6.3"
   google_fonts:
     dependency: "direct main"
     description:
@@ -2169,4 +2169,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.24.0"

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+50
+version: 2.2.2+53
 
 environment:
   sdk: ^3.5.4

roadsign.toml

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