feat: add endReached flag and created/archived system messages (#175)

2paperstar · web-flow · commit 74eef9997520 · 2025-10-11T07:21:58.000Z
diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
@@ -45,7 +45,6 @@ platform :android do
     end
 
     upload_to_play_store(
-      release_status: "draft",  # TODO: remove this when ready
       aab: "../build/app/outputs/bundle/release/app-release.aab",
       track: "internal",
       version_name: version_string,
@@ -57,15 +56,20 @@ platform :android do
       skip_upload_images: true,
       skip_upload_screenshots: true,
     )
-    # TODO: uncomment this when ready
-    # internal_app_url = upload_to_play_store_internal_app_sharing(
-    #   aab: "../build/app/outputs/bundle/release/app-release.aab",
-    # )
+    begin
+      internal_app_url = upload_to_play_store_internal_app_sharing(
+        aab: "../build/app/outputs/bundle/release/app-release.aab",
+      )
+    rescue => e
+      UI.message("Error during internal app sharing upload: #{e.message}")
+      internal_app_url = "Failed"
+    end
+    
     slack(
       payload: {
         "Build Date" => Time.now.to_s,
         "Build Number" => build_number,
-        # "Internal App" => "<#{internal_app_url}>",
+        "Internal App" => internal_app_url == "Failed" ? "Failed" : "<#{internal_app_url}>",
       }
     ) if ENV['CI']
   end
diff --git a/assets/i18n/en.i18n.json b/assets/i18n/en.i18n.json
@@ -141,14 +141,21 @@
   },
   "chat_room": {
     "system_messages": {
+      "created": {
+        "description": "$user created the pot."
+      },
       "user_in": {
         "description": "$user joined the pot."
       },
       "user_leave": {
-        "description": "$user left the pot."
+        "description": "$user left the pot.",
+        "description_with_aux_user": "$user left the pot. $aux_user is now the host."
       },
       "user_kicked": {
         "description": "$user was kicked from the pot."
+      },
+      "archived": {
+        "description": "The pot has been archived."
       }
     },
     "fofo": {
diff --git a/assets/i18n/ko.i18n.json b/assets/i18n/ko.i18n.json
@@ -138,14 +138,21 @@
   },
   "chat_room": {
     "system_messages": {
+      "created": {
+        "description": "$user 님이 팟을 생성하셨습니다"
+      },
       "user_in": {
         "description": "$user 님이 입장하셨습니다"
       },
       "user_leave": {
-        "description": "$user 님이 나갔습니다"
+        "description": "$user 님이 나갔습니다",
+        "description_with_aux_user": "$user 님이 나갔습니다. $aux_user 님이 방장이 되었습니다"
       },
       "user_kicked": {
         "description": "$user 님이 팟에서 제외되었습니다"
+      },
+      "archived": {
+        "description": "팟이 해산되었습니다"
       }
     },
     "fofo": {
diff --git a/lib/app/modules/chat/data/models/system_message_model.dart b/lib/app/modules/chat/data/models/system_message_model.dart
@@ -11,7 +11,8 @@ sealed class SystemMessageModel
     implements SystemMessageEntity {
   const factory SystemMessageModel({
     required SystemMessageType type,
-    required PotUserEntity relatedUser,
+    PotUserEntity? relatedUser,
+    PotUserEntity? auxRelatedUser,
     @dateTimeConverter required DateTime createdAt,
   }) = _SystemMessageModel;
 }
diff --git a/lib/app/modules/chat/data/repositories/websocket_chat_repository.dart b/lib/app/modules/chat/data/repositories/websocket_chat_repository.dart
@@ -10,7 +10,9 @@ import 'package:pot_g/app/modules/chat/domain/repositories/chat_repository.dart'
 import 'package:pot_g/app/modules/socket/data/data_sources/websocket.dart';
 import 'package:pot_g/app/modules/socket/data/models/events/pot_event_model.dart';
 import 'package:pot_g/app/modules/socket/data/models/events/send_chat_response_model.dart';
+import 'package:pot_g/app/modules/socket/data/models/pot_events/archive_v1_event.dart';
 import 'package:pot_g/app/modules/socket/data/models/pot_events/chat_v1_event.dart';
+import 'package:pot_g/app/modules/socket/data/models/pot_events/create_v1_event.dart';
 import 'package:pot_g/app/modules/socket/data/models/pot_events/popo_chat_v1_event.dart';
 import 'package:pot_g/app/modules/socket/data/models/pot_events/user_in_v1_event.dart';
 import 'package:pot_g/app/modules/socket/data/models/pot_events/user_kick_v1_event.dart';
@@ -19,48 +21,72 @@ import 'package:pot_g/app/modules/socket/data/models/requests/send_chat_model.da
 
 bool _isChatEvent(PotEventModel e) {
   return e is PotEventModel<ChatV1Event> ||
+      e is PotEventModel<CreateV1Event> ||
       e is PotEventModel<UserInV1Event> ||
       e is PotEventModel<UserLeaveV1Event> ||
       e is PotEventModel<UserKickV1Event> ||
-      e is PotEventModel<PopoChatV1Event>;
+      e is PotEventModel<PopoChatV1Event> ||
+      e is PotEventModel<ArchiveV1Event>;
 }
 
 String? _getRelatedUserId(PotEventModel e) {
   return switch (e) {
     PotEventModel<ChatV1Event>() => e.data.from,
+    PotEventModel<CreateV1Event>() => e.data.createdBy,
     PotEventModel<UserInV1Event>() => e.data.userPk,
     PotEventModel<UserLeaveV1Event>() => e.data.userPk,
     PotEventModel<UserKickV1Event>() => e.data.kickedUserPk,
     PotEventModel<PopoChatV1Event>() => null,
+    PotEventModel<ArchiveV1Event>() => null,
     _ => throw StateError('Unknown event type'),
   };
 }
 
+String? _getAuxRelatedUserId(PotEventModel e) {
+  return switch (e) {
+    PotEventModel<UserLeaveV1Event>() => e.data.hostChangedTo,
+    _ => null,
+  };
+}
+
 Sendable _makeChatEntity(PotEventModel e, PotInfoEntity pot) {
   final users = pot.usersInfo.users;
   final user = users.firstWhereOrNull((u) => u.id == _getRelatedUserId(e));
+  final auxUser = users.firstWhereOrNull(
+    (u) => u.id == _getAuxRelatedUserId(e),
+  );
   return switch (e) {
     PotEventModel<ChatV1Event>() => ChatModel(
       message: e.data.content,
       user: user!,
       createdAt: e.timestamp,
     ),
+    PotEventModel<CreateV1Event>() => SystemMessageModel(
+      type: SystemMessageType.created,
+      relatedUser: user,
+      createdAt: e.timestamp,
+    ),
     PotEventModel<UserInV1Event>() => SystemMessageModel(
       type: SystemMessageType.userIn,
-      relatedUser: user!,
+      relatedUser: user,
       createdAt: e.timestamp,
     ),
     PotEventModel<UserLeaveV1Event>() => SystemMessageModel(
       type: SystemMessageType.userLeave,
-      relatedUser: user!,
+      relatedUser: user,
+      auxRelatedUser: auxUser,
       createdAt: e.timestamp,
     ),
     PotEventModel<UserKickV1Event>() => SystemMessageModel(
       type: SystemMessageType.userKicked,
-      relatedUser: user!,
+      relatedUser: user,
       createdAt: e.timestamp,
     ),
     PotEventModel<PopoChatV1Event>() => e.data.toEntity(e.timestamp),
+    PotEventModel<ArchiveV1Event>() => SystemMessageModel(
+      type: SystemMessageType.archived,
+      createdAt: e.timestamp,
+    ),
     _ => throw StateError('Unknown event type'),
   };
 }
diff --git a/lib/app/modules/chat/domain/entities/chat_entity.dart b/lib/app/modules/chat/domain/entities/chat_entity.dart
@@ -11,11 +11,12 @@ abstract class ChatEntity implements Sendable {
   PotUserEntity get user;
 }
 
-enum SystemMessageType { userIn, userLeave, userKicked }
+enum SystemMessageType { userIn, userLeave, userKicked, created, archived }
 
 abstract class SystemMessageEntity implements Sendable {
   SystemMessageType get type;
-  PotUserEntity get relatedUser;
+  PotUserEntity? get relatedUser;
+  PotUserEntity? get auxRelatedUser;
 }
 
 abstract class FofoChatEntity implements Sendable {
diff --git a/lib/app/modules/chat/presentation/bloc/chat_bloc.dart b/lib/app/modules/chat/presentation/bloc/chat_bloc.dart
@@ -31,11 +31,16 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
     _completer.complete();
     try {
       final chats = await _chatRepository.getChats(_pot, DateTime.now());
-      emit(ChatState.loaded(chats.reversed.toList()));
+      emit(
+        ChatState.loaded(chats.reversed.toList(), endReached: chats.isEmpty),
+      );
       return emit.forEach(
         _chatRepository.getChatsStream(_pot),
         onData: (chat) {
-          return ChatState.loaded([chat, ...state.chats]);
+          return ChatState.loaded([
+            chat,
+            ...state.chats,
+          ], endReached: state.endReached);
         },
       );
     } catch (e) {
@@ -61,10 +66,17 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
     await _completer.future;
     await _mutex.acquire();
     try {
+      if (state.endReached) return;
+      if (state.chats.isEmpty) return;
       emit(ChatState.loading(state.chats));
       final lastChat = state.chats.last;
       final chats = await _chatRepository.getChats(_pot, lastChat.createdAt);
-      emit(ChatState.loaded([...state.chats, ...chats.reversed]));
+      emit(
+        ChatState.loaded([
+          ...state.chats,
+          ...chats.reversed,
+        ], endReached: chats.isEmpty),
+      );
     } finally {
       _mutex.release();
     }
@@ -85,7 +97,10 @@ sealed class ChatState with _$ChatState {
       ChatInitial;
   const factory ChatState.loading([@Default([]) List<Sendable> chats]) =
       ChatLoading;
-  const factory ChatState.loaded(List<Sendable> chats) = ChatLoaded;
+  const factory ChatState.loaded(
+    List<Sendable> chats, {
+    @Default(false) bool endReached,
+  }) = ChatLoaded;
   const factory ChatState.error(List<Sendable> chats, String message) =
       ChatError;
 
@@ -98,4 +113,8 @@ sealed class ChatState with _$ChatState {
     ChatError(:final message) => message,
     _ => null,
   };
+  bool get endReached => switch (this) {
+    ChatLoaded(:final endReached) => endReached,
+    _ => false,
+  };
 }
diff --git a/lib/app/modules/chat/presentation/pages/chat_room_page.dart b/lib/app/modules/chat/presentation/pages/chat_room_page.dart
@@ -100,7 +100,7 @@ class _Layout extends StatelessWidget {
     final pot = state.pot!;
     final disabled = state.isArchived;
     return Scaffold(
-      backgroundColor: disabled ? Palette.borderGrey : null,
+      backgroundColor: disabled ? const Color(0xfff0f0f0) : null,
       appBar: PotAppBar(title: Text(pot.name)),
       onEndDrawerChanged: (value) {
         if (value) {
@@ -238,11 +238,14 @@ class _ChatListState extends State<_ChatList> {
   @override
   void initState() {
     super.initState();
-    _controller.addListener(() {
-      if (_controller.position.pixels >= _controller.position.maxScrollExtent) {
-        context.read<ChatBloc>().add(ChatLoadMore());
-      }
-    });
+    _controller.addListener(_onScroll);
+  }
+
+  void _onScroll() {
+    if (!_controller.hasClients) return;
+    if (_controller.position.pixels >= _controller.position.maxScrollExtent) {
+      context.read<ChatBloc>().add(ChatLoadMore());
+    }
   }
 
   @override
@@ -253,7 +256,12 @@ class _ChatListState extends State<_ChatList> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<ChatBloc, ChatState>(
+    return BlocConsumer<ChatBloc, ChatState>(
+      listener: (context, state) {
+        if (!state.endReached && !state.isLoading) {
+          _onScroll();
+        }
+      },
       builder: (context, state) {
         bool isLast(int index) {
           final chat = state.chats[index];
@@ -267,6 +275,7 @@ class _ChatListState extends State<_ChatList> {
         }
 
         return ListView.separated(
+          physics: const AlwaysScrollableScrollPhysics(),
           controller: _controller,
           reverse: true,
           padding: const EdgeInsets.all(12) - EdgeInsets.only(right: 6),
diff --git a/lib/app/modules/chat/presentation/widgets/system_message.dart b/lib/app/modules/chat/presentation/widgets/system_message.dart
@@ -13,15 +13,25 @@ class SystemMessage extends StatelessWidget {
   Widget build(BuildContext context) {
     final trans = context.t.chat_room.system_messages;
     final text = switch (message.type) {
-      SystemMessageType.userIn => trans.user_in.description(
-        user: message.relatedUser.name,
+      SystemMessageType.created => trans.created.description(
+        user: message.relatedUser?.name ?? 'Unknown',
       ),
-      SystemMessageType.userLeave => trans.user_leave.description(
-        user: message.relatedUser.name,
+      SystemMessageType.userIn => trans.user_in.description(
+        user: message.relatedUser?.name ?? 'Unknown',
       ),
+      SystemMessageType.userLeave =>
+        message.auxRelatedUser == null
+            ? trans.user_leave.description(
+              user: message.relatedUser?.name ?? 'Unknown',
+            )
+            : trans.user_leave.description_with_aux_user(
+              user: message.relatedUser?.name ?? 'Unknown',
+              aux_user: message.auxRelatedUser!.name,
+            ),
       SystemMessageType.userKicked => trans.user_kicked.description(
-        user: message.relatedUser.name,
+        user: message.relatedUser?.name ?? 'Unknown',
       ),
+      SystemMessageType.archived => trans.archived.description,
     };
     return Container(
       padding: const EdgeInsets.symmetric(vertical: 8),
diff --git a/lib/app/modules/socket/data/models/converter/server_converter.dart b/lib/app/modules/socket/data/models/converter/server_converter.dart
@@ -7,6 +7,7 @@ import 'package:pot_g/app/modules/socket/data/models/pot_events/accounting_confi
 import 'package:pot_g/app/modules/socket/data/models/pot_events/accounting_request_v1_event.dart';
 import 'package:pot_g/app/modules/socket/data/models/pot_events/archive_v1_event.dart';
 import 'package:pot_g/app/modules/socket/data/models/pot_events/chat_v1_event.dart';
+import 'package:pot_g/app/modules/socket/data/models/pot_events/create_v1_event.dart';
 import 'package:pot_g/app/modules/socket/data/models/pot_events/departure_confirm_v1_event.dart';
 import 'package:pot_g/app/modules/socket/data/models/pot_events/popo_chat_v1_event.dart';
 import 'package:pot_g/app/modules/socket/data/models/pot_events/user_in_v1_event.dart';
@@ -45,8 +46,7 @@ BaseServerMessageModel<T> convertServerMessage<
   );
   final data = switch (type) {
     'pot_event_receive' => switch (jsonData['body']['event_type']) {
-      // TODO: handle create_v1 event
-      'create_v1' => pe(ArchiveV1Event.fromJson),
+      'create_v1' => pe(CreateV1Event.fromJson),
       'chat_v1' => pe(ChatV1Event.fromJson),
       'popo_chat_v1' => pe(PopoChatV1Event.fromJson),
       'user_in_v1' => pe(UserInV1Event.fromJson),
diff --git a/lib/app/modules/socket/data/models/pot_events/create_v1_event.dart b/lib/app/modules/socket/data/models/pot_events/create_v1_event.dart
@@ -0,0 +1,13 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:pot_g/app/modules/socket/data/models/events/pot_event_model.dart';
+
+part 'create_v1_event.freezed.dart';
+part 'create_v1_event.g.dart';
+
+@Freezed(toJson: false)
+sealed class CreateV1Event with _$CreateV1Event implements PotEvent {
+  const factory CreateV1Event({required String createdBy}) = _CreateV1Event;
+
+  factory CreateV1Event.fromJson(Map<String, dynamic> json) =>
+      _$CreateV1EventFromJson(json);
+}
diff --git a/lib/app/modules/socket/data/models/pot_events/user_leave_v1_event.dart b/lib/app/modules/socket/data/models/pot_events/user_leave_v1_event.dart
@@ -6,7 +6,10 @@ part 'user_leave_v1_event.g.dart';
 
 @Freezed(toJson: false)
 sealed class UserLeaveV1Event with _$UserLeaveV1Event implements PotEvent {
-  const factory UserLeaveV1Event({required String userPk}) = _UserLeaveV1Event;
+  const factory UserLeaveV1Event({
+    required String userPk,
+    required String? hostChangedTo,
+  }) = _UserLeaveV1Event;
 
   factory UserLeaveV1Event.fromJson(Map<String, dynamic> json) =>
       _$UserLeaveV1EventFromJson(json);

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@ abstract class ChatEntity implements Sendable {`
`11`	`11`	`PotUserEntity get user;`
`12`	`12`	`}`
`13`	`13`
`14`		`-enum SystemMessageType { userIn, userLeave, userKicked }`
	`14`	`+enum SystemMessageType { userIn, userLeave, userKicked, created, archived }`
`15`	`15`
`16`	`16`	`abstract class SystemMessageEntity implements Sendable {`
`17`	`17`	`SystemMessageType get type;`
`18`		`- PotUserEntity get relatedUser;`
	`18`	`+ PotUserEntity? get relatedUser;`
	`19`	`+ PotUserEntity? get auxRelatedUser;`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`abstract class FofoChatEntity implements Sendable {`