Merge pull request 'fix(blackList+notifications): Issue-523, 191' (#636) from mso7nueh/eatvio_app:main into main

Reviewed-on: eatvio/eatvio_app#636
2025-08-11 14:00:25 +00:00
parent ef037eb4d5 dca4b4c471
commit 35b78bdeee
9 changed files with 650 additions and 35 deletions
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -13,6 +13,8 @@ import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.da
 import 'package:eatvio_app/features/chat/presentation/widgets/about_order_button.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart';
 import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
@@ -446,7 +448,27 @@ class _ChatScreenState extends State<ChatScreen> {
                          const SizedBox(width: 8),
                          InkWell(
                            customBorder: const CircleBorder(),
-                            onTap: () {
+                            onTap: () async {
+                              // Проверяем, заблокирован ли пользователь
+                              final blockedUsersCubit = sl<BlockedUsersCubit>();
+                              await blockedUsersCubit.getBlockedUsers();
+                              final blockedState = blockedUsersCubit.state;
+                              
+                              if (blockedState is BlockedUsersStateLoaded) {
+                                final isBlocked = blockedState.profilesList.any((profile) => profile.slug == state.chatRoom.users.receiver.slug);
+                                if (isBlocked) {
+                                  if (context.mounted) {
+                                    ScaffoldMessenger.of(context).showSnackBar(
+                                      const SnackBar(
+                                        content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
+                                        backgroundColor: Colors.red,
+                                      ),
+                                    );
+                                  }
+                                  return;
+                                }
+                              }
+                              
                              if (textEditingController.text.isNotEmpty || pickedFiles.isNotEmpty) {
                                chatRoomCubit.sendMessage(
                                  data: textEditingController.text.isEmpty ? null : textEditingController.text.trim(),
--- a/lib/features/chat/presentation/pages/empty_chat_screen.dart
+++ b/lib/features/chat/presentation/pages/empty_chat_screen.dart
@@ -12,6 +12,8 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';

 class EmptyChatScreen extends StatefulWidget {
  final Author author;
@@ -133,21 +135,45 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                  InkWell(
                    customBorder: const CircleBorder(),
                    onTap: () async {
+                      // Проверяем, заблокирован ли пользователь
+                      final blockedUsersCubit = sl<BlockedUsersCubit>();
+                      await blockedUsersCubit.getBlockedUsers();
+                      final blockedState = blockedUsersCubit.state;
+                      
+                      if (blockedState is BlockedUsersStateLoaded) {
+                        final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+                        if (isBlocked) {
+                          if (context.mounted) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              const SnackBar(
+                                content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
+                                backgroundColor: Colors.red,
+                              ),
+                            );
+                          }
+                          return;
+                        }
+                      }
+                      
                      if (textEditingController.text.isNotEmpty) {
                        await sl<ChatRepository>().sendMessage(
                          data: textEditingController.text.trim(),
                          slug: widget.author.authorSlug,
                        );
-                        setState(() {
-                          textEditingController.clear();
-                        });
+                        if (mounted) {
+                          setState(() {
+                            textEditingController.clear();
+                          });
+                        }
                        final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
-                        AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                          'chatScreen',
-                          extra: {
-                            'uuid': chatIdOrError,
-                          },
-                        );
+                        if (context.mounted) {
+                          AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+                            'chatScreen',
+                            extra: {
+                              'uuid': chatIdOrError,
+                            },
+                          );
+                        }
                      }
                    },
                    child: Ink(
@@ -175,20 +201,44 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
          CupertinoActionSheetAction(
            onPressed: () async {
              Navigator.of(context).pop();
+              
+              // Проверяем, заблокирован ли пользователь
+              final blockedUsersCubit = sl<BlockedUsersCubit>();
+              await blockedUsersCubit.getBlockedUsers();
+              final blockedState = blockedUsersCubit.state;
+              
+              if (blockedState is BlockedUsersStateLoaded) {
+                final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+                if (isBlocked) {
+                  if (context.mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(
+                        content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
+                        backgroundColor: Colors.red,
+                      ),
+                    );
+                  }
+                  return;
+                }
+              }
+              
              final picker = ImagePicker();
-              XFile? image = await picker.pickImage(source: ImageSource.camera);
-              if (image != null) {
+              List<XFile>? images = await picker.pickMultiImage();
+              if (images.isNotEmpty) {
+                List<File> files = images.map((image) => File(image.path)).toList();
                await sl<ChatRepository>().sendMessage(
-                  files: [File(image.path)],
+                  files: files,
                  slug: widget.author.authorSlug,
                );
                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
-                AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                  'chatScreen',
-                  extra: {
-                    'uuid': chatIdOrError,
-                  },
-                );
+                if (mounted) {
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+                    'chatScreen',
+                    extra: {
+                      'uuid': chatIdOrError,
+                    },
+                  );
+                }
              }
            },
            child: const Row(
@@ -211,12 +261,14 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                  slug: widget.author.authorSlug,
                );
                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
-                AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                  'chatScreen',
-                  extra: {
-                    'uuid': chatIdOrError,
-                  },
-                );
+                if (mounted) {
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+                    'chatScreen',
+                    extra: {
+                      'uuid': chatIdOrError,
+                    },
+                  );
+                }
              }
            },
            child: const Row(
@@ -261,12 +313,14 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                  slug: widget.author.authorSlug,
                );
                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
-                AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                  'chatScreen',
-                  extra: {
-                    'uuid': chatIdOrError,
-                  },
-                );
+                if (mounted) {
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+                    'chatScreen',
+                    extra: {
+                      'uuid': chatIdOrError,
+                    },
+                  );
+                }
              }
            },
            child: const Row(