lib/providers/sn_network.dart

@@ -249,11 +249,8 @@ class SnNetworkProvider {
     return null;
   }
 
-  String getAttachmentUrl(String ky, {bool preview = true}) {
+  String getAttachmentUrl(String ky) {
     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/profile_page.dart

@@ -15,7 +15,6 @@ 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';
@@ -458,7 +457,7 @@ class _UserScreenState extends State<UserScreen>
                     ],
                   ).padding(right: 8),
                   if (_account!.profile!.description.isNotEmpty)
-                    const Gap(4)
+                    const Gap(12)
                   else
                     const Gap(8),
                   if (_account!.profile!.description.isNotEmpty)
@@ -504,15 +503,14 @@ class _UserScreenState extends State<UserScreen>
                       ],
                     ).padding(vertical: 8, horizontal: 12),
                   ),
-                  if (_account!.badges.isNotEmpty) const Gap(8),
+                  const Gap(8),
-                  if (_account!.badges.isNotEmpty)
+                  Wrap(
-                    Wrap(
+                    spacing: 4,
-                      spacing: 4,
+                    runSpacing: 4,
-                      runSpacing: 4,
+                    children: _account!.badges
-                      children: _account!.badges
+                        .map((ele) => AccountBadge(badge: ele))
-                          .map((ele) => AccountBadge(badge: ele))
+                        .toList(),
-                          .toList(),
+                  ).padding(horizontal: 8),
-                    ).padding(horizontal: 8),
                   const Gap(8),
                   Column(
                     children: [
@@ -621,17 +619,6 @@ 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,7 +107,74 @@ class _PunishmentsScreenState extends State<PunishmentsScreen> {
                 itemCount: _punishments?.length ?? 0,
                 itemBuilder: (context, index) {
                   final ele = _punishments![index];
-                  return PunishmentInfoCard(ele: ele);
+                  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),
+                  );
                 },
                 separatorBuilder: (_, __) => const Gap(8),
               ),
@@ -118,82 +185,3 @@ 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/types/account.dart

@@ -22,7 +22,6 @@ 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,7 +29,6 @@ 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;
@@ -70,8 +69,6 @@ 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) ||
@@ -102,7 +99,6 @@ mixin _$SnAccount {
         language,
         profile,
         const DeepCollectionEquality().hash(badges),
-        const DeepCollectionEquality().hash(punishments),
         suspendedAt,
         affiliatedId,
         affiliatedTo,
@@ -112,7 +108,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, punishments: $punishments, 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, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
   }
 }
 
@@ -136,7 +132,6 @@ abstract mixin class $SnAccountCopyWith<$Res> {
       String language,
       SnAccountProfile? profile,
       List<SnAccountBadge> badges,
-      List<SnPunishment> punishments,
       DateTime? suspendedAt,
       int? affiliatedId,
       int? affiliatedTo,
@@ -172,7 +167,6 @@ 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,
@@ -236,10 +230,6 @@ 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
@@ -296,7 +286,6 @@ 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,
@@ -305,7 +294,6 @@ class _SnAccount extends SnAccount {
       : _contacts = contacts,
         _permNodes = permNodes,
         _badges = badges,
-        _punishments = punishments,
         super._();
   factory _SnAccount.fromJson(Map<String, dynamic> json) =>
       _$SnAccountFromJson(json);
@@ -362,15 +350,6 @@ 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
@@ -422,8 +401,6 @@ 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) ||
@@ -454,7 +431,6 @@ class _SnAccount extends SnAccount {
         language,
         profile,
         const DeepCollectionEquality().hash(_badges),
-        const DeepCollectionEquality().hash(_punishments),
         suspendedAt,
         affiliatedId,
         affiliatedTo,
@@ -464,7 +440,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, punishments: $punishments, 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, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
   }
 }
 
@@ -491,7 +467,6 @@ abstract mixin class _$SnAccountCopyWith<$Res>
       String language,
       SnAccountProfile? profile,
       List<SnAccountBadge> badges,
-      List<SnPunishment> punishments,
       DateTime? suspendedAt,
       int? affiliatedId,
       int? affiliatedTo,
