🐛 Fix loading other type of attachments missing authorization header

✨ Show strike on user profile page

CODE_OF_CONDUCT.md

@@ -0,0 +1,34 @@
+# Code of Conduct
+
+Welcome to the Solar Network / HyperNet project!
+
+We're welcome for any contribution, from bug reports to feature requests to code contributions.
+
+To get started, start from fork the repository.
+
+## Project Structure
+
+The current repository you're visiting is the front-end project for the Solar Network project. It's built by Flutter and also manages all feature requests and issues reports in this repository.
+
+The backend of the Solar Network is written in Go and is a microservices app. The code is stored separately in different repositories. They're linked in the README.MD, you can have a look and try to contribute if you want.
+
+## Commit Messages
+
+We're using the gitmoji to clarify the reason and changes of the commit. To learn more about gitmoji, visit https://gitmoji.dev
+
+## Translations & Localization
+
+We're not accepting translation and localization improvements, or fixes on the GitHub or Solsynth Git Repository. If you want to contribute to those, please head to our Weblate: https://i18n.solsynth.dev. You will able to sign up / in via your Solar Network Account (Solarpass)
+
+## New Features
+
+To contribute new features, please create an issue or mention the feature you want in our official development chat channel. You should discuss the feature with us and the community first. You shouldn't just create a Pull Request for the feature you want, it will not be merged.
+
+## Bug Reports / Ask for help
+
+Read the error message, check for the update (including pre-releases), and wiki before creating an issue. At the same time, be respectful and don't argue with our developers and contributors in the development chat or GitHub issue. Otherwise your issue may got deleted and your Solar Network Account may got a strike. 
+
+-----------
+
+We appreciate every single commit you contributed. Let's work together and create a better Solar Network!
+

README.md

@@ -2,7 +2,7 @@
 
 ![](https://solsynth.dev/_next/static/media/alpha.e779a584.webp)
 
-Hello there! Welcome to the main repository of the HyperNet (also known as the Solar Network). The code here is mainly about the frontend app (also known as Solian). But you can still post issues here to get help and request new features!
+Hello there! Welcome to the main repository of the HyperNet (also known as the Solar Network). The code here is mainly about the front-end app (also known as Solian). But you can still post issues here to get help and request new features!
 
 ## Sub Projects
 
@@ -14,14 +14,55 @@ HyperNet, the Solar Network is a microservices project in which the backends are
 - The Messaging Service: [Messaging](https://github.com/Solsynth/HyperNet.Messaging)
 - The Wallet Service: [Wallet](https://github.com/Solsynth/HyperNet.Wallet)
 - The Crawler: [Reader](https://github.com/Solsynth/HyperNet.Reader)
-- Some others may not be listed, you can search in the organization with `HyperNet.` the prefix of all HyperNet projects.
+- The Attachments Service: [Paperclip](https://github.com/Solsynth/HyperNet.Paperclip)
+- Some others may not be listed, you can search in the organization with `HyperNet.` It's the prefix of all HyperNet projects.
 
 ## Tech Stack
 
-For those people who want to know the tech stack of this project, the frontend was built by Flutter, which provides the cross-platform ability.
+For those people who want to know the tech stack of this project, the front-end was built by Flutter, which provides cross-platform ability.
 
 The backend was built in Go and PostgreSQL with our very own microservice framework included in the nexus.
 
------
+If you want to contribute to the project, learn more about the [Code of Conduct](./CODE_OF_CONDUCT.md).
+
+## Getting Started
+
+The content below will lead you to the world of Solar Network.
+
+### For Normal Users
+
+1. Go to the Github Releases page, and download the latest release / pre-release according to your platform.
+   - **What's the difference between stable and pre-release?** The pre-release is untested by the other users and includes the new cutting-edge features, usually the pre-release is the feature drop. At the same time, due to we're not doing the API versioning, some breaking changes may break the stable release, so use the pre-release one instead.
+2. Create an account on the Solar Network
+3. Go to your email inbox to confirm your registration
+4. Start exploring!
+
+### For Developers
+
+To make the Solar Network App run in debug mode on your machine, you need to install the flutter development environment, for more environments, head to https://flutter.dev.
+
+For the Linux platform, you need to install those extra development libs:
+
+```bash
+sudo apt-get update -y
+sudo apt-get install -y ninja-build libgtk-3-dev
+sudo apt-get install -y libmpv-dev mpv
+sudo apt-get install -y libayatana-appindicator3-dev
+sudo apt-get install -y keybinder-3.0
+sudo apt-get install -y libnotify-dev
+sudo apt-get install -y libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+sudo apt-get install -y gstreamer-1.0
+```
+
+Then, use the flutter run for the app running in debug mode.
+
+```bash
+flutter pub get
+```
+
+If you want to build the release version, use the flutter build command. Learn more from the flutter docs.
+
+```bash
+flutter build <platform>
+```
 
-The readme will be updated in the future, to be determined. For now, you can check out the link of this repository to learn more on our official website.

api/Passport/Give Punishment.bru

@@ -0,0 +1,20 @@
+meta {
+  name: Give Punishment
+  type: http
+  seq: 4
+}
+
+post {
+  url: {{endpoint}}/cgi/id/punishments
+  body: json
+  auth: inherit
+}
+
+body:json {
+  {
+    "reason": "吹哨管理条例 / 滥用吹哨功能，累积三次复核无效吹哨。处以禁用吹哨功能 30 天。",
+    "type": 1,
+    "perm_nodes": {"FlagPost":false},
+    "account_id": 5
+  }
+}

ios/Podfile.lock

@@ -46,58 +46,58 @@ PODS:
     - Flutter
   - file_saver (0.0.1):
     - Flutter
-  - Firebase/Analytics (11.8.0):
+  - Firebase/Analytics (11.10.0):
     - Firebase/Core
-  - Firebase/Core (11.8.0):
+  - Firebase/Core (11.10.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 11.8.0)
-  - Firebase/CoreOnly (11.8.0):
-    - FirebaseCore (~> 11.8.0)
-  - Firebase/Messaging (11.8.0):
+    - FirebaseAnalytics (~> 11.10.0)
+  - Firebase/CoreOnly (11.10.0):
+    - FirebaseCore (~> 11.10.0)
+  - Firebase/Messaging (11.10.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 11.8.0)
-  - firebase_analytics (11.4.4):
-    - Firebase/Analytics (= 11.8.0)
+    - FirebaseMessaging (~> 11.10.0)
+  - firebase_analytics (11.4.5):
+    - Firebase/Analytics (= 11.10.0)
     - firebase_core
     - Flutter
-  - firebase_core (3.12.1):
-    - Firebase/CoreOnly (= 11.8.0)
+  - firebase_core (3.13.0):
+    - Firebase/CoreOnly (= 11.10.0)
     - Flutter
-  - firebase_messaging (15.2.4):
-    - Firebase/Messaging (= 11.8.0)
+  - firebase_messaging (15.2.5):
+    - Firebase/Messaging (= 11.10.0)
     - firebase_core
     - Flutter
-  - FirebaseAnalytics (11.8.0):
-    - FirebaseAnalytics/AdIdSupport (= 11.8.0)
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseAnalytics (11.10.0):
+    - FirebaseAnalytics/AdIdSupport (= 11.10.0)
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - FirebaseAnalytics/AdIdSupport (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseAnalytics/AdIdSupport (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
-    - GoogleAppMeasurement (= 11.8.0)
+    - GoogleAppMeasurement (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - FirebaseCore (11.8.1):
-    - FirebaseCoreInternal (~> 11.8.0)
+  - FirebaseCore (11.10.0):
+    - FirebaseCoreInternal (~> 11.10.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreInternal (11.8.0):
+  - FirebaseCoreInternal (11.10.0):
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseInstallations (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseInstallations (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseMessaging (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleDataTransport (~> 10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
@@ -128,21 +128,21 @@ PODS:
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
-  - GoogleAppMeasurement (11.8.0):
-    - GoogleAppMeasurement/AdIdSupport (= 11.8.0)
+  - GoogleAppMeasurement (11.10.0):
+    - GoogleAppMeasurement/AdIdSupport (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/AdIdSupport (11.8.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.8.0)
+  - GoogleAppMeasurement/AdIdSupport (11.10.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (11.8.0):
+  - GoogleAppMeasurement/WithoutAdIdSupport (11.10.0):
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
@@ -184,7 +184,7 @@ PODS:
     - Flutter
   - in_app_review (2.0.0):
     - Flutter
-  - Kingfisher (8.2.0)
+  - Kingfisher (8.3.1)
   - livekit_client (2.4.1):
     - Flutter
     - flutter_webrtc
@@ -217,9 +217,9 @@ PODS:
   - receive_sharing_intent (1.8.1):
     - Flutter
   - SAMKeychain (1.5.3)
-  - SDWebImage (5.20.1):
-    - SDWebImage/Core (= 5.20.1)
-  - SDWebImage/Core (5.20.1)
+  - SDWebImage (5.21.0):
+    - SDWebImage/Core (= 5.21.0)
+  - SDWebImage/Core (5.21.0)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -422,15 +422,15 @@ SPEC CHECKSUMS:
   fast_rsa: d99f8e1809a4a312fa9216d830186869b2e9eb65
   file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
   file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
-  Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
-  firebase_analytics: 4e93dbe66872104d28ae9750fec1800e1fd66858
-  firebase_core: 8d552814f6c01ccde5d88939fced4ec26f2f5510
-  firebase_messaging: 8b96a4f09841c15a16b96973ef5c3dcfc1a064e4
-  FirebaseAnalytics: 4fd42def128146e24e480e89f310e3d8534ea42b
-  FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
-  FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
-  FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
-  FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
+  Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
+  firebase_analytics: 1998960b8fa16fd0cd9e77a6f9fd35a2009ad65e
+  firebase_core: 2d4534e7b489907dcede540c835b48981d890943
+  firebase_messaging: 75bc93a4df25faccad67f6662ae872ac9ae69b64
+  FirebaseAnalytics: 4e42333f02cf78ed93703a5c36f36dd518aebdef
+  FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7
+  FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
+  FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
+  FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9
   flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
@@ -439,13 +439,13 @@ SPEC CHECKSUMS:
   flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9
   flutter_webrtc: 57f32415b8744e806f9c2a96ccdb60c6a627ba33
   gal: baecd024ebfd13c441269ca7404792a7152fde89
-  GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896
+  GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
   image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
   in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457
-  Kingfisher: 323e5c4ec7983aaace12af655a7b51a7f88a599d
+  Kingfisher: 3204d23de16b5ea53541c44ca5a8efb55741dec3
   livekit_client: 08755cabfa4da4ed455642f460cfbb39bc518070
   livekit_noise_filter: a26aeb1c1eae6db0a023fd2f6ea3ff108c3ecbb0
   LiveKitKrispNoiseFilter: efe418ceca28163ace0ff222bd2cc02384645d84
@@ -460,7 +460,7 @@ SPEC CHECKSUMS:
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
-  SDWebImage: 33d0f23bddeb5d209ae959153883247be6703713
+  SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868
   share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
   shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
   sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0

lib/controllers/post_write_controller.dart

@@ -241,7 +241,9 @@ class PostWriteController extends ChangeNotifier {
         contentController.text = post.body['content'] ?? '';
         aliasController.text = post.alias ?? '';
         rewardController.text = post.body['reward']?.toString() ?? '';
-        videoAttachment = SnAttachment.fromJson(post.body['video']);
+        videoAttachment = post.body['video'] != null
+            ? SnAttachment.fromJson(post.body['video'])
+            : null;
         publishedAt = post.publishedAt;
         publishedUntil = post.publishedUntil;
         visibleUsers = List.from(post.visibleUsersList ?? [], growable: true);
@@ -253,8 +255,9 @@ class PostWriteController extends ChangeNotifier {
             List.from(post.categories.map((ele) => ele.alias), growable: true);
         attachments.addAll(
           post.body['attachments']
-                  .where(SnAttachment.fromJson)
-                  ?.map(PostWriteMedia) ??
+                  ?.map((ele) => SnAttachment.fromJson(ele))
+                  ?.map((ele) => PostWriteMedia(ele))
+                  ?.cast<PostWriteMedia>() ??
               [],
         );
         poll = post.poll;

lib/providers/keypair.dart

@@ -152,7 +152,7 @@ class KeyPairProvider {
 
   Future<SnKeyPair?> reloadActive({bool autoEnroll = true}) async {
     final kp = await (_dt.db.snLocalKeyPair.select()
-          ..where((e) => e.accountId.equals(_ua.user!.id))
+          ..where((e) => e.accountId.equals(_ua.user?.id ?? 0))
           ..where((e) => e.privateKey.isNotNull())
           ..where((e) => e.isActive.equals(true))
           ..limit(1))

lib/providers/post.dart

@@ -33,11 +33,14 @@ class SnPostContentProvider {
   }
 
   Future<List<SnFeedEntry>> getFeed({int take = 20, DateTime? cursor}) async {
-    final resp =
-        await _sn.client.get('/cgi/co/recommendations/feed', queryParameters: {
-      'take': take,
-      if (cursor != null) 'cursor': cursor.toUtc().millisecondsSinceEpoch,
-    });
+    final resp = await _sn.client.get(
+      '/cgi/co/recommendations/feed',
+      queryParameters: {
+        'take': take,
+        if (cursor != null) 'cursor': cursor.toUtc().millisecondsSinceEpoch,
+      },
+      options: Options(headers: {'X-API-Version': '2'}),
+    );
     final List<SnFeedEntry> out =
         List.from(resp.data.map((ele) => SnFeedEntry.fromJson(ele)));
 

lib/providers/sn_network.dart

@@ -249,8 +249,11 @@ class SnNetworkProvider {
     return null;
   }
 
-  String getAttachmentUrl(String ky) {
+  String getAttachmentUrl(String ky, {bool preview = true}) {
     if (ky.startsWith("http")) return ky;
+    if (!preview) {
+      return '${client.options.baseUrl}/cgi/uc/attachments/$ky?preview=false';
+    }
     return '${client.options.baseUrl}/cgi/uc/attachments/$ky';
   }
 

lib/screens/account.dart

@@ -15,7 +15,6 @@ import 'package:surface/providers/websocket.dart';
 import 'package:surface/types/account.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/account/account_status.dart';
-import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:surface/widgets/universal_image.dart';
@@ -112,7 +111,7 @@ class AccountScreen extends StatelessWidget {
     return AppScaffold(
       noBackground: ResponsiveScaffold.getIsExpand(context),
       appBar: AppBar(
-        leading: AutoAppBarLeading(),
+        leading: const PageBackButton(),
         title: Text("screenAccount").tr(),
         flexibleSpace: ua.user != null && ua.user!.banner.isNotEmpty
             ? Stack(

lib/screens/account/profile_page.dart

@@ -15,6 +15,7 @@ import 'package:surface/providers/experience.dart';
 import 'package:surface/providers/relationship.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/screens/abuse_report.dart';
+import 'package:surface/screens/account/punishments.dart';
 import 'package:surface/types/account.dart';
 import 'package:surface/types/check_in.dart';
 import 'package:surface/types/post.dart';
@@ -457,7 +458,7 @@ class _UserScreenState extends State<UserScreen>
                     ],
                   ).padding(right: 8),
                   if (_account!.profile!.description.isNotEmpty)
-                    const Gap(12)
+                    const Gap(4)
                   else
                     const Gap(8),
                   if (_account!.profile!.description.isNotEmpty)
@@ -503,14 +504,15 @@ class _UserScreenState extends State<UserScreen>
                       ],
                     ).padding(vertical: 8, horizontal: 12),
                   ),
-                  const Gap(8),
-                  Wrap(
-                    spacing: 4,
-                    runSpacing: 4,
-                    children: _account!.badges
-                        .map((ele) => AccountBadge(badge: ele))
-                        .toList(),
-                  ).padding(horizontal: 8),
+                  if (_account!.badges.isNotEmpty) const Gap(8),
+                  if (_account!.badges.isNotEmpty)
+                    Wrap(
+                      spacing: 4,
+                      runSpacing: 4,
+                      children: _account!.badges
+                          .map((ele) => AccountBadge(badge: ele))
+                          .toList(),
+                    ).padding(horizontal: 8),
                   const Gap(8),
                   Column(
                     children: [
@@ -619,6 +621,17 @@ class _UserScreenState extends State<UserScreen>
                 ],
               ).padding(all: 16),
             ),
+          if (_account?.punishments.isNotEmpty ?? false)
+            SliverToBoxAdapter(child: const Divider()),
+          if (_account?.punishments.isNotEmpty ?? false)
+            SliverToBoxAdapter(
+              child: Column(
+                children: [
+                  for (final ele in _account!.punishments)
+                    PunishmentInfoCard(ele: ele),
+                ],
+              ),
+            ),
           if (_account?.profile?.links.isNotEmpty ?? false)
             SliverToBoxAdapter(child: const Divider()),
           if (_account?.profile?.links.isNotEmpty ?? false)

lib/screens/account/punishments.dart

@@ -107,74 +107,7 @@ class _PunishmentsScreenState extends State<PunishmentsScreen> {
                 itemCount: _punishments?.length ?? 0,
                 itemBuilder: (context, index) {
                   final ele = _punishments![index];
-                  return Card(
-                    margin: EdgeInsets.symmetric(horizontal: 8),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Row(
-                          children: [
-                            Icon(kPunishmentIcons[ele.type], size: 20),
-                            const Gap(6),
-                            Expanded(
-                              child: Text('punishmentType${ele.type}')
-                                  .tr()
-                                  .fontSize(16)
-                                  .bold(),
-                            ),
-                          ],
-                        ),
-                        Text(ele.reason),
-                        const Gap(4),
-                        Text(
-                          'punishmentCreatedAt'.tr(args: [
-                            DateFormat().format(
-                              ele.createdAt.toLocal(),
-                            )
-                          ]),
-                        ).opacity(0.8),
-                        Text(
-                          ele.expiredAt == null
-                              ? 'punishmentExpiredNever'.tr()
-                              : 'punishmentExpiredAt'.tr(args: [
-                                  DateFormat().format(
-                                    ele.expiredAt!.toLocal(),
-                                  )
-                                ]),
-                        ).opacity(0.8),
-                        const Gap(8),
-                        if (ele.moderator != null)
-                          Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Text('punishmentModerator').tr().opacity(0.75),
-                              InkWell(
-                                child: Row(
-                                  children: [
-                                    AccountImage(
-                                      content: ele.moderator!.avatar,
-                                      radius: 8,
-                                    ),
-                                    const Gap(4),
-                                    Text(ele.moderator?.nick ?? 'unknown'),
-                                  ],
-                                ),
-                                onTap: () {
-                                  GoRouter.of(context).pushNamed(
-                                    'accountProfilePage',
-                                    pathParameters: {
-                                      'name': ele.moderator!.name,
-                                    },
-                                  );
-                                },
-                              ),
-                            ],
-                          )
-                        else
-                          Text('punishmentMadeBySystem').tr().opacity(0.75),
-                      ],
-                    ).padding(horizontal: 24, vertical: 16),
-                  );
+                  return PunishmentInfoCard(ele: ele);
                 },
                 separatorBuilder: (_, __) => const Gap(8),
               ),
@@ -185,3 +118,82 @@ class _PunishmentsScreenState extends State<PunishmentsScreen> {
     );
   }
 }
+
+class PunishmentInfoCard extends StatelessWidget {
+  const PunishmentInfoCard({
+    super.key,
+    required this.ele,
+  });
+
+  final SnPunishment ele;
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: EdgeInsets.symmetric(horizontal: 8),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(kPunishmentIcons[ele.type], size: 20),
+              const Gap(6),
+              Expanded(
+                child:
+                    Text('punishmentType${ele.type}').tr().fontSize(16).bold(),
+              ),
+            ],
+          ),
+          Text(ele.reason),
+          const Gap(4),
+          Text(
+            'punishmentCreatedAt'.tr(args: [
+              DateFormat().format(
+                ele.createdAt.toLocal(),
+              )
+            ]),
+          ).opacity(0.8),
+          Text(
+            ele.expiredAt == null
+                ? 'punishmentExpiredNever'.tr()
+                : 'punishmentExpiredAt'.tr(args: [
+                    DateFormat().format(
+                      ele.expiredAt!.toLocal(),
+                    )
+                  ]),
+          ).opacity(0.8),
+          const Gap(8),
+          if (ele.moderator != null)
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text('punishmentModerator').tr().opacity(0.75),
+                InkWell(
+                  child: Row(
+                    children: [
+                      AccountImage(
+                        content: ele.moderator!.avatar,
+                        radius: 8,
+                      ),
+                      const Gap(4),
+                      Text(ele.moderator?.nick ?? 'unknown'),
+                    ],
+                  ),
+                  onTap: () {
+                    GoRouter.of(context).pushNamed(
+                      'accountProfilePage',
+                      pathParameters: {
+                        'name': ele.moderator!.name,
+                      },
+                    );
+                  },
+                ),
+              ],
+            )
+          else
+            Text('punishmentMadeBySystem').tr().opacity(0.75),
+        ],
+      ).padding(horizontal: 24, vertical: 16),
+    );
+  }
+}

lib/screens/album.dart

@@ -1,19 +1,21 @@
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:gap/gap.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:material_symbols_icons/symbols.dart';
+import 'package:path/path.dart' show withoutExtension;
 import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/sn_network.dart';
+import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/attachment.dart';
-import 'package:surface/widgets/attachment/attachment_zoom.dart';
 import 'package:surface/widgets/attachment/attachment_item.dart';
+import 'package:surface/widgets/attachment/attachment_zoom.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/navigation/app_scaffold.dart';
 import 'package:uuid/uuid.dart';
+import 'package:very_good_infinite_list/very_good_infinite_list.dart';
 
 class AlbumScreen extends StatefulWidget {
   const AlbumScreen({super.key});
@@ -48,6 +50,8 @@ class _AlbumScreenState extends State<AlbumScreen> {
   Future<void> _fetchAttachments() async {
     setState(() => _isBusy = true);
 
+    final ua = context.read<UserProvider>();
+
     const uuid = Uuid();
 
     try {
@@ -55,10 +59,11 @@ class _AlbumScreenState extends State<AlbumScreen> {
       final resp = await sn.client.get('/cgi/uc/attachments', queryParameters: {
         'take': 10,
         'offset': _attachments.length,
+        'author': ua.user?.name,
       });
       final attachments = List<SnAttachment>.from(
         resp.data['data']?.map((e) => SnAttachment.fromJson(e)) ?? [],
-      ).where((e) => e.mimetype.startsWith('image')).toList();
+      );
       _attachments.addAll(attachments);
       _heroTags.addAll(_attachments.map((_) => uuid.v4()));
 
@@ -97,94 +102,127 @@ class _AlbumScreenState extends State<AlbumScreen> {
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
-      body: CustomScrollView(
-        controller: _scrollController,
-        slivers: [
-          SliverAppBar(
-            leading: PageBackButton(),
-            title: Text('screenAlbum').tr(),
-          ),
-          SliverToBoxAdapter(
-            child: Card(
-              child: Row(
-                children: [
-                  SizedBox(
-                    width: 80,
-                    height: 80,
-                    child: CircularProgressIndicator(
-                      value: _billing?.includedRatio ?? 0,
-                      strokeWidth: 8,
-                      backgroundColor:
-                          Theme.of(context).colorScheme.surfaceContainerHigh,
+      appBar: AppBar(
+        leading: PageBackButton(),
+        title: Text('screenAlbum').tr(),
+      ),
+      body: Column(
+        children: [
+          Card(
+            margin: EdgeInsets.zero,
+            child: Row(
+              children: [
+                SizedBox(
+                  width: 80,
+                  height: 80,
+                  child: CircularProgressIndicator(
+                    value: _billing?.includedRatio ?? 0,
+                    strokeWidth: 8,
+                    backgroundColor:
+                        Theme.of(context).colorScheme.surfaceContainerHigh,
+                  ),
+                ).padding(all: 12),
+                const Gap(24),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text('attachmentBillingUploaded').tr().bold(),
+                      Text(
+                        (_billing?.currentBytes ?? 0).formatBytes(decimals: 4),
+                        style: GoogleFonts.robotoMono(),
+                      ),
+                      Text('attachmentBillingDiscount').tr().bold(),
+                      Text(
+                        '${(_billing?.discountFileSize ?? 0).formatBytes(decimals: 2)} · ${((_billing?.includedRatio ?? 0) * 100).toStringAsFixed(2)}%',
+                        style: GoogleFonts.robotoMono(),
+                      ),
+                    ],
+                  ),
+                ),
+                Tooltip(
+                  message: 'attachmentBillingHint'.tr(),
+                  child: IconButton(
+                    icon: const Icon(Symbols.info),
+                    onPressed: () {},
+                  ),
+                ),
+              ],
+            ).padding(horizontal: 24, vertical: 8),
+          ).padding(horizontal: 8, top: 8),
+          Expanded(
+            child: InfiniteList(
+              padding: EdgeInsets.only(top: 8),
+              itemCount: _attachments.length,
+              isLoading: _isBusy,
+              hasReachedMax:
+                  _totalCount != null && _attachments.length >= _totalCount!,
+              onFetchData: _fetchAttachments,
+              itemBuilder: (context, index) {
+                final ele = _attachments[index];
+                return Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    ClipRRect(
+                      child: AspectRatio(
+                        aspectRatio: (ele.data['ratio'] ?? 1).toDouble(),
+                        child: AttachmentItem(
+                          data: ele,
+                          heroTag: _heroTags[index],
+                          onZoom: () {
+                            context.pushTransparentRoute(
+                              AttachmentZoomView(
+                                data: [ele],
+                              ),
+                              backgroundColor: Colors.black.withOpacity(0.7),
+                              rootNavigator: true,
+                            );
+                          },
+                        ),
+                      ),
                     ),
-                  ).padding(all: 12),
-                  const Gap(24),
-                  Expanded(
-                    child: Column(
+                    Row(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        Text('attachmentBillingUploaded').tr().bold(),
-                        Text(
-                          (_billing?.currentBytes ?? 0)
-                              .formatBytes(decimals: 4),
-                          style: GoogleFonts.robotoMono(),
+                        Expanded(
+                          child: Column(
+                            mainAxisSize: MainAxisSize.min,
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(ele.name),
+                              if (ele.alt != withoutExtension(ele.name))
+                                Text(ele.alt),
+                              Text(DateFormat().format(ele.createdAt)),
+                              const Gap(4),
+                              Text(ele.size.formatBytes()).fontSize(12),
+                            ],
+                          ).padding(horizontal: 16, vertical: 12),
                         ),
-                        Text('attachmentBillingDiscount').tr().bold(),
-                        Text(
-                          '${(_billing?.discountFileSize ?? 0).formatBytes(decimals: 2)} · ${((_billing?.includedRatio ?? 0) * 100).toStringAsFixed(2)}%',
-                          style: GoogleFonts.robotoMono(),
+                        Padding(
+                          padding: EdgeInsets.only(left: 12, right: 12, top: 4),
+                          child: IconButton(
+                            padding: EdgeInsets.zero,
+                            visualDensity: VisualDensity.compact,
+                            icon: const Icon(Symbols.info),
+                            onPressed: () {
+                              showModalBottomSheet(
+                                context: context,
+                                builder: (context) => AttachmentZoomDetailPopup(
+                                  data: ele,
+                                ),
+                              );
+                            },
+                          ),
                         ),
                       ],
                     ),
-                  ),
-                  Tooltip(
-                    message: 'attachmentBillingHint'.tr(),
-                    child: IconButton(
-                      icon: const Icon(Symbols.info),
-                      onPressed: () {},
-                    ),
-                  ),
-                ],
-              ).padding(horizontal: 24, vertical: 8),
-            ),
-          ),
-          SliverMasonryGrid.extent(
-            childCount: _attachments.length,
-            maxCrossAxisExtent: 320,
-            mainAxisSpacing: 4,
-            crossAxisSpacing: 4,
-            itemBuilder: (context, idx) {
-              final attachment = _attachments[idx];
-              return GestureDetector(
-                child: ClipRRect(
-                  child: AspectRatio(
-                    aspectRatio: attachment.metadata['ratio']?.toDouble() ?? 1,
-                    child: AttachmentItem(
-                      data: attachment,
-                      heroTag: _heroTags[idx],
-                    ),
-                  ),
-                ),
-                onTap: () {
-                  context.pushTransparentRoute(
-                    AttachmentZoomView(
-                      data: [attachment],
-                      heroTags: [_heroTags[idx]],
-                    ),
-                    backgroundColor: Colors.black.withOpacity(0.7),
-                    rootNavigator: true,
-                  );
-                },
-              );
-            },
-          ),
-          if (_isBusy)
-            SliverToBoxAdapter(
-              child: Padding(
-                padding: const EdgeInsets.all(24),
-                child: const CircularProgressIndicator(),
-              ).center(),
+                  ],
+                );
+              },
+              separatorBuilder: (_, __) => const Gap(8),
             ),
+          )
         ],
       ),
     );

lib/screens/captcha/captcha.dart

@@ -1,3 +1 @@
-import 'package:flutter/foundation.dart' show kIsWeb;
-
-export 'captcha_native.dart' if (kIsWeb) 'captcha_web.dart';
+export 'captcha_native.dart' if (dart.library.html) 'captcha_web.dart';

lib/screens/captcha/captcha_web.dart

@@ -1,3 +1,4 @@
+// ignore: avoid_web_libraries_in_flutter
 import 'dart:html' as html;
 import 'dart:ui_web' as ui;
 import 'package:easy_localization/easy_localization.dart';
@@ -32,7 +33,7 @@ class _CaptchaScreenState extends State<CaptchaScreen> {
     });
 
     final iframe = html.IFrameElement()
-      ..src = '${context.read<ConfigProvider>().serverUrl}/captcha?redirect_uri=web'
+      ..src = '${context.read<ConfigProvider>().serverUrl}/captcha'
       ..style.border = 'none'
       ..width = '100%'
       ..height = '100%';
@@ -40,7 +41,7 @@ class _CaptchaScreenState extends State<CaptchaScreen> {
     html.document.body!.append(iframe);
     ui.platformViewRegistry.registerViewFactory(
       'captcha-iframe',
-          (int viewId) => iframe,
+      (int viewId) => iframe,
     );
   }
 
@@ -51,4 +52,4 @@ class _CaptchaScreenState extends State<CaptchaScreen> {
       body: HtmlElementView(viewType: 'captcha-iframe'),
     );
   }
-}
+}

lib/screens/chat.dart

@@ -171,7 +171,18 @@ class _ChatScreenState extends State<ChatScreen> {
   }
 
   void _onTapChannel(SnChannel channel) {
-    setState(() => _unreadCounts?[channel.id] = 0);
+    setState(() {
+      _unreadCounts?[channel.id] = 0;
+      if (channel.realmId != null) {
+        _unreadCountsGrouped?[channel.realmId!] =
+            (_unreadCountsGrouped?[channel.realmId!] ?? 0) -
+                (_unreadCounts?[channel.id] ?? 0);
+      }
+      if (channel.type == 1) {
+        _unreadCountsGrouped?[0] =
+            (_unreadCountsGrouped?[0] ?? 0) - (_unreadCounts?[channel.id] ?? 0);
+      }
+    });
     if (ResponsiveScaffold.getIsExpand(context)) {
       GoRouter.of(context).pushReplacementNamed(
         'chatRoom',
@@ -180,9 +191,8 @@ class _ChatScreenState extends State<ChatScreen> {
           'alias': channel.alias,
         },
       ).then((value) {
-        if (mounted) {
-          setState(() => _unreadCounts?[channel.id] = 0);
-          _refreshChannels(noRemote: true);
+        if (mounted && value == true) {
+          _refreshChannels();
         }
       });
     } else {
@@ -193,9 +203,8 @@ class _ChatScreenState extends State<ChatScreen> {
           'alias': channel.alias,
         },
       ).then((value) {
-        if (mounted) {
-          setState(() => _unreadCounts?[channel.id] = 0);
-          _refreshChannels(noRemote: true);
+        if (mounted && value == true) {
+          _refreshChannels();
         }
       });
     }

lib/screens/notification.dart

@@ -11,7 +11,6 @@ import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/notification.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/types/notification.dart';
-import 'package:surface/widgets/app_bar_leading.dart';
 import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/loading_indicator.dart';
 import 'package:surface/widgets/markdown_content.dart';
@@ -156,7 +155,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
 
     return AppScaffold(
       appBar: AppBar(
-        leading: AutoAppBarLeading(),
+        leading: PageBackButton(),
         title: Text('screenNotification').tr(),
         actions: [
           IconButton(

lib/screens/post/post_editor.dart

@@ -346,9 +346,15 @@ class _PostEditorScreenState extends State<PostEditorScreen>
                     children: [
                       const Icon(Icons.edit, size: 16),
                       const Gap(10),
-                      Text('postEditingNotice').tr(args: [
-                        '@${_writeController.editingPost!.publisher.name}'
-                      ]),
+                      Expanded(
+                        child: Text(
+                          'postEditingNotice',
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ).tr(args: [
+                          '@${_writeController.editingPost!.publisher.name}'
+                        ]),
+                      ),
                     ],
                   ),
                 ),

lib/screens/post/publisher_page.dart

@@ -303,6 +303,7 @@ class _PostPublisherScreenState extends State<PostPublisherScreen>
                     ),
                     child: SliverAppBar(
                       expandedHeight: _appBarHeight,
+                      leading: const PageBackButton(),
                       title: _publisher == null
                           ? Text('loading').tr()
                           : RichText(

lib/types/account.dart

@@ -22,6 +22,7 @@ abstract class SnAccount with _$SnAccount {
     required String language,
     required SnAccountProfile? profile,
     @Default([]) List<SnAccountBadge> badges,
+    @Default([]) List<SnPunishment> punishments,
     required DateTime? suspendedAt,
     required int? affiliatedId,
     required int? affiliatedTo,

lib/types/account.freezed.dart

@@ -29,6 +29,7 @@ mixin _$SnAccount {
   String get language;
   SnAccountProfile? get profile;
   List<SnAccountBadge> get badges;
+  List<SnPunishment> get punishments;
   DateTime? get suspendedAt;
   int? get affiliatedId;
   int? get affiliatedTo;
@@ -69,6 +70,8 @@ mixin _$SnAccount {
                 other.language == language) &&
             (identical(other.profile, profile) || other.profile == profile) &&
             const DeepCollectionEquality().equals(other.badges, badges) &&
+            const DeepCollectionEquality()
+                .equals(other.punishments, punishments) &&
             (identical(other.suspendedAt, suspendedAt) ||
                 other.suspendedAt == suspendedAt) &&
             (identical(other.affiliatedId, affiliatedId) ||
@@ -99,6 +102,7 @@ mixin _$SnAccount {
         language,
         profile,
         const DeepCollectionEquality().hash(badges),
+        const DeepCollectionEquality().hash(punishments),
         suspendedAt,
         affiliatedId,
         affiliatedTo,
@@ -108,7 +112,7 @@ mixin _$SnAccount {
 
   @override
   String toString() {
-    return 'SnAccount(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, confirmedAt: $confirmedAt, contacts: $contacts, avatar: $avatar, banner: $banner, name: $name, nick: $nick, permNodes: $permNodes, language: $language, profile: $profile, badges: $badges, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
+    return 'SnAccount(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, confirmedAt: $confirmedAt, contacts: $contacts, avatar: $avatar, banner: $banner, name: $name, nick: $nick, permNodes: $permNodes, language: $language, profile: $profile, badges: $badges, punishments: $punishments, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
   }
 }
 
@@ -132,6 +136,7 @@ abstract mixin class $SnAccountCopyWith<$Res> {
       String language,
       SnAccountProfile? profile,
       List<SnAccountBadge> badges,
+      List<SnPunishment> punishments,
       DateTime? suspendedAt,
       int? affiliatedId,
       int? affiliatedTo,
@@ -167,6 +172,7 @@ class _$SnAccountCopyWithImpl<$Res> implements $SnAccountCopyWith<$Res> {
     Object? language = null,
     Object? profile = freezed,
     Object? badges = null,
+    Object? punishments = null,
     Object? suspendedAt = freezed,
     Object? affiliatedId = freezed,
     Object? affiliatedTo = freezed,
@@ -230,6 +236,10 @@ class _$SnAccountCopyWithImpl<$Res> implements $SnAccountCopyWith<$Res> {
           ? _self.badges
           : badges // ignore: cast_nullable_to_non_nullable
               as List<SnAccountBadge>,
+      punishments: null == punishments
+          ? _self.punishments
+          : punishments // ignore: cast_nullable_to_non_nullable
+              as List<SnPunishment>,
       suspendedAt: freezed == suspendedAt
           ? _self.suspendedAt
           : suspendedAt // ignore: cast_nullable_to_non_nullable
@@ -286,6 +296,7 @@ class _SnAccount extends SnAccount {
       required this.language,
       required this.profile,
       final List<SnAccountBadge> badges = const [],
+      final List<SnPunishment> punishments = const [],
       required this.suspendedAt,
       required this.affiliatedId,
       required this.affiliatedTo,
@@ -294,6 +305,7 @@ class _SnAccount extends SnAccount {
       : _contacts = contacts,
         _permNodes = permNodes,
         _badges = badges,
+        _punishments = punishments,
         super._();
   factory _SnAccount.fromJson(Map<String, dynamic> json) =>
       _$SnAccountFromJson(json);
@@ -350,6 +362,15 @@ class _SnAccount extends SnAccount {
     return EqualUnmodifiableListView(_badges);
   }
 
+  final List<SnPunishment> _punishments;
+  @override
+  @JsonKey()
+  List<SnPunishment> get punishments {
+    if (_punishments is EqualUnmodifiableListView) return _punishments;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_punishments);
+  }
+
   @override
   final DateTime? suspendedAt;
   @override
@@ -401,6 +422,8 @@ class _SnAccount extends SnAccount {
                 other.language == language) &&
             (identical(other.profile, profile) || other.profile == profile) &&
             const DeepCollectionEquality().equals(other._badges, _badges) &&
+            const DeepCollectionEquality()
+                .equals(other._punishments, _punishments) &&
             (identical(other.suspendedAt, suspendedAt) ||
                 other.suspendedAt == suspendedAt) &&
             (identical(other.affiliatedId, affiliatedId) ||
@@ -431,6 +454,7 @@ class _SnAccount extends SnAccount {
         language,
         profile,
         const DeepCollectionEquality().hash(_badges),
+        const DeepCollectionEquality().hash(_punishments),
         suspendedAt,
         affiliatedId,
         affiliatedTo,
@@ -440,7 +464,7 @@ class _SnAccount extends SnAccount {
 
   @override
   String toString() {
-    return 'SnAccount(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, confirmedAt: $confirmedAt, contacts: $contacts, avatar: $avatar, banner: $banner, name: $name, nick: $nick, permNodes: $permNodes, language: $language, profile: $profile, badges: $badges, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
+    return 'SnAccount(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, confirmedAt: $confirmedAt, contacts: $contacts, avatar: $avatar, banner: $banner, name: $name, nick: $nick, permNodes: $permNodes, language: $language, profile: $profile, badges: $badges, punishments: $punishments, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
   }
 }
 
@@ -467,6 +491,7 @@ abstract mixin class _$SnAccountCopyWith<$Res>
       String language,
       SnAccountProfile? profile,
       List<SnAccountBadge> badges,
+      List<SnPunishment> punishments,
       DateTime? suspendedAt,
       int? affiliatedId,
       int? affiliatedTo,
@@ -503,6 +528,7 @@ class __$SnAccountCopyWithImpl<$Res> implements _$SnAccountCopyWith<$Res> {
     Object? language = null,
     Object? profile = freezed,
     Object? badges = null,
+    Object? punishments = null,
     Object? suspendedAt = freezed,
     Object? affiliatedId = freezed,
     Object? affiliatedTo = freezed,
@@ -566,6 +592,10 @@ class __$SnAccountCopyWithImpl<$Res> implements _$SnAccountCopyWith<$Res> {
           ? _self._badges
           : badges // ignore: cast_nullable_to_non_nullable
               as List<SnAccountBadge>,
+      punishments: null == punishments
+          ? _self._punishments
+          : punishments // ignore: cast_nullable_to_non_nullable
+              as List<SnPunishment>,
       suspendedAt: freezed == suspendedAt
           ? _self.suspendedAt
           : suspendedAt // ignore: cast_nullable_to_non_nullable

lib/types/account.g.dart

@@ -32,6 +32,10 @@ _SnAccount _$SnAccountFromJson(Map<String, dynamic> json) => _SnAccount(
               ?.map((e) => SnAccountBadge.fromJson(e as Map<String, dynamic>))
               .toList() ??
           const [],
+      punishments: (json['punishments'] as List<dynamic>?)
+              ?.map((e) => SnPunishment.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          const [],
       suspendedAt: json['suspended_at'] == null
           ? null
           : DateTime.parse(json['suspended_at'] as String),
@@ -57,6 +61,7 @@ Map<String, dynamic> _$SnAccountToJson(_SnAccount instance) =>
       'language': instance.language,
       'profile': instance.profile?.toJson(),
       'badges': instance.badges.map((e) => e.toJson()).toList(),
+      'punishments': instance.punishments.map((e) => e.toJson()).toList(),
       'suspended_at': instance.suspendedAt?.toIso8601String(),
       'affiliated_id': instance.affiliatedId,
       'affiliated_to': instance.affiliatedTo,

lib/widgets/account/account_popover.dart

@@ -22,142 +22,151 @@ class AccountPopoverCard extends StatelessWidget {
   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),
-        if (data.badges.isNotEmpty)
-          Wrap(
-            spacing: 4,
-            children: data.badges
-                .map(
-                  (ele) => AccountBadge(badge: ele),
-                )
-                .toList(),
-          ).padding(horizontal: 24, bottom: 12, top: 12),
-        if (data.profile?.description.isNotEmpty ?? false)
-          Text(
-            data.profile?.description ?? '',
-            maxLines: 2,
-            overflow: TextOverflow.ellipsis,
-          ).padding(horizontal: 26, bottom: 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(
-                  (status?.isDisturbable ?? true)
-                      ? Symbols.circle
-                      : Symbols.do_not_disturb_on,
-                  fill: (status?.isOnline ?? false) ? 1 : 0,
-                  size: 16,
-                  color: (status?.isOnline ?? false)
-                      ? (status?.isDisturbable ?? true)
-                          ? Colors.green
-                          : Colors.red
-                      : Colors.grey,
-                ).padding(all: 4),
-                const Gap(8),
-                Text(
-                  status != null
-                      ? (status.status?.label.isNotEmpty ?? false)
-                          ? status.status!.label
-                          : status.isOnline
-                              ? 'accountStatusOnline'.tr()
-                              : 'accountStatusOffline'.tr()
-                      : 'loading'.tr(),
+    return SingleChildScrollView(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          if (data.banner.isNotEmpty)
+            ClipRRect(
+              borderRadius: BorderRadius.circular(16),
+              child: Container(
+                color: Theme.of(context).colorScheme.surfaceContainer,
+                child: AspectRatio(
+                  aspectRatio: 16 / 7,
+                  child: AutoResizeUniversalImage(
+                    sn.getAttachmentUrl(data.banner),
+                    fit: BoxFit.cover,
+                  ),
                 ),
-                if (status != null &&
-                    !status.isOnline &&
-                    status.lastSeenAt != null)
+              ),
+            ).padding(all: 16)
+          else
+            const Gap(16),
+          // Top padding
+          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).pushReplacementNamed(
+                    '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),
+          if (data.badges.isNotEmpty)
+            Wrap(
+              spacing: 4,
+              children: data.badges
+                  .map(
+                    (ele) => AccountBadge(badge: ele),
+                  )
+                  .toList(),
+            ).padding(horizontal: 24, bottom: 12, top: 12),
+          if (data.profile?.description.isNotEmpty ?? false)
+            Text(
+              data.profile?.description ?? '',
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+            ).padding(horizontal: 26, bottom: 8)
+          else
+            const Gap(12),
+          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(
+                    (status?.isDisturbable ?? true)
+                        ? Symbols.circle
+                        : Symbols.do_not_disturb_on,
+                    fill: (status?.isOnline ?? false) ? 1 : 0,
+                    size: 16,
+                    color: (status?.isOnline ?? false)
+                        ? (status?.isDisturbable ?? true)
+                            ? Colors.green
+                            : Colors.red
+                        : Colors.grey,
+                  ).padding(all: 4),
+                  const Gap(8),
                   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),
-      ],
+                    status != null
+                        ? (status.status?.label.isNotEmpty ?? false)
+                            ? status.status!.label
+                            : 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(64),
+        ],
+      ),
     );
   }
 }

lib/widgets/attachment/attachment_item.dart

@@ -15,6 +15,7 @@ import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/logger.dart';
 import 'package:surface/providers/sn_network.dart';
+import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/attachment.dart';
 import 'package:surface/widgets/universal_image.dart';
 import 'package:uuid/uuid.dart';
@@ -25,6 +26,7 @@ class AttachmentItem extends StatelessWidget {
   final String? heroTag;
   final BoxFit fit;
   final FilterQuality? filterQuality;
+  final Function? onZoom;
 
   const AttachmentItem({
     super.key,
@@ -32,6 +34,7 @@ class AttachmentItem extends StatelessWidget {
     required this.data,
     required this.heroTag,
     this.filterQuality,
+    this.onZoom,
   });
 
   Widget _buildContent(BuildContext context) {
@@ -94,7 +97,14 @@ class AttachmentItem extends StatelessWidget {
       });
     }
 
-    return _buildContent(context);
+    return GestureDetector(
+      child: _buildContent(context),
+      onTap: () {
+        if (data?.mimetype.startsWith('image') ?? false) {
+          onZoom?.call();
+        }
+      },
+    );
   }
 }
 
@@ -219,6 +229,7 @@ class _AttachmentItemContentVideoState
     setState(() => _showContent = true);
     MediaKit.ensureInitialized();
     final sn = context.read<SnNetworkProvider>();
+    final ua = context.read<UserProvider>();
     final url = _showOriginal
         ? sn.getAttachmentUrl(widget.data.rid)
         : sn.getAttachmentUrl(widget.data.compressed!.rid);
@@ -231,6 +242,7 @@ class _AttachmentItemContentVideoState
       logging.info('[MediaPlayer] Miss cache: $url');
       final fileStream = DefaultCacheManager().getFileStream(
         url,
+        headers: {'Authorization': 'Bearer ${await ua.atk}'},
         withProgress: true,
       );
       await for (var fileInfo in fileStream) {
@@ -490,6 +502,7 @@ class _AttachmentItemContentAudioState
     setState(() => _showContent = true);
     MediaKit.ensureInitialized();
     final sn = context.read<SnNetworkProvider>();
+    final ua = context.read<UserProvider>();
     final url = sn.getAttachmentUrl(widget.data.rid);
     _audioPlayer = Player();
 
@@ -499,6 +512,7 @@ class _AttachmentItemContentAudioState
       logging.info('[MediaPlayer] Miss cache: $url');
       final fileStream = DefaultCacheManager().getFileStream(
         url,
+        headers: {'Authorization': 'Bearer ${await ua.atk}'},
         withProgress: true,
       );
       await for (var fileInfo in fileStream) {

lib/widgets/attachment/attachment_list.dart

@@ -74,40 +74,35 @@ class _AttachmentListState extends State<AttachmentList> {
           return Container(
             padding: widget.padding ?? EdgeInsets.zero,
             constraints: constraints,
-            child: GestureDetector(
-              child: AspectRatio(
-                aspectRatio: singleAspectRatio,
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: backgroundColor,
-                    border: Border.fromBorderSide(borderSide),
-                    borderRadius: AttachmentList.kDefaultRadius,
-                  ),
-                  child: ClipRRect(
-                    borderRadius: AttachmentList.kDefaultRadius,
-                    child: AttachmentItem(
-                      data: widget.data[0],
-                      heroTag: heroTags[0],
-                      fit: widget.fit,
-                      filterQuality: widget.filterQuality,
-                    ),
+            child: AspectRatio(
+              aspectRatio: singleAspectRatio,
+              child: Container(
+                decoration: BoxDecoration(
+                  color: backgroundColor,
+                  border: Border.fromBorderSide(borderSide),
+                  borderRadius: AttachmentList.kDefaultRadius,
+                ),
+                child: ClipRRect(
+                  borderRadius: AttachmentList.kDefaultRadius,
+                  child: AttachmentItem(
+                    data: widget.data[0],
+                    heroTag: heroTags[0],
+                    fit: widget.fit,
+                    filterQuality: widget.filterQuality,
+                    onZoom: () {
+                      context.pushTransparentRoute(
+                        AttachmentZoomView(
+                          data: widget.data.where((ele) => ele != null).cast(),
+                          initialIndex: 0,
+                          heroTags: heroTags,
+                        ),
+                        backgroundColor: Colors.black.withOpacity(0.7),
+                        rootNavigator: true,
+                      );
+                    },
                   ),
                 ),
               ),
-              onTap: () {
-                if (widget.data.firstOrNull?.mediaType != SnMediaType.image) {
-                  return;
-                }
-                context.pushTransparentRoute(
-                  AttachmentZoomView(
-                    data: widget.data.where((ele) => ele != null).cast(),
-                    initialIndex: 0,
-                    heroTags: heroTags,
-                  ),
-                  backgroundColor: Colors.black.withOpacity(0.7),
-                  rootNavigator: true,
-                );
-              },
             ),
           );
         }
@@ -133,33 +128,27 @@ class _AttachmentListState extends State<AttachmentList> {
                 mainAxisSpacing: 4,
                 children: widget.data
                     .mapIndexed(
-                      (idx, ele) => GestureDetector(
-                        child: Container(
-                          constraints: constraints,
-                          child: AttachmentItem(
-                            data: ele,
-                            heroTag: heroTags[idx],
-                            fit: BoxFit.cover,
-                            filterQuality: widget.filterQuality,
-                          ),
+                      (idx, ele) => Container(
+                        constraints: constraints,
+                        child: AttachmentItem(
+                          data: ele,
+                          heroTag: heroTags[idx],
+                          fit: BoxFit.cover,
+                          filterQuality: widget.filterQuality,
+                          onZoom: () {
+                            context.pushTransparentRoute(
+                              AttachmentZoomView(
+                                data: widget.data
+                                    .where((ele) => ele != null)
+                                    .cast(),
+                                initialIndex: idx,
+                                heroTags: heroTags,
+                              ),
+                              backgroundColor: Colors.black.withOpacity(0.7),
+                              rootNavigator: true,
+                            );
+                          },
                         ),
-                        onTap: () {
-                          if (widget.data[idx]!.mediaType !=
-                              SnMediaType.image) {
-                            return;
-                          }
-                          context.pushTransparentRoute(
-                            AttachmentZoomView(
-                              data: widget.data
-                                  .where((ele) => ele != null)
-                                  .cast(),
-                              initialIndex: idx,
-                              heroTags: heroTags,
-                            ),
-                            backgroundColor: Colors.black.withOpacity(0.7),
-                            rootNavigator: true,
-                          );
-                        },
                       ),
                     )
                     .toList(),
@@ -181,17 +170,30 @@ class _AttachmentListState extends State<AttachmentList> {
               child: Column(
                 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,
-                              filterQuality: widget.filterQuality,
-                            ),
+                      (idx, ele) => AspectRatio(
+                        aspectRatio: ele?.data['ratio']?.toDouble() ?? 1,
+                        child: Container(
+                          constraints: constraints,
+                          child: AttachmentItem(
+                            data: ele,
+                            heroTag: heroTags[idx],
+                            fit: BoxFit.cover,
+                            filterQuality: widget.filterQuality,
+                            onZoom: () {
+                              context.pushTransparentRoute(
+                                AttachmentZoomView(
+                                  data: widget.data
+                                      .where((ele) =>
+                                          ele != null &&
+                                          ele.mediaType == SnMediaType.image)
+                                      .cast(),
+                                  initialIndex: idx,
+                                  heroTags: heroTags,
+                                ),
+                                backgroundColor: Colors.black.withOpacity(0.7),
+                                rootNavigator: true,
+                              );
+                            },
                           ),
                         ),
                       ),
@@ -222,56 +224,52 @@ class _AttachmentListState extends State<AttachmentList> {
                     child: AspectRatio(
                       aspectRatio:
                           (widget.data[idx]?.data['ratio'] ?? 1).toDouble(),
-                      child: GestureDetector(
-                        onTap: () {
-                          if (widget.data[idx]?.mediaType !=
-                              SnMediaType.image) {
-                            return;
-                          }
-                          context.pushTransparentRoute(
-                            AttachmentZoomView(
-                              data: widget.data
-                                  .where((ele) =>
-                                      ele != null &&
-                                      ele.mediaType == SnMediaType.image)
-                                  .cast(),
-                              initialIndex: idx,
-                              heroTags: heroTags,
-                            ),
-                            backgroundColor: Colors.black.withOpacity(0.7),
-                            rootNavigator: true,
-                          );
-                        },
-                        child: Stack(
-                          fit: StackFit.expand,
-                          children: [
-                            Container(
-                              decoration: BoxDecoration(
-                                color: backgroundColor,
-                                border: Border.all(
-                                  width: 1,
-                                  color: Theme.of(context).dividerColor,
-                                ),
-                                borderRadius: AttachmentList.kDefaultRadius,
+                      child: Stack(
+                        fit: StackFit.expand,
+                        children: [
+                          Container(
+                            decoration: BoxDecoration(
+                              color: backgroundColor,
+                              border: Border.all(
+                                width: 1,
+                                color: Theme.of(context).dividerColor,
                               ),
-                              child: ClipRRect(
-                                borderRadius: AttachmentList.kDefaultRadius,
-                                child: AttachmentItem(
-                                  data: widget.data[idx],
-                                  heroTag: heroTags[idx],
-                                  filterQuality: widget.filterQuality,
-                                ),
+                              borderRadius: AttachmentList.kDefaultRadius,
+                            ),
+                            child: ClipRRect(
+                              borderRadius: AttachmentList.kDefaultRadius,
+                              child: AttachmentItem(
+                                data: widget.data[idx],
+                                heroTag: heroTags[idx],
+                                filterQuality: widget.filterQuality,
+                                onZoom: () {
+                                  context.pushTransparentRoute(
+                                    AttachmentZoomView(
+                                      data: widget.data
+                                          .where((ele) =>
+                                              ele != null &&
+                                              ele.mediaType ==
+                                                  SnMediaType.image)
+                                          .cast(),
+                                      initialIndex: idx,
+                                      heroTags: heroTags,
+                                    ),
+                                    backgroundColor:
+                                        Colors.black.withOpacity(0.7),
+                                    rootNavigator: true,
+                                  );
+                                },
                               ),
                             ),
-                            Positioned(
-                              right: 8,
-                              bottom: 8,
-                              child: Chip(
-                                label: Text('${idx + 1}/${widget.data.length}'),
-                              ),
+                          ),
+                          Positioned(
+                            right: 8,
+                            bottom: 8,
+                            child: Chip(
+                              label: Text('${idx + 1}/${widget.data.length}'),
                             ),
-                          ],
-                        ),
+                          ),
+                        ],
                       ),
                     ),
                   );

lib/widgets/attachment/attachment_zoom.dart

@@ -64,7 +64,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
   Future<void> _saveToAlbum(int idx) async {
     final sn = context.read<SnNetworkProvider>();
     final item = widget.data.elementAt(idx);
-    final url = sn.getAttachmentUrl(item.rid);
+    final url = sn.getAttachmentUrl(item.rid, preview: false);
 
     if (kIsWeb || Platform.isLinux) {
       await launchUrlString(url);
@@ -181,7 +181,10 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                             scaleState == PhotoViewScaleState.initial);
                       },
                       imageProvider: UniversalImage.provider(
-                        sn.getAttachmentUrl(widget.data.first.rid),
+                        sn.getAttachmentUrl(
+                          widget.data.first.rid,
+                          preview: false,
+                        ),
                       ),
                     ),
                   );
@@ -199,7 +202,10 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                         widget.heroTags?.elementAt(idx) ?? uuid.v4();
                     return PhotoViewGalleryPageOptions(
                       imageProvider: UniversalImage.provider(
-                        sn.getAttachmentUrl(widget.data.elementAt(idx).rid),
+                        sn.getAttachmentUrl(
+                          widget.data.elementAt(idx).rid,
+                          preview: false,
+                        ),
                       ),
                       heroAttributes: PhotoViewHeroAttributes(
                         tag: 'attachment-${widget.data.first.rid}-$heroTag',
@@ -367,7 +373,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                             _showDetail = true;
                             showModalBottomSheet(
                               context: context,
-                              builder: (context) => _AttachmentZoomDetailPopup(
+                              builder: (context) => AttachmentZoomDetailPopup(
                                 data: widget.data.elementAt(_page),
                               ),
                             ).then((_) {
@@ -397,7 +403,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
             _showDetail = true;
             showModalBottomSheet(
               context: context,
-              builder: (context) => _AttachmentZoomDetailPopup(
+              builder: (context) => AttachmentZoomDetailPopup(
                 data: widget.data.elementAt(_page),
               ),
             ).then((_) {
@@ -410,10 +416,10 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
   }
 }
 
-class _AttachmentZoomDetailPopup extends StatelessWidget {
+class AttachmentZoomDetailPopup extends StatelessWidget {
   final SnAttachment data;
 
-  const _AttachmentZoomDetailPopup({required this.data});
+  const AttachmentZoomDetailPopup({required this.data});
 
   @override
   Widget build(BuildContext context) {

lib/widgets/chat/chat_message.dart

@@ -1,11 +1,8 @@
-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/config.dart';
@@ -120,20 +117,9 @@ class ChatMessage extends StatelessWidget {
                       ),
                       onTap: () {
                         if (user == null) return;
-                        showPopover(
-                          backgroundColor:
-                              Theme.of(context).colorScheme.surface,
+                        showModalBottomSheet(
                           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,
+                          builder: (context) => AccountPopoverCard(data: user),
                         );
                       },
                     )

lib/widgets/navigation/app_drawer_navigation.dart

@@ -100,6 +100,7 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
                   contentPadding: EdgeInsets.symmetric(horizontal: 24),
                   leading: AccountImage(
                     content: ua.user?.avatar,
+                    backgroundColor: Colors.transparent,
                     fallbackWidget:
                         ua.isAuthorized ? null : const Icon(Symbols.login),
                   ),
@@ -122,15 +123,6 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
                             Scaffold.of(context).closeDrawer();
                           },
                         ),
-                      IconButton(
-                        icon: const Icon(Symbols.settings, fill: 1),
-                        padding: EdgeInsets.zero,
-                        visualDensity: VisualDensity.compact,
-                        onPressed: () {
-                          GoRouter.of(context).pushNamed('settings');
-                          Scaffold.of(context).closeDrawer();
-                        },
-                      ),
                     ],
                   ),
                   onTap: () {

lib/widgets/post/post_item.dart

@@ -12,7 +12,6 @@ import 'package:go_router/go_router.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:popover/popover.dart';
 import 'package:provider/provider.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:relative_time/relative_time.dart';
@@ -1274,20 +1273,11 @@ class _PostAvatar extends StatelessWidget {
               ),
             ),
       onTap: () {
-        showPopover(
-          backgroundColor: Theme.of(context).colorScheme.surface,
+        showModalBottomSheet(
           context: context,
-          transition: PopoverTransition.other,
-          bodyBuilder: (context) => SizedBox(
-            width: math.min(400, MediaQuery.of(context).size.width - 10),
-            child: PublisherPopoverCard(
-              data: data.publisher,
-            ),
+          builder: (context) => PublisherPopoverCard(
+            data: data.publisher,
           ),
-          direction: PopoverDirection.bottom,
-          arrowHeight: 5,
-          arrowWidth: 15,
-          arrowDxOffset: -190,
         );
       },
     );

lib/widgets/post/publisher_popover.dart

@@ -24,125 +24,137 @@ class PublisherPopoverCard extends StatelessWidget {
 
     final user = data.type == 0 ? ud.getFromCache(data.accountId) : null;
 
-    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,
+    return SingleChildScrollView(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          if (data.banner.isNotEmpty)
+            ClipRRect(
+              borderRadius: BorderRadius.circular(16),
+              child: 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,
-              borderRadius: data.type == 1 ? 8 : 20,
-            ),
+            ).padding(all: 16)
+          else
+            // Top padding
             Gap(16),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(data.nick).bold(),
-                  Text('@${data.name}').fontSize(13).opacity(0.75),
-                ],
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              AccountImage(
+                content: data.avatar,
+                radius: 20,
+                borderRadius: data.type == 1 ? 8 : 20,
               ),
-            ),
-            IconButton(
-              onPressed: () {
-                Navigator.pop(context);
-                GoRouter.of(context).pushNamed(
-                  'postPublisher',
-                  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),
-        if (user != null && user.badges.isNotEmpty)
-          Wrap(
-            spacing: 4,
-            children: user.badges
-                .map(
-                  (ele) => AccountBadge(badge: ele),
-                )
-                .toList(),
-          ).padding(horizontal: 24, top: 16),
-        const Gap(16),
-        if (data.description.isNotEmpty)
-          Text(
-            data.description,
-            maxLines: 2,
-            overflow: TextOverflow.ellipsis,
-          ).padding(horizontal: 26, bottom: 20),
-        Row(
-          children: [
-            Expanded(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Text('publisherSocialPoint').tr().fontSize(13).opacity(0.75),
-                  Text((data.totalUpvote - data.totalDownvote).toString()),
-                ],
+              Gap(16),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text(data.nick).bold(),
+                    Text('@${data.name}').fontSize(13).opacity(0.75),
+                  ],
+                ),
               ),
-            ),
-            SizedBox(
-              height: 20,
-              child: const VerticalDivider(
-                thickness: 1,
+              IconButton(
+                onPressed: () {
+                  Navigator.pop(context);
+                  GoRouter.of(context).pushNamed(
+                    'postPublisher',
+                    pathParameters: {'name': data.name},
+                  );
+                },
+                icon: const Icon(Symbols.chevron_right),
+                padding: EdgeInsets.zero,
+                visualDensity:
+                    const VisualDensity(horizontal: -4, vertical: -4),
               ),
-            ).padding(horizontal: 8),
-            Expanded(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Text('publisherTotalUpvote').tr().fontSize(13).opacity(0.75),
-                  Text(data.totalUpvote.toString()),
-                ],
+              const Gap(8)
+            ],
+          ).padding(horizontal: 16),
+          if (user != null && user.badges.isNotEmpty)
+            Wrap(
+              spacing: 4,
+              children: user.badges
+                  .map(
+                    (ele) => AccountBadge(badge: ele),
+                  )
+                  .toList(),
+            ).padding(horizontal: 24, top: 16),
+          const Gap(16),
+          if (data.description.isNotEmpty)
+            Text(
+              data.description,
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+            ).padding(horizontal: 26, bottom: 20),
+          Row(
+            children: [
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Text('publisherSocialPoint')
+                        .tr()
+                        .fontSize(13)
+                        .opacity(0.75),
+                    Text((data.totalUpvote - data.totalDownvote).toString()),
+                  ],
+                ),
               ),
-            ),
-            SizedBox(
-              height: 20,
-              child: const VerticalDivider(
-                thickness: 1,
+              SizedBox(
+                height: 20,
+                child: const VerticalDivider(
+                  thickness: 1,
+                ),
+              ).padding(horizontal: 8),
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Text('publisherTotalUpvote')
+                        .tr()
+                        .fontSize(13)
+                        .opacity(0.75),
+                    Text(data.totalUpvote.toString()),
+                  ],
+                ),
               ),
-            ).padding(horizontal: 8),
-            Expanded(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Text('publisherTotalDownvote')
-                      .tr()
-                      .fontSize(13)
-                      .opacity(0.75),
-                  Text(data.totalDownvote.toString()),
-                ],
+              SizedBox(
+                height: 20,
+                child: const VerticalDivider(
+                  thickness: 1,
+                ),
+              ).padding(horizontal: 8),
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Text('publisherTotalDownvote')
+                        .tr()
+                        .fontSize(13)
+                        .opacity(0.75),
+                    Text(data.totalDownvote.toString()),
+                  ],
+                ),
               ),
-            ),
-          ],
-        ).padding(horizontal: 16),
-        // Bottom padding
-        const Gap(16),
-      ],
+            ],
+          ).padding(horizontal: 16),
+          // Bottom padding
+          const Gap(64),
+        ],
+      ),
     );
   }
 }

lib/widgets/unauthorized_hint.dart

@@ -40,6 +40,7 @@ class UnauthorizedHint extends StatelessWidget {
           GoRouter.of(context).pushNamed('authLogin').then((value) {
             if (value == true && context.mounted) {
               final ua = context.read<UserProvider>();
+              ua.refreshUser();
               context.showSnackbar('loginSuccess'.tr(args: [
                 '@${ua.user?.name} (${ua.user?.nick})',
               ]));

lib/widgets/updater.dart

@@ -25,7 +25,7 @@ class VersionUpdatePopup extends StatelessWidget {
 
     if (Platform.isAndroid) {
       final model = UpdateModel(
-        'https://files.solsynth.dev/d/production01/solian/app-arm64-v8a-release.apk',
+        'https://files.solsynth.dev/d/c1/solian/app-arm64-v8a-release.apk',
         'solian-app-release-${config.updatableVersion!}.apk',
         'ic_launcher',
         'https://apps.apple.com/us/app/solian/id6499032345',

macos/Podfile.lock

@@ -17,59 +17,59 @@ PODS:
     - FlutterMacOS
   - file_selector_macos (0.0.1):
     - FlutterMacOS
-  - Firebase/Analytics (11.8.0):
+  - Firebase/Analytics (11.10.0):
     - Firebase/Core
-  - Firebase/Core (11.8.0):
+  - Firebase/Core (11.10.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 11.8.0)
-  - Firebase/CoreOnly (11.8.0):
-    - FirebaseCore (~> 11.8.0)
-  - Firebase/Messaging (11.8.0):
+    - FirebaseAnalytics (~> 11.10.0)
+  - Firebase/CoreOnly (11.10.0):
+    - FirebaseCore (~> 11.10.0)
+  - Firebase/Messaging (11.10.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 11.8.0)
-  - firebase_analytics (11.4.4):
-    - Firebase/Analytics (= 11.8.0)
+    - FirebaseMessaging (~> 11.10.0)
+  - firebase_analytics (11.4.5):
+    - Firebase/Analytics (= 11.10.0)
     - firebase_core
     - FlutterMacOS
-  - firebase_core (3.12.1):
-    - Firebase/CoreOnly (~> 11.8.0)
+  - firebase_core (3.13.0):
+    - Firebase/CoreOnly (~> 11.10.0)
     - FlutterMacOS
-  - firebase_messaging (15.2.4):
-    - Firebase/CoreOnly (~> 11.8.0)
-    - Firebase/Messaging (~> 11.8.0)
+  - firebase_messaging (15.2.5):
+    - Firebase/CoreOnly (~> 11.10.0)
+    - Firebase/Messaging (~> 11.10.0)
     - firebase_core
     - FlutterMacOS
-  - FirebaseAnalytics (11.8.0):
-    - FirebaseAnalytics/AdIdSupport (= 11.8.0)
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseAnalytics (11.10.0):
+    - FirebaseAnalytics/AdIdSupport (= 11.10.0)
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - FirebaseAnalytics/AdIdSupport (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseAnalytics/AdIdSupport (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
-    - GoogleAppMeasurement (= 11.8.0)
+    - GoogleAppMeasurement (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - FirebaseCore (11.8.1):
-    - FirebaseCoreInternal (~> 11.8.0)
+  - FirebaseCore (11.10.0):
+    - FirebaseCoreInternal (~> 11.10.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreInternal (11.8.0):
+  - FirebaseCoreInternal (11.10.0):
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseInstallations (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseInstallations (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseMessaging (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleDataTransport (~> 10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
@@ -92,21 +92,21 @@ PODS:
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
-  - GoogleAppMeasurement (11.8.0):
-    - GoogleAppMeasurement/AdIdSupport (= 11.8.0)
+  - GoogleAppMeasurement (11.10.0):
+    - GoogleAppMeasurement/AdIdSupport (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/AdIdSupport (11.8.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.8.0)
+  - GoogleAppMeasurement/AdIdSupport (11.10.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (11.8.0):
+  - GoogleAppMeasurement/WithoutAdIdSupport (11.10.0):
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
@@ -365,22 +365,22 @@ SPEC CHECKSUMS:
   file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
   file_saver: e35bd97de451dde55ff8c38862ed7ad0f3418d0f
   file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
-  Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
-  firebase_analytics: 2c7864ab677e8a178a6dd4126de1d19e9d9a7bf3
-  firebase_core: 3dcdf8453dfb144a023ee70f49e0463b97177f71
-  firebase_messaging: 96fe41b2f8b5bee4e0f21df8d716cb8c9293448c
-  FirebaseAnalytics: 4fd42def128146e24e480e89f310e3d8534ea42b
-  FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
-  FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
-  FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
-  FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
+  Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
+  firebase_analytics: 5f4b20b5f700bcae2f800c69a63e79d937d0daa9
+  firebase_core: efd50ad8177dc489af1b9163a560359cf1b30597
+  firebase_messaging: acf2566068a55d7eb8cddfee5b094754070a5b88
+  FirebaseAnalytics: 4e42333f02cf78ed93703a5c36f36dd518aebdef
+  FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7
+  FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
+  FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
+  FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9
   flutter_inappwebview_macos: c2d68649f9f8f1831bfcd98d73fd6256366d9d1d
   flutter_timezone: d59eea86178cbd7943cd2431cc2eaa9850f935d8
   flutter_udid: d26e455e8c06174e6aff476e147defc6cae38495
   flutter_webrtc: 377dbcebdde6fed0fc40de87bcaaa2bffcec9a88
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   gal: baecd024ebfd13c441269ca7404792a7152fde89
-  GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896
+  GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   HotKey: 400beb7caa29054ea8d864c96f5ba7e5b4852277

pubspec.lock

@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "7fd72d77a7487c26faab1d274af23fb008763ddc10800261abbfb2c067f183d5"
+      sha256: de9ecbb3ddafd446095f7e833c853aff2fa1682b017921fe63a833f9d6f0e422
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.53"
+    version: "1.3.54"
   analyzer:
     dependency: transitive
     description:
@@ -597,10 +597,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b"
+      sha256: "36a1652d99cb6bf8ccc8b9f43aded1fd60b234d23ce78af422c07f950a436ef7"
       url: "https://pub.dev"
     source: hosted
-    version: "9.2.1"
+    version: "10.0.0"
   file_saver:
     dependency: "direct main"
     description:
@@ -645,34 +645,34 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_analytics
-      sha256: "81a582e9348216fcf6b30878487369325bf78b8ddd752ed176949c8e4fd4aaac"
+      sha256: "2416b9d864412ab7b571dafded801bbcc7e29b5824623c055002d4d0819bea2b"
       url: "https://pub.dev"
     source: hosted
-    version: "11.4.4"
+    version: "11.4.5"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_analytics_platform_interface
-      sha256: "5ae7bd4a551b67009cd0676f5407331b202eaf16e0a80dcf7b40cd0a34a18746"
+      sha256: "3ccf5c876a8bea186016de4bcf53fc1bc6fa01236d740fb501d7ef9be356c58e"
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.4"
+    version: "4.3.5"
   firebase_analytics_web:
     dependency: transitive
     description:
       name: firebase_analytics_web
-      sha256: "15fd7459fea2a00958dbf9b86cd8ad14d3ce2db13950308af7c7717e89ccc5c2"
+      sha256: "5e4e3f001b67c2034b76cb2a42a0eed330fb3a8fb41ad13eceb04e8d9a74f662"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.10+10"
+    version: "0.5.10+11"
   firebase_core:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: f4d8f49574a4e396f34567f3eec4d38ab9c3910818dec22ca42b2a467c685d8b
+      sha256: "017d17d9915670e6117497e640b2859e0b868026ea36bf3a57feb28c3b97debe"
       url: "https://pub.dev"
     source: hosted
-    version: "3.12.1"
+    version: "3.13.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -685,34 +685,34 @@ packages:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: faa5a76f6380a9b90b53bc3bdcb85bc7926a382e0709b9b5edac9f7746651493
+      sha256: "129a34d1e0fb62e2b488d988a1fc26cc15636357e50944ffee2862efe8929b23"
       url: "https://pub.dev"
     source: hosted
-    version: "2.21.1"
+    version: "2.22.0"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: "5fc345c6341f9dc69fd0ffcbf508c784fd6d1b9e9f249587f30434dd8b6aa281"
+      sha256: "5f8918848ee0c8eb172fc7698619b2bcd7dda9ade8b93522c6297dd8f9178356"
       url: "https://pub.dev"
     source: hosted
-    version: "15.2.4"
+    version: "15.2.5"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: a935924cf40925985c8049df4968b1dde5c704f570f3ce380b31d3de6990dd94
+      sha256: "0bbea00680249595fc896e7313a2bd90bd55be6e0abbe8b9a39d81b6b306acb6"
       url: "https://pub.dev"
     source: hosted
-    version: "4.6.4"
+    version: "4.6.5"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: fafebf6a1921931334f3f10edb5037a5712288efdd022881e2d093e5654a2fd4
+      sha256: ffb392ce2a7e8439cd0a9a80e3c702194e73c927e5c7b4f0adf6faa00b245b17
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.4"
+    version: "3.10.5"
   fixnum:
     dependency: transitive
     description:
@@ -794,10 +794,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_context_menu
-      sha256: "4bc1dc30ae5aa705ed99ebbeb875898c6341a6d092397a566fecd5184b392380"
+      sha256: "9a80f3ab623086f6ec89483c24a1129e6b9f30914fdc1219f4af622164a2fb74"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.2.2"
   flutter_expandable_fab:
     dependency: "direct main"
     description:
@@ -1809,10 +1809,10 @@ packages:
     dependency: "direct main"
     description:
       name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
+      sha256: "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
   pub_semver:
     dependency: transitive
     description:
@@ -1945,10 +1945,10 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
+      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -2462,18 +2462,18 @@ packages:
     dependency: transitive
     description:
       name: volume_controller
-      sha256: "4c2a873c242da6ce69ae1d17c256c5626e0c481be1824d6c5fc95e68c31f3b36"
+      sha256: e82fd689bb8e1fe8e64be3fa5946ff8699058f8cf9f4c1679acdba20cda7f5bd
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.2"
+    version: "3.3.3"
   wakelock_plus:
     dependency: "direct main"
     description:
       name: wakelock_plus
-      sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e"
+      sha256: b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.10"
+    version: "1.2.11"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:

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.4.2+86
+version: 2.4.2+89
 
 environment:
   sdk: ^3.5.4
@@ -59,7 +59,7 @@ dependencies:
   relative_time: ^5.0.0
   image_picker: ^1.1.2
   cross_file: ^0.3.4+2
-  file_picker: ^9.2.1
+  file_picker: ^10.0.0
   croppy: ^1.3.1
   flutter_expandable_fab: ^2.3.0
   dropdown_button2: ^2.3.9