Merge pull request #647 from micahmo/feature/error-improvements

A few improvements to error handling

CHANGELOG.md

@@ -14,6 +14,7 @@
 - Hide the gesture customize hint when the gestures are disabled - contribution from @micahmo
 - Improvements to text post indicator preview - contribution from @micahmo
 - Show taglines with markdown and cycle through all available taglines - contribution from @micahmo
+- Errors blocking users are now shown as toasts - contribution from @micahmo
 
 ### Fixed
 - Handle issue where some deferred comments won't load - contribution from @micahmo

lib/l10n/app_en.arb

@@ -72,5 +72,6 @@
   "successfullyUnblocked": "Successfully unblocked!",
   "successfullyBlocked": "Successfully blocked!",
   "showMore": "Show more",
-  "showLess": "Show less"
+  "showLess": "Show less",
+  "cantBlockAdmin": "You may not block an instance administrator."
 }

lib/l10n/app_es.arb

@@ -72,5 +72,6 @@
   "successfullyUnblocked": "Successfully unblocked!",
   "successfullyBlocked": "Successfully blocked!",
   "showMore": "Show more",
-  "showLess": "Show less"
+  "showLess": "Show less",
+  "cantBlockAdmin": "You may not block an instance administrator."
 }

lib/l10n/app_fi.arb

@@ -72,5 +72,6 @@
   "successfullyUnblocked": "Successfully unblocked!",
   "successfullyBlocked": "Successfully blocked!",
   "showMore": "Show more",
-  "showLess": "Show less"
+  "showLess": "Show less",
+  "cantBlockAdmin": "You may not block an instance administrator."
 }

lib/l10n/app_sv.arb

@@ -72,5 +72,6 @@
   "successfullyUnblocked": "Successfully unblocked!",
   "successfullyBlocked": "Successfully blocked!",
   "showMore": "Show more",
-  "showLess": "Show less"
+  "showLess": "Show less",
+  "cantBlockAdmin": "You may not block an instance administrator."
 }

lib/main.dart

@@ -16,6 +16,7 @@ import 'package:thunder/core/enums/theme_type.dart';
 import 'package:thunder/core/singletons/database.dart';
 import 'package:thunder/core/theme/bloc/theme_bloc.dart';
 import 'package:thunder/core/auth/bloc/auth_bloc.dart';
+import 'package:thunder/utils/global_context.dart';
 
 void main() async {
   WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
@@ -101,6 +102,7 @@ class ThunderApp extends StatelessWidget {
                   theme: theme,
                   darkTheme: darkTheme,
                   debugShowCheckedModeBanner: false,
+                  scaffoldMessengerKey: GlobalContext.scaffoldMessengerKey,
                 ),
               );
             },

lib/user/bloc/user_bloc.dart

@@ -11,6 +11,8 @@ import 'package:thunder/core/models/comment_view_tree.dart';
 import 'package:thunder/core/models/post_view_media.dart';
 import 'package:thunder/core/singletons/lemmy_client.dart';
 import 'package:thunder/utils/comment.dart';
+import 'package:thunder/utils/error_messages.dart';
+import 'package:thunder/utils/global_context.dart';
 import 'package:thunder/utils/post.dart';
 
 part 'user_event.dart';
@@ -432,7 +434,7 @@ class UserBloc extends Bloc<UserEvent, UserState> {
       if (account?.jwt == null) {
         return emit(
           state.copyWith(
-            status: UserStatus.failure,
+            status: UserStatus.failedToBlock,
             errorMessage: 'You are not logged in. Cannot block user.',
             userId: state.userId,
           ),
@@ -453,8 +455,8 @@ class UserBloc extends Bloc<UserEvent, UserState> {
     } catch (e, s) {
       return emit(
         state.copyWith(
-          status: UserStatus.failure,
-          errorMessage: e.toString(),
+          status: UserStatus.failedToBlock,
+          errorMessage: e is LemmyApiException ? getErrorMessage(GlobalContext.context, e.message) : e.toString(),
           personView: state.personView,
         ),
       );

lib/user/bloc/user_state.dart

@@ -1,6 +1,6 @@
 part of 'user_bloc.dart';
 
-enum UserStatus { initial, loading, refreshing, success, empty, failure }
+enum UserStatus { initial, loading, refreshing, success, empty, failure, failedToBlock }
 
 class UserState extends Equatable {
   const UserState({

lib/user/pages/user_page.dart

@@ -7,6 +7,7 @@ import 'package:swipeable_page_route/swipeable_page_route.dart';
 import 'package:thunder/account/utils/profiles.dart';
 import 'package:thunder/community/bloc/community_bloc.dart' as community;
 import 'package:thunder/core/auth/bloc/auth_bloc.dart';
+import 'package:thunder/shared/snackbar.dart';
 import 'package:thunder/user/pages/user_page_success.dart';
 import 'package:thunder/shared/error_message.dart';
 import 'package:thunder/user/bloc/user_bloc.dart';
@@ -125,6 +126,10 @@ class _UserPageState extends State<UserPage> {
         child: BlocBuilder<UserBloc, UserState>(builder: (context, state) {
           userBloc = context.read<UserBloc>();
 
+          if (state.status == UserStatus.failedToBlock) {
+            showSnackbar(context, state.errorMessage ?? AppLocalizations.of(context)!.missingErrorMessage);
+          }
+
           switch (state.status) {
             case UserStatus.initial:
               context.read<UserBloc>().add(GetUserEvent(userId: widget.userId, isAccountUser: widget.isAccountUser, username: widget.username, reset: true));
@@ -134,6 +139,7 @@ class _UserPageState extends State<UserPage> {
               return const Center(child: CircularProgressIndicator());
             case UserStatus.refreshing:
             case UserStatus.success:
+            case UserStatus.failedToBlock:
               return UserPageSuccess(
                 userId: widget.userId,
                 isAccountUser: widget.isAccountUser,

lib/utils/error_messages.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/widgets.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+/// Attempts to retrieve a localized error message for the given [lemmyApiErrorCode].
+/// Returns null if not found.
+String? getErrorMessage(BuildContext context, String lemmyApiErrorCode) {
+  return switch (lemmyApiErrorCode) {
+    "cant_block_admin" => AppLocalizations.of(context)!.cantBlockAdmin,
+    _ => null,
+  };
+}

lib/utils/global_context.dart

@@ -0,0 +1,6 @@
+import 'package:flutter/material.dart';
+
+class GlobalContext {
+  static GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+  static BuildContext get context => scaffoldMessengerKey.currentContext!;
+}