@@ -528,7 +503,6 @@ 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,
@@ -592,10 +566,6 @@ 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,10 +32,6 @@ _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),
@@ -61,7 +57,6 @@ 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,151 +22,142 @@ class AccountPopoverCard extends StatelessWidget {
   Widget build(BuildContext context) {
     final sn = context.read<SnNetworkProvider>();
 
-    return SingleChildScrollView(
+    return Column(
-      child: Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
-        crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisSize: MainAxisSize.min,
-        children: [
+      children: [
-          if (data.banner.isNotEmpty)
+        if (data.banner.isNotEmpty)
-            ClipRRect(
+          Container(
-              borderRadius: BorderRadius.circular(16),
+            color: Theme.of(context).colorScheme.surfaceContainer,
-              child: Container(
+            child: AspectRatio(
-                color: Theme.of(context).colorScheme.surfaceContainer,
+              aspectRatio: 16 / 7,
-                child: AspectRatio(
+              child: AutoResizeUniversalImage(
-                  aspectRatio: 16 / 7,
+                sn.getAttachmentUrl(data.banner),
-                  child: AutoResizeUniversalImage(
+                fit: BoxFit.cover,
-                    sn.getAttachmentUrl(data.banner),
-                    fit: BoxFit.cover,
-                  ),
-                ),
               ),
-            ).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(
-                    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
+        // Top padding
-          const Gap(64),
+        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).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),
+        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(),
+                ),
+                if (status != null &&
+                    !status.isOnline &&
+                    status.lastSeenAt != null)
+                  Text(
+                    'accountStatusLastSeen'.tr(args: [
+                      status.lastSeenAt != null
+                          ? RelativeTime(context).format(
+                              status.lastSeenAt!.toLocal(),
+                            )
+                          : 'unknown',
+                    ]),
+                  ).padding(left: 6).opacity(0.75),
+              ],
+            ).padding(horizontal: 24);
+          },
+        ),
+        // Bottom padding
+        const Gap(16),
+      ],
     );
   }
 }

lib/widgets/attachment/attachment_list.dart

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

lib/widgets/attachment/attachment_zoom.dart

@@ -181,10 +181,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                             scaleState == PhotoViewScaleState.initial);
                       },
                       imageProvider: UniversalImage.provider(
-                        sn.getAttachmentUrl(
+                        sn.getAttachmentUrl(widget.data.first.rid),
-                          widget.data.first.rid,
-                          preview: false,
-                        ),
                       ),
                     ),
                   );
@@ -202,10 +199,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                         widget.heroTags?.elementAt(idx) ?? uuid.v4();
                     return PhotoViewGalleryPageOptions(
                       imageProvider: UniversalImage.provider(
-                        sn.getAttachmentUrl(
+                        sn.getAttachmentUrl(widget.data.elementAt(idx).rid),
-                          widget.data.elementAt(idx).rid,
-                          preview: false,
-                        ),
                       ),
                       heroAttributes: PhotoViewHeroAttributes(
                         tag: 'attachment-${widget.data.first.rid}-$heroTag',

lib/widgets/chat/chat_message.dart

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

lib/widgets/post/post_item.dart

@@ -12,6 +12,7 @@ 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';
@@ -1273,11 +1274,20 @@ class _PostAvatar extends StatelessWidget {
               ),
             ),
       onTap: () {
-        showModalBottomSheet(
+        showPopover(
+          backgroundColor: Theme.of(context).colorScheme.surface,
           context: context,
-          builder: (context) => PublisherPopoverCard(
+          transition: PopoverTransition.other,
-            data: data.publisher,
+          bodyBuilder: (context) => SizedBox(
+            width: math.min(400, MediaQuery.of(context).size.width - 10),
+            child: PublisherPopoverCard(
+              data: data.publisher,
+            ),
           ),
+          direction: PopoverDirection.bottom,
+          arrowHeight: 5,
+          arrowWidth: 15,
+          arrowDxOffset: -190,
         );
       },
     );

lib/widgets/post/publisher_popover.dart

@@ -24,137 +24,125 @@ class PublisherPopoverCard extends StatelessWidget {
 
     final user = data.type == 0 ? ud.getFromCache(data.accountId) : null;
 
-    return SingleChildScrollView(
+    return Column(
-      child: Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
-        crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisSize: MainAxisSize.min,
-        children: [
+      children: [
-          if (data.banner.isNotEmpty)
+        if (data.banner.isNotEmpty)
-            ClipRRect(
+          Container(
-              borderRadius: BorderRadius.circular(16),
+            color: Theme.of(context).colorScheme.surfaceContainer,
-              child: Container(
+            child: AspectRatio(
-                color: Theme.of(context).colorScheme.surfaceContainer,
+              aspectRatio: 16 / 7,
-                child: AspectRatio(
+              child: AutoResizeUniversalImage(
-                  aspectRatio: 16 / 7,
+                sn.getAttachmentUrl(data.banner),
-                  child: AutoResizeUniversalImage(
+                fit: BoxFit.cover,
-                    sn.getAttachmentUrl(data.banner),
-                    fit: BoxFit.cover,
-                  ),
-                ),
               ),
-            ).padding(all: 16)
+            ),
-          else
+          ),
-            // Top padding
+        // Top padding
+        Gap(16),
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            AccountImage(
+              content: data.avatar,
+              radius: 20,
+              borderRadius: data.type == 1 ? 8 : 20,
+            ),
             Gap(16),
-          Row(
+            Expanded(
-            crossAxisAlignment: CrossAxisAlignment.start,
+              child: Column(
-            children: [
+                crossAxisAlignment: CrossAxisAlignment.start,
-              AccountImage(
+                mainAxisSize: MainAxisSize.min,
-                content: data.avatar,
+                children: [
-                radius: 20,
+                  Text(data.nick).bold(),
-                borderRadius: data.type == 1 ? 8 : 20,
+                  Text('@${data.name}').fontSize(13).opacity(0.75),
+                ],
               ),
-              Gap(16),
+            ),
-              Expanded(
+            IconButton(
-                child: Column(
+              onPressed: () {
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                Navigator.pop(context);
-                  mainAxisSize: MainAxisSize.min,
+                GoRouter.of(context).pushNamed(
-                  children: [
+                  'postPublisher',
-                    Text(data.nick).bold(),
+                  pathParameters: {'name': data.name},
-                    Text('@${data.name}').fontSize(13).opacity(0.75),
+                );
-                  ],
+              },
-                ),
+              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()),
+                ],
               ),
-              IconButton(
+            ),
-                onPressed: () {
+            SizedBox(
-                  Navigator.pop(context);
+              height: 20,
-                  GoRouter.of(context).pushNamed(
+              child: const VerticalDivider(
-                    'postPublisher',
+                thickness: 1,
-                    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: 8),
-            ],
+            Expanded(
-          ).padding(horizontal: 16),
+              child: Column(
-          if (user != null && user.badges.isNotEmpty)
+                mainAxisSize: MainAxisSize.min,
-            Wrap(
+                crossAxisAlignment: CrossAxisAlignment.center,
-              spacing: 4,
+                children: [
-              children: user.badges
+                  Text('publisherTotalUpvote').tr().fontSize(13).opacity(0.75),
-                  .map(
+                  Text(data.totalUpvote.toString()),
-                    (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,
+            SizedBox(
-                child: const VerticalDivider(
+              height: 20,
-                  thickness: 1,
+              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()),
-                  ],
-                ),
               ),
-              SizedBox(
+            ).padding(horizontal: 8),
-                height: 20,
+            Expanded(
-                child: const VerticalDivider(
+              child: Column(
-                  thickness: 1,
+                mainAxisSize: MainAxisSize.min,
-                ),
+                crossAxisAlignment: CrossAxisAlignment.center,
-              ).padding(horizontal: 8),
+                children: [
-              Expanded(
+                  Text('publisherTotalDownvote')
-                child: Column(
+                      .tr()
-                  mainAxisSize: MainAxisSize.min,
+                      .fontSize(13)
-                  crossAxisAlignment: CrossAxisAlignment.center,
+                      .opacity(0.75),
-                  children: [
+                  Text(data.totalDownvote.toString()),
-                    Text('publisherTotalDownvote')
+                ],
-                        .tr()
-                        .fontSize(13)
-                        .opacity(0.75),
-                    Text(data.totalDownvote.toString()),
-                  ],
-                ),
               ),
-            ],
+            ),
-          ).padding(horizontal: 16),
+          ],
-          // Bottom padding
+        ).padding(horizontal: 16),
-          const Gap(64),
+        // Bottom padding
-        ],
+        const Gap(16),
-      ),
+      ],
     );
   }
 }