diff --git a/packages/dart_client/lib/src/api/channel.dart b/packages/dart_client/lib/src/api/channel.dart index d8ef1a03..01911b83 100644 --- a/packages/dart_client/lib/src/api/channel.dart +++ b/packages/dart_client/lib/src/api/channel.dart @@ -183,7 +183,7 @@ class Channel { user: _client.state.user, id: messageId, quotedMessage: quotedMessage, - status: MessageSendingStatus.SENDING, + status: MessageSendingStatus.sending, ); if (message.parentId != null && message.id == null) { @@ -978,7 +978,7 @@ class ChannelClientState { [...messages, ...threads.values.expand((v) => v)] .where((message) => message.status != null && - message.status != MessageSendingStatus.SENT && + message.status != MessageSendingStatus.sent && message.createdAt.isBefore(DateTime.now().subtract(Duration( seconds: 1, )))) diff --git a/packages/dart_client/lib/src/api/retry_queue.dart b/packages/dart_client/lib/src/api/retry_queue.dart index 12e8377a..376854af 100644 --- a/packages/dart_client/lib/src/api/retry_queue.dart +++ b/packages/dart_client/lib/src/api/retry_queue.dart @@ -113,30 +113,30 @@ class RetryQueue { } void _sendFailedEvent(Message message) { - final newStatus = message.status == MessageSendingStatus.SENDING - ? MessageSendingStatus.FAILED - : (message.status == MessageSendingStatus.UPDATING - ? MessageSendingStatus.FAILED_UPDATE - : MessageSendingStatus.FAILED_DELETE); + final newStatus = message.status == MessageSendingStatus.sending + ? MessageSendingStatus.failed + : (message.status == MessageSendingStatus.updating + ? MessageSendingStatus.failed_update + : MessageSendingStatus.failed_delete); channel.state.addMessage(message.copyWith( status: newStatus, )); } Future _sendMessage(Message message) async { - if (message.status == MessageSendingStatus.FAILED_UPDATE || - message.status == MessageSendingStatus.UPDATING) { + if (message.status == MessageSendingStatus.failed_update || + message.status == MessageSendingStatus.updating) { await channel.client.updateMessage( message, channel.cid, ); - } else if (message.status == MessageSendingStatus.FAILED || - message.status == MessageSendingStatus.SENDING) { + } else if (message.status == MessageSendingStatus.failed || + message.status == MessageSendingStatus.sending) { await channel.sendMessage( message, ); - } else if (message.status == MessageSendingStatus.FAILED_DELETE || - message.status == MessageSendingStatus.DELETING) { + } else if (message.status == MessageSendingStatus.failed_delete || + message.status == MessageSendingStatus.deleting) { await channel.client.deleteMessage( message, channel.cid, @@ -152,15 +152,15 @@ class RetryQueue { messageList.indexWhere((m) => m.id == event.message.id); if (messageIndex == -1 && [ - MessageSendingStatus.FAILED_UPDATE, - MessageSendingStatus.FAILED, - MessageSendingStatus.FAILED_DELETE, + MessageSendingStatus.failed_update, + MessageSendingStatus.failed, + MessageSendingStatus.failed_delete, ].contains(event.message.status)) { logger?.info('add message from events'); add([event.message]); } else if (messageIndex != -1 && [ - MessageSendingStatus.SENT, + MessageSendingStatus.sent, null, ].contains(event.message.status)) { _messageQueue.remove(messageList[messageIndex]); @@ -184,16 +184,16 @@ class RetryQueue { static DateTime _getMessageDate(Message m1) { switch (m1.status) { - case MessageSendingStatus.FAILED_DELETE: - case MessageSendingStatus.DELETING: + case MessageSendingStatus.failed_delete: + case MessageSendingStatus.deleting: return m1.deletedAt; - case MessageSendingStatus.FAILED: - case MessageSendingStatus.SENDING: + case MessageSendingStatus.failed: + case MessageSendingStatus.sending: return m1.createdAt; - case MessageSendingStatus.FAILED_UPDATE: - case MessageSendingStatus.UPDATING: + case MessageSendingStatus.failed_update: + case MessageSendingStatus.updating: return m1.updatedAt; default: return null; diff --git a/packages/dart_client/lib/src/client.dart b/packages/dart_client/lib/src/client.dart index 09ea4232..bb026ee7 100644 --- a/packages/dart_client/lib/src/client.dart +++ b/packages/dart_client/lib/src/client.dart @@ -1198,7 +1198,7 @@ class Client { String cid, ]) async { message = message.copyWith( - status: MessageSendingStatus.UPDATING, + status: MessageSendingStatus.updating, updatedAt: message.updatedAt ?? DateTime.now(), ); @@ -1229,10 +1229,10 @@ class Client { /// Deletes the given message Future deleteMessage(Message message, [String cid]) async { - if (message.status == MessageSendingStatus.FAILED) { + if (message.status == MessageSendingStatus.failed) { state.channels[cid].state.addMessage(message.copyWith( type: 'deleted', - status: MessageSendingStatus.SENT, + status: MessageSendingStatus.sent, )); return EmptyResponse(); } @@ -1240,7 +1240,7 @@ class Client { try { message = message.copyWith( type: 'deleted', - status: MessageSendingStatus.DELETING, + status: MessageSendingStatus.deleting, deletedAt: message.deletedAt ?? DateTime.now(), ); @@ -1252,7 +1252,7 @@ class Client { if (state?.channels != null) { state.channels[cid]?.state - ?.addMessage(message.copyWith(status: MessageSendingStatus.SENT)); + ?.addMessage(message.copyWith(status: MessageSendingStatus.sent)); } return decode(response.data, EmptyResponse.fromJson); diff --git a/packages/dart_client/lib/src/db/models.part.dart b/packages/dart_client/lib/src/db/models.part.dart index 98fced53..9a8c5e8e 100644 --- a/packages/dart_client/lib/src/db/models.part.dart +++ b/packages/dart_client/lib/src/db/models.part.dart @@ -216,19 +216,19 @@ class _MessageSendingStatusConverter MessageSendingStatus mapToDart(int fromDb) { switch (fromDb) { case 0: - return MessageSendingStatus.SENDING; + return MessageSendingStatus.sending; case 1: - return MessageSendingStatus.SENT; + return MessageSendingStatus.sent; case 2: - return MessageSendingStatus.FAILED; + return MessageSendingStatus.failed; case 3: - return MessageSendingStatus.UPDATING; + return MessageSendingStatus.updating; case 4: - return MessageSendingStatus.FAILED_UPDATE; + return MessageSendingStatus.failed_update; case 5: - return MessageSendingStatus.DELETING; + return MessageSendingStatus.deleting; case 6: - return MessageSendingStatus.FAILED_DELETE; + return MessageSendingStatus.failed_delete; default: return null; } @@ -237,19 +237,19 @@ class _MessageSendingStatusConverter @override int mapToSql(MessageSendingStatus value) { switch (value) { - case MessageSendingStatus.SENDING: + case MessageSendingStatus.sending: return 0; - case MessageSendingStatus.SENT: + case MessageSendingStatus.sent: return 1; - case MessageSendingStatus.FAILED: + case MessageSendingStatus.failed: return 2; - case MessageSendingStatus.UPDATING: + case MessageSendingStatus.updating: return 3; - case MessageSendingStatus.FAILED_UPDATE: + case MessageSendingStatus.failed_update: return 4; - case MessageSendingStatus.DELETING: + case MessageSendingStatus.deleting: return 5; - case MessageSendingStatus.FAILED_DELETE: + case MessageSendingStatus.failed_delete: return 6; default: return null; diff --git a/packages/dart_client/lib/src/models/message.dart b/packages/dart_client/lib/src/models/message.dart index e23eb51a..df188e35 100644 --- a/packages/dart_client/lib/src/models/message.dart +++ b/packages/dart_client/lib/src/models/message.dart @@ -10,25 +10,25 @@ part 'message.g.dart'; /// Enum defining the status of a sending message enum MessageSendingStatus { /// Message is being sent - SENDING, + sending, /// Message is being updated - UPDATING, + updating, /// Message is being deleted - DELETING, + deleting, /// Message failed to send - FAILED, + failed, /// Message failed to updated - FAILED_UPDATE, + failed_update, /// Message failed to delete - FAILED_DELETE, + failed_delete, /// Message correctly sent - SENT, + sent, } /// The class that contains the information about a message @@ -186,7 +186,7 @@ class Message { this.user, this.extraData, this.deletedAt, - this.status = MessageSendingStatus.SENT, + this.status = MessageSendingStatus.sent, }); /// Create a new instance from a json diff --git a/packages/flutter_widgets/lib/src/message_actions_modal.dart b/packages/flutter_widgets/lib/src/message_actions_modal.dart index 0cda4e9d..4aa2cde4 100644 --- a/packages/flutter_widgets/lib/src/message_actions_modal.dart +++ b/packages/flutter_widgets/lib/src/message_actions_modal.dart @@ -127,7 +127,7 @@ class _MessageActionsModalState extends State { children: [ if (widget.showReactions && (widget.message.status == - MessageSendingStatus.SENT || + MessageSendingStatus.sent || widget.message.status == null)) Align( alignment: Alignment( @@ -175,7 +175,7 @@ class _MessageActionsModalState extends State { showReactionPickerIndicator: widget.showReactions && (widget.message.status == - MessageSendingStatus.SENT || + MessageSendingStatus.sent || widget.message.status == null), showInChannelIndicator: false, showSendingIndicator: false, @@ -204,13 +204,13 @@ class _MessageActionsModalState extends State { children: [ if (widget.showReplyMessage && (widget.message.status == - MessageSendingStatus.SENT || + MessageSendingStatus.sent || widget.message.status == null) && widget.message.parentId == null) _buildReplyButton(context), if (widget.showThreadReplyMessage && (widget.message.status == - MessageSendingStatus.SENT || + MessageSendingStatus.sent || widget.message.status == null) && widget.message.parentId == null) _buildThreadReplyButton(context), @@ -487,7 +487,7 @@ class _MessageActionsModalState extends State { Widget _buildDeleteButton(BuildContext context) { final isDeleteFailed = - widget.message.status == MessageSendingStatus.FAILED_DELETE; + widget.message.status == MessageSendingStatus.failed_delete; return InkWell( onTap: () => _showDeleteDialog(), child: Padding( @@ -562,7 +562,7 @@ class _MessageActionsModalState extends State { Widget _buildResendMessage(BuildContext context) { final isUpdateFailed = - widget.message.status == MessageSendingStatus.FAILED_UPDATE; + widget.message.status == MessageSendingStatus.failed_update; return InkWell( onTap: () { Navigator.pop(context); diff --git a/packages/flutter_widgets/lib/src/message_input.dart b/packages/flutter_widgets/lib/src/message_input.dart index 01ae3d3a..70b8b46f 100644 --- a/packages/flutter_widgets/lib/src/message_input.dart +++ b/packages/flutter_widgets/lib/src/message_input.dart @@ -2211,7 +2211,7 @@ class MessageInputState extends State { _mentionedUsers.clear(); if (widget.editMessage == null || - widget.editMessage.status == MessageSendingStatus.FAILED) { + widget.editMessage.status == MessageSendingStatus.failed) { sendingFuture = channel.sendMessage(message); } else { sendingFuture = StreamChat.of(context).client.updateMessage( diff --git a/packages/flutter_widgets/lib/src/message_reactions_modal.dart b/packages/flutter_widgets/lib/src/message_reactions_modal.dart index 1ee3486d..2f117aca 100644 --- a/packages/flutter_widgets/lib/src/message_reactions_modal.dart +++ b/packages/flutter_widgets/lib/src/message_reactions_modal.dart @@ -93,7 +93,7 @@ class MessageReactionsModal extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ if (showReactions && - (message.status == MessageSendingStatus.SENT || + (message.status == MessageSendingStatus.sent || message.status == null)) Align( alignment: Alignment( @@ -141,7 +141,7 @@ class MessageReactionsModal extends StatelessWidget { ), showReactionPickerIndicator: showReactions && (message.status == - MessageSendingStatus.SENT || + MessageSendingStatus.sent || message.status == null), ), ), diff --git a/packages/flutter_widgets/lib/src/message_widget.dart b/packages/flutter_widgets/lib/src/message_widget.dart index 2a15f898..c2cbdc35 100644 --- a/packages/flutter_widgets/lib/src/message_widget.dart +++ b/packages/flutter_widgets/lib/src/message_widget.dart @@ -263,13 +263,13 @@ class _MessageWidgetState extends State { bool get hasQuotedMessage => widget.message?.quotedMessage != null; - bool get isSendFailed => widget.message.status == MessageSendingStatus.FAILED; + bool get isSendFailed => widget.message.status == MessageSendingStatus.failed; bool get isUpdateFailed => - widget.message.status == MessageSendingStatus.FAILED_UPDATE; + widget.message.status == MessageSendingStatus.failed_update; bool get isDeleteFailed => - widget.message.status == MessageSendingStatus.FAILED_DELETE; + widget.message.status == MessageSendingStatus.failed_delete; bool get isFailedState => isSendFailed || isUpdateFailed || isDeleteFailed; @@ -875,7 +875,7 @@ class _MessageWidgetState extends State { void onLongPress(BuildContext context) { if (widget.message.isEphemeral || - widget.message.status == MessageSendingStatus.SENDING) { + widget.message.status == MessageSendingStatus.sending) { return; } @@ -986,11 +986,11 @@ class _MessageWidgetState extends State { void retryMessage(BuildContext context) { final channel = StreamChannel.of(context).channel; - if (widget.message.status == MessageSendingStatus.FAILED) { + if (widget.message.status == MessageSendingStatus.failed) { channel.sendMessage(widget.message); return; } - if (widget.message.status == MessageSendingStatus.FAILED_UPDATE) { + if (widget.message.status == MessageSendingStatus.failed_update) { StreamChat.of(context).client.updateMessage( widget.message, channel.cid, @@ -998,7 +998,7 @@ class _MessageWidgetState extends State { return; } - if (widget.message.status == MessageSendingStatus.FAILED_DELETE) { + if (widget.message.status == MessageSendingStatus.failed_delete) { StreamChat.of(context).client.deleteMessage( widget.message, channel.cid, diff --git a/packages/flutter_widgets/lib/src/sending_indicator.dart b/packages/flutter_widgets/lib/src/sending_indicator.dart index 83e02bb3..3fca2fa9 100644 --- a/packages/flutter_widgets/lib/src/sending_indicator.dart +++ b/packages/flutter_widgets/lib/src/sending_indicator.dart @@ -22,14 +22,14 @@ class SendingIndicator extends StatelessWidget { color: StreamChatTheme.of(context).colorTheme.accentBlue, ); } - if (message.status == MessageSendingStatus.SENT || message.status == null) { + if (message.status == MessageSendingStatus.sent || message.status == null) { return StreamSvgIcon.check( size: size, color: IconTheme.of(context).color.withOpacity(0.5), ); } - if (message.status == MessageSendingStatus.SENDING || - message.status == MessageSendingStatus.UPDATING) { + if (message.status == MessageSendingStatus.sending || + message.status == MessageSendingStatus.updating) { return Icon( Icons.access_time, size: size,