🐛 Fix loading other type of attachments missing authorization header

api/Passport/Give Punishment.bru

@@ -12,8 +12,9 @@ post {
 
 body:json {
   {
-    "reason": "侮辱 Solar Network 商标，煽动颠覆中华羊国政权，制造不实信息，传播谣言，制造恐慌，寻衅滋事。",
-    "type": 0,
+    "reason": "吹哨管理条例 / 滥用吹哨功能，累积三次复核无效吹哨。处以禁用吹哨功能 30 天。",
+    "type": 1,
+    "perm_nodes": {"FlagPost":false},
     "account_id": 5
   }
 }

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/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/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/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';
@@ -228,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);
@@ -240,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) {
@@ -499,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();
 
@@ -508,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_zoom.dart

@@ -373,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((_) {
@@ -403,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((_) {
@@ -416,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/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})',
               ]));