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,
id: messageId,
quotedMessage: quotedMessage,
status: MessageSendingStatus.SENDING,
status: MessageSendingStatus.sending,
);
if (message.parentId != null && message.id == null) {
@@ -978,7 +978,7 @@ class ChannelClientState {
<Message>[...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,
))))
packages/dart_client/lib/src/api/retry_queue.dart
+21 -21
View File
@@ -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<void> _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;
packages/dart_client/lib/src/client.dart
+5 -5
View File
@@ -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<EmptyResponse> 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);
packages/dart_client/lib/src/db/models.part.dart
+14 -14
View File
@@ -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;
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 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
packages/flutter_widgets/lib/src/message_actions_modal.dart
+6 -6
View File
@@ -127,7 +127,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
children: <Widget>[
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<MessageActionsModal> {
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<MessageActionsModal> {
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<MessageActionsModal> {
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<MessageActionsModal> {
Widget _buildResendMessage(BuildContext context) {
final isUpdateFailed =
widget.message.status == MessageSendingStatus.FAILED_UPDATE;
widget.message.status == MessageSendingStatus.failed_update;
return InkWell(
onTap: () {
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();
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(
packages/flutter_widgets/lib/src/message_reactions_modal.dart
+2 -2
View File
@@ -93,7 +93,7 @@ class MessageReactionsModal extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
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),
),
),
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 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<MessageWidget> {
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<MessageWidget> {
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<MessageWidget> {
return;
}
if (widget.message.status == MessageSendingStatus.FAILED_DELETE) {
if (widget.message.status == MessageSendingStatus.failed_delete) {
StreamChat.of(context).client.deleteMessage(
widget.message,
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,
);
}
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,