diff --git a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart index 4f83ea35..4a558925 100644 --- a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart +++ b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart @@ -98,6 +98,7 @@ class ChatRoomCubit extends Cubit { privateChatChannel.subscribe(); privateChatChannel.bind('App\\Events\\ChatMessageUpdated').listen((event) { + print(jsonDecode(event.data)); List messagesList = [ ChatMessageModel.fromJson(jsonDecode(event.data)['message']), ...(state as ChatRoomStateLoaded).chatMessages, diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart index 692365b0..25a8fd14 100644 --- a/lib/features/chat/presentation/pages/chat_screen.dart +++ b/lib/features/chat/presentation/pages/chat_screen.dart @@ -236,9 +236,9 @@ class _ChatScreenState extends State { onTap: () { if (textEditingController.text.isNotEmpty) { context.read().sendMessage( - chatId: widget.chatId, - data: textEditingController.text.trim(), - ); + chatId: widget.chatId, + data: textEditingController.text.trim(), + ); setState(() { textEditingController.clear(); }); diff --git a/lib/features/chat/repositories/chat_repository.dart b/lib/features/chat/repositories/chat_repository.dart index 6252ad4c..f249f204 100644 --- a/lib/features/chat/repositories/chat_repository.dart +++ b/lib/features/chat/repositories/chat_repository.dart @@ -21,7 +21,7 @@ class ChatRepository { await chatService.sendMessage( id: chatId, data: data, - mediaData: files, + media_data: files, ); } catch (e) { print(e); diff --git a/lib/features/chat/services/chat_service.dart b/lib/features/chat/services/chat_service.dart index 9a1514f4..49a8f810 100644 --- a/lib/features/chat/services/chat_service.dart +++ b/lib/features/chat/services/chat_service.dart @@ -22,7 +22,7 @@ abstract class ChatService { Future sendMessage({ @Path() required String id, @Part() String? data, - @Part() List? mediaData, + @Part() List? media_data, }); @GET('/api/chat/show/{id}/messages?page={page}') diff --git a/lib/features/chat/services/chat_service.g.dart b/lib/features/chat/services/chat_service.g.dart index e0493dd3..48a9b016 100644 --- a/lib/features/chat/services/chat_service.g.dart +++ b/lib/features/chat/services/chat_service.g.dart @@ -59,7 +59,7 @@ class _ChatService implements ChatService { Future sendMessage({ required String id, String? data, - List? mediaData, + List? media_data, }) async { final _extra = {}; final queryParameters = {}; @@ -72,9 +72,9 @@ class _ChatService implements ChatService { data, )); } - if (mediaData != null) { - _data.files.addAll(mediaData.map((i) => MapEntry( - 'mediaData', + if (media_data != null) { + _data.files.addAll(media_data.map((i) => MapEntry( + 'media_data', MultipartFile.fromFileSync( i.path, filename: i.path.split(Platform.pathSeparator).last, diff --git a/lib/features/feed/presentation/widgets/blog_post_widget.dart b/lib/features/feed/presentation/widgets/blog_post_widget.dart index cea3a496..c75e6056 100644 --- a/lib/features/feed/presentation/widgets/blog_post_widget.dart +++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart @@ -22,11 +22,10 @@ class _BlogPostWidgetState extends State { Widget build(BuildContext context) { return InkWell( borderRadius: BorderRadius.circular(12), - onTap: () => - GoRouter.of(context).pushNamed( - 'blogPostScreen', - extra: widget.feedBlogPostModel, - ), + onTap: () => GoRouter.of(context).pushNamed( + 'blogPostScreen', + extra: widget.feedBlogPostModel, + ), child: Ink( decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), @@ -98,6 +97,7 @@ class _BlogPostWidgetState extends State { tag: baseUrl + '/storage/' + widget.feedBlogPostModel.image, child: CachedNetworkImage( imageUrl: baseUrl + '/storage/' + widget.feedBlogPostModel.image, + errorWidget: (context, str, object) => SizedBox.shrink(), ), ), ), @@ -111,21 +111,19 @@ class _BlogPostWidgetState extends State { _iconButton( icon: Icons.mode_comment_outlined, text: widget.feedBlogPostModel.totalComments.toString(), - onTap: () => - GoRouter.of(context).pushNamed( - 'blogPostScreen', - extra: widget.feedBlogPostModel, - ), + onTap: () => GoRouter.of(context).pushNamed( + 'blogPostScreen', + extra: widget.feedBlogPostModel, + ), ), SizedBox(width: 8), _iconButton( icon: Icons.reply_rounded, - onTap: () => - Share.shareUri( - Uri.parse( - baseUrl + '/ru/blog_post/' + widget.feedBlogPostModel.id.toString(), - ), - ), + onTap: () => Share.shareUri( + Uri.parse( + baseUrl + '/ru/blog_post/' + widget.feedBlogPostModel.id.toString(), + ), + ), ), Spacer(), Icon(