talksik/stream-chat-flutter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MessageSendingStatus] lowercase enum values

Browse Source
This commit is contained in:
Sahil Kumar
2021-01-25 19:12:34 +05:30
parent 463dc96a26
commit 1021814a75
10 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/dart_client/lib/src/api/channel.dart
+2 -2
View File
@@ -183,7 +183,7 @@ class Channel {
user: _client.state.user, user: _client.state.user,
id: messageId, id: messageId,
quotedMessage: quotedMessage, quotedMessage: quotedMessage,
status: MessageSendingStatus.SENDING, status: MessageSendingStatus.sending,
); );
if (message.parentId != null && message.id == null) { if (message.parentId != null && message.id == null) {
@@ -978,7 +978,7 @@ class ChannelClientState {
<Message>[...messages, ...threads.values.expand((v) => v)] <Message>[...messages, ...threads.values.expand((v) => v)]
.where((message) => .where((message) =>
message.status != null && message.status != null &&
message.status != MessageSendingStatus.SENT && message.status != MessageSendingStatus.sent &&
message.createdAt.isBefore(DateTime.now().subtract(Duration( message.createdAt.isBefore(DateTime.now().subtract(Duration(
seconds: 1, seconds: 1,
)))) ))))
packages/dart_client/lib/src/api/retry_queue.dart
+21 -21
View File
@@ -113,30 +113,30 @@ class RetryQueue {
} }
void _sendFailedEvent(Message message) { void _sendFailedEvent(Message message) {
final newStatus = message.status == MessageSendingStatus.SENDING final newStatus = message.status == MessageSendingStatus.sending
? MessageSendingStatus.FAILED ? MessageSendingStatus.failed
: (message.status == MessageSendingStatus.UPDATING : (message.status == MessageSendingStatus.updating
? MessageSendingStatus.FAILED_UPDATE ? MessageSendingStatus.failed_update
: MessageSendingStatus.FAILED_DELETE); : MessageSendingStatus.failed_delete);
channel.state.addMessage(message.copyWith( channel.state.addMessage(message.copyWith(
status: newStatus, status: newStatus,
)); ));
} }
Future<void> _sendMessage(Message message) async { Future<void> _sendMessage(Message message) async {
if (message.status == MessageSendingStatus.FAILED_UPDATE || if (message.status == MessageSendingStatus.failed_update ||
message.status == MessageSendingStatus.UPDATING) { message.status == MessageSendingStatus.updating) {
await channel.client.updateMessage( await channel.client.updateMessage(
message, message,
channel.cid, channel.cid,
); );
} else if (message.status == MessageSendingStatus.FAILED || } else if (message.status == MessageSendingStatus.failed ||
message.status == MessageSendingStatus.SENDING) { message.status == MessageSendingStatus.sending) {
await channel.sendMessage( await channel.sendMessage(
message, message,
); );
} else if (message.status == MessageSendingStatus.FAILED_DELETE || } else if (message.status == MessageSendingStatus.failed_delete ||
message.status == MessageSendingStatus.DELETING) { message.status == MessageSendingStatus.deleting) {
await channel.client.deleteMessage( await channel.client.deleteMessage(
message, message,
channel.cid, channel.cid,
@@ -152,15 +152,15 @@ class RetryQueue {
messageList.indexWhere((m) => m.id == event.message.id); messageList.indexWhere((m) => m.id == event.message.id);
if (messageIndex == -1 && if (messageIndex == -1 &&
[ [
MessageSendingStatus.FAILED_UPDATE, MessageSendingStatus.failed_update,
MessageSendingStatus.FAILED, MessageSendingStatus.failed,
MessageSendingStatus.FAILED_DELETE, MessageSendingStatus.failed_delete,
].contains(event.message.status)) { ].contains(event.message.status)) {
logger?.info('add message from events'); logger?.info('add message from events');
add([event.message]); add([event.message]);
} else if (messageIndex != -1 && } else if (messageIndex != -1 &&
[ [
MessageSendingStatus.SENT, MessageSendingStatus.sent,
null, null,
].contains(event.message.status)) { ].contains(event.message.status)) {
_messageQueue.remove(messageList[messageIndex]); _messageQueue.remove(messageList[messageIndex]);
@@ -184,16 +184,16 @@ class RetryQueue {
static DateTime _getMessageDate(Message m1) { static DateTime _getMessageDate(Message m1) {
switch (m1.status) { switch (m1.status) {
case MessageSendingStatus.FAILED_DELETE: case MessageSendingStatus.failed_delete:
case MessageSendingStatus.DELETING: case MessageSendingStatus.deleting:
return m1.deletedAt; return m1.deletedAt;
case MessageSendingStatus.FAILED: case MessageSendingStatus.failed:
case MessageSendingStatus.SENDING: case MessageSendingStatus.sending:
return m1.createdAt; return m1.createdAt;
case MessageSendingStatus.FAILED_UPDATE: case MessageSendingStatus.failed_update:
case MessageSendingStatus.UPDATING: case MessageSendingStatus.updating:
return m1.updatedAt; return m1.updatedAt;
default: default:
return null; return null;
packages/dart_client/lib/src/client.dart
+5 -5
View File
@@ -1198,7 +1198,7 @@ class Client {
String cid, String cid,
]) async { ]) async {
message = message.copyWith( message = message.copyWith(
status: MessageSendingStatus.UPDATING, status: MessageSendingStatus.updating,
updatedAt: message.updatedAt ?? DateTime.now(), updatedAt: message.updatedAt ?? DateTime.now(),
); );
@@ -1229,10 +1229,10 @@ class Client {
/// Deletes the given message /// Deletes the given message
Future<EmptyResponse> deleteMessage(Message message, [String cid]) async { Future<EmptyResponse> deleteMessage(Message message, [String cid]) async {
if (message.status == MessageSendingStatus.FAILED) { if (message.status == MessageSendingStatus.failed) {
state.channels[cid].state.addMessage(message.copyWith( state.channels[cid].state.addMessage(message.copyWith(
type: 'deleted', type: 'deleted',
status: MessageSendingStatus.SENT, status: MessageSendingStatus.sent,
)); ));
return EmptyResponse(); return EmptyResponse();
} }
@@ -1240,7 +1240,7 @@ class Client {
try { try {
message = message.copyWith( message = message.copyWith(
type: 'deleted', type: 'deleted',
status: MessageSendingStatus.DELETING, status: MessageSendingStatus.deleting,
deletedAt: message.deletedAt ?? DateTime.now(), deletedAt: message.deletedAt ?? DateTime.now(),
); );
@@ -1252,7 +1252,7 @@ class Client {
if (state?.channels != null) { if (state?.channels != null) {
state.channels[cid]?.state state.channels[cid]?.state
?.addMessage(message.copyWith(status: MessageSendingStatus.SENT)); ?.addMessage(message.copyWith(status: MessageSendingStatus.sent));
} }
return decode(response.data, EmptyResponse.fromJson); return decode(response.data, EmptyResponse.fromJson);
packages/dart_client/lib/src/db/models.part.dart
+14 -14
View File
@@ -216,19 +216,19 @@ class _MessageSendingStatusConverter
MessageSendingStatus mapToDart(int fromDb) { MessageSendingStatus mapToDart(int fromDb) {
switch (fromDb) { switch (fromDb) {
case 0: case 0:
return MessageSendingStatus.SENDING; return MessageSendingStatus.sending;
case 1: case 1:
return MessageSendingStatus.SENT; return MessageSendingStatus.sent;
case 2: case 2:
return MessageSendingStatus.FAILED; return MessageSendingStatus.failed;
case 3: case 3:
return MessageSendingStatus.UPDATING; return MessageSendingStatus.updating;
case 4: case 4:
return MessageSendingStatus.FAILED_UPDATE; return MessageSendingStatus.failed_update;
case 5: case 5:
return MessageSendingStatus.DELETING; return MessageSendingStatus.deleting;
case 6: case 6:
return MessageSendingStatus.FAILED_DELETE; return MessageSendingStatus.failed_delete;
default: default:
return null; return null;
} }
@@ -237,19 +237,19 @@ class _MessageSendingStatusConverter
@override @override
int mapToSql(MessageSendingStatus value) { int mapToSql(MessageSendingStatus value) {
switch (value) { switch (value) {
case MessageSendingStatus.SENDING: case MessageSendingStatus.sending:
return 0; return 0;
case MessageSendingStatus.SENT: case MessageSendingStatus.sent:
return 1; return 1;
case MessageSendingStatus.FAILED: case MessageSendingStatus.failed:
return 2; return 2;
case MessageSendingStatus.UPDATING: case MessageSendingStatus.updating:
return 3; return 3;
case MessageSendingStatus.FAILED_UPDATE: case MessageSendingStatus.failed_update:
return 4; return 4;
case MessageSendingStatus.DELETING: case MessageSendingStatus.deleting:
return 5; return 5;
case MessageSendingStatus.FAILED_DELETE: case MessageSendingStatus.failed_delete:
return 6; return 6;
default: default:
return null; return null;
packages/dart_client/lib/src/models/message.dart
+8 -8
View File
@@ -10,25 +10,25 @@ part 'message.g.dart';
/// Enum defining the status of a sending message /// Enum defining the status of a sending message
enum MessageSendingStatus { enum MessageSendingStatus {
/// Message is being sent /// Message is being sent
SENDING, sending,
/// Message is being updated /// Message is being updated
UPDATING, updating,
/// Message is being deleted /// Message is being deleted
DELETING, deleting,
/// Message failed to send /// Message failed to send
FAILED, failed,
/// Message failed to updated /// Message failed to updated
FAILED_UPDATE, failed_update,
/// Message failed to delete /// Message failed to delete
FAILED_DELETE, failed_delete,
/// Message correctly sent /// Message correctly sent
SENT, sent,
} }
/// The class that contains the information about a message /// The class that contains the information about a message
@@ -186,7 +186,7 @@ class Message {
this.user, this.user,
this.extraData, this.extraData,
this.deletedAt, this.deletedAt,
this.status = MessageSendingStatus.SENT, this.status = MessageSendingStatus.sent,
}); });
/// Create a new instance from a json /// Create a new instance from a json
packages/flutter_widgets/lib/src/message_actions_modal.dart
+6 -6
View File
@@ -127,7 +127,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
children: <Widget>[ children: <Widget>[
if (widget.showReactions && if (widget.showReactions &&
(widget.message.status == (widget.message.status ==
MessageSendingStatus.SENT || MessageSendingStatus.sent ||
widget.message.status == null)) widget.message.status == null))
Align( Align(
alignment: Alignment( alignment: Alignment(
@@ -175,7 +175,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
showReactionPickerIndicator: showReactionPickerIndicator:
widget.showReactions && widget.showReactions &&
(widget.message.status == (widget.message.status ==
MessageSendingStatus.SENT || MessageSendingStatus.sent ||
widget.message.status == null), widget.message.status == null),
showInChannelIndicator: false, showInChannelIndicator: false,
showSendingIndicator: false, showSendingIndicator: false,
@@ -204,13 +204,13 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
children: [ children: [
if (widget.showReplyMessage && if (widget.showReplyMessage &&
(widget.message.status == (widget.message.status ==
MessageSendingStatus.SENT || MessageSendingStatus.sent ||
widget.message.status == null) && widget.message.status == null) &&
widget.message.parentId == null) widget.message.parentId == null)
_buildReplyButton(context), _buildReplyButton(context),
if (widget.showThreadReplyMessage && if (widget.showThreadReplyMessage &&
(widget.message.status == (widget.message.status ==
MessageSendingStatus.SENT || MessageSendingStatus.sent ||
widget.message.status == null) && widget.message.status == null) &&
widget.message.parentId == null) widget.message.parentId == null)
_buildThreadReplyButton(context), _buildThreadReplyButton(context),
@@ -487,7 +487,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
Widget _buildDeleteButton(BuildContext context) { Widget _buildDeleteButton(BuildContext context) {
final isDeleteFailed = final isDeleteFailed =
widget.message.status == MessageSendingStatus.FAILED_DELETE; widget.message.status == MessageSendingStatus.failed_delete;
return InkWell( return InkWell(
onTap: () => _showDeleteDialog(), onTap: () => _showDeleteDialog(),
child: Padding( child: Padding(
@@ -562,7 +562,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
Widget _buildResendMessage(BuildContext context) { Widget _buildResendMessage(BuildContext context) {
final isUpdateFailed = final isUpdateFailed =
widget.message.status == MessageSendingStatus.FAILED_UPDATE; widget.message.status == MessageSendingStatus.failed_update;
return InkWell( return InkWell(
onTap: () { onTap: () {
Navigator.pop(context); Navigator.pop(context);
packages/flutter_widgets/lib/src/message_input.dart
+1 -1
View File
@@ -2211,7 +2211,7 @@ class MessageInputState extends State<MessageInput> {
_mentionedUsers.clear(); _mentionedUsers.clear();
if (widget.editMessage == null || if (widget.editMessage == null ||
widget.editMessage.status == MessageSendingStatus.FAILED) { widget.editMessage.status == MessageSendingStatus.failed) {
sendingFuture = channel.sendMessage(message); sendingFuture = channel.sendMessage(message);
} else { } else {
sendingFuture = StreamChat.of(context).client.updateMessage( sendingFuture = StreamChat.of(context).client.updateMessage(
packages/flutter_widgets/lib/src/message_reactions_modal.dart
+2 -2
View File
@@ -93,7 +93,7 @@ class MessageReactionsModal extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
if (showReactions && if (showReactions &&
(message.status == MessageSendingStatus.SENT || (message.status == MessageSendingStatus.sent ||
message.status == null)) message.status == null))
Align( Align(
alignment: Alignment( alignment: Alignment(
@@ -141,7 +141,7 @@ class MessageReactionsModal extends StatelessWidget {
), ),
showReactionPickerIndicator: showReactions && showReactionPickerIndicator: showReactions &&
(message.status == (message.status ==
MessageSendingStatus.SENT || MessageSendingStatus.sent ||
message.status == null), message.status == null),
), ),
), ),
packages/flutter_widgets/lib/src/message_widget.dart
+7 -7
View File
@@ -263,13 +263,13 @@ class _MessageWidgetState extends State<MessageWidget> {
bool get hasQuotedMessage => widget.message?.quotedMessage != null; 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 => bool get isUpdateFailed =>
widget.message.status == MessageSendingStatus.FAILED_UPDATE; widget.message.status == MessageSendingStatus.failed_update;
bool get isDeleteFailed => bool get isDeleteFailed =>
widget.message.status == MessageSendingStatus.FAILED_DELETE; widget.message.status == MessageSendingStatus.failed_delete;
bool get isFailedState => isSendFailed || isUpdateFailed || isDeleteFailed; bool get isFailedState => isSendFailed || isUpdateFailed || isDeleteFailed;
@@ -875,7 +875,7 @@ class _MessageWidgetState extends State<MessageWidget> {
void onLongPress(BuildContext context) { void onLongPress(BuildContext context) {
if (widget.message.isEphemeral || if (widget.message.isEphemeral ||
widget.message.status == MessageSendingStatus.SENDING) { widget.message.status == MessageSendingStatus.sending) {
return; return;
} }
@@ -986,11 +986,11 @@ class _MessageWidgetState extends State<MessageWidget> {
void retryMessage(BuildContext context) { void retryMessage(BuildContext context) {
final channel = StreamChannel.of(context).channel; final channel = StreamChannel.of(context).channel;
if (widget.message.status == MessageSendingStatus.FAILED) { if (widget.message.status == MessageSendingStatus.failed) {
channel.sendMessage(widget.message); channel.sendMessage(widget.message);
return; return;
} }
if (widget.message.status == MessageSendingStatus.FAILED_UPDATE) { if (widget.message.status == MessageSendingStatus.failed_update) {
StreamChat.of(context).client.updateMessage( StreamChat.of(context).client.updateMessage(
widget.message, widget.message,
channel.cid, channel.cid,
@@ -998,7 +998,7 @@ class _MessageWidgetState extends State<MessageWidget> {
return; return;
} }
if (widget.message.status == MessageSendingStatus.FAILED_DELETE) { if (widget.message.status == MessageSendingStatus.failed_delete) {
StreamChat.of(context).client.deleteMessage( StreamChat.of(context).client.deleteMessage(
widget.message, widget.message,
channel.cid, channel.cid,
packages/flutter_widgets/lib/src/sending_indicator.dart
+3 -3
View File
@@ -22,14 +22,14 @@ class SendingIndicator extends StatelessWidget {
color: StreamChatTheme.of(context).colorTheme.accentBlue, 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( return StreamSvgIcon.check(
size: size, size: size,
color: IconTheme.of(context).color.withOpacity(0.5), color: IconTheme.of(context).color.withOpacity(0.5),
); );
} }
if (message.status == MessageSendingStatus.SENDING || if (message.status == MessageSendingStatus.sending ||
message.status == MessageSendingStatus.UPDATING) { message.status == MessageSendingStatus.updating) {
return Icon( return Icon(
Icons.access_time, Icons.access_time,
size: size, size: size,