Skip to content

Commit 1343d1a

Browse files
committed
message: Create an outbox message on send; manage its states
While we do create outbox messages, there are in no way user-visible changes since the outbox messages don't end up in message list views. We create skeletons for helpers needed from message list view, but don't implement them yet, to make the diff smaller. For testing, similar to TypingNotifier.debugEnable, we add MessageStoreImpl.debugOutboxEnable for tests that do not intend to cover outbox messages. Some of the delays to fake responses added in tests are not necessary because the future of sendMessage is not completed immediately, but we still add them to keep the tests realistic.
1 parent 046dfb7 commit 1343d1a

12 files changed

+824
-60
lines changed

lib/model/message.dart

+343-9
Large diffs are not rendered by default.

lib/model/message_list.dart

+17
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import '../api/route/messages.dart';
1010
import 'algorithms.dart';
1111
import 'channel.dart';
1212
import 'content.dart';
13+
import 'message.dart';
1314
import 'narrow.dart';
1415
import 'store.dart';
1516

@@ -626,6 +627,17 @@ class MessageListView with ChangeNotifier, _MessageSequence {
626627
}
627628
}
628629

630+
void addOutboxMessage(OutboxMessage outboxMessage) {
631+
// TODO(#1441) implement this
632+
}
633+
634+
/// Remove the [outboxMessage] from the view.
635+
///
636+
/// This is a no-op if the message is not found.
637+
void removeOutboxMessage(OutboxMessage outboxMessage) {
638+
// TODO(#1441) implement this
639+
}
640+
629641
void handleUserTopicEvent(UserTopicEvent event) {
630642
switch (_canAffectVisibility(event)) {
631643
case VisibilityEffect.none:
@@ -787,6 +799,11 @@ class MessageListView with ChangeNotifier, _MessageSequence {
787799
}
788800
}
789801

802+
/// Notify listeners if the given outbox message is present in this view.
803+
void notifyListenersIfOutboxMessagePresent(int localMessageId) {
804+
// TODO(#1441) implement this
805+
}
806+
790807
/// Called when the app is reassembled during debugging, e.g. for hot reload.
791808
///
792809
/// This will redo from scratch any computations we can, such as parsing

lib/model/store.dart

+7-1
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,8 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
498498
typingStartedExpiryPeriod: Duration(milliseconds: initialSnapshot.serverTypingStartedExpiryPeriodMilliseconds),
499499
),
500500
channels: channels,
501-
messages: MessageStoreImpl(core: core),
501+
messages: MessageStoreImpl(core: core,
502+
realmEmptyTopicDisplayName: initialSnapshot.realmEmptyTopicDisplayName),
502503
unreads: Unreads(
503504
initial: initialSnapshot.unreadMsgs,
504505
core: core,
@@ -732,6 +733,8 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
732733
@override
733734
Map<int, Message> get messages => _messages.messages;
734735
@override
736+
Map<int, OutboxMessage> get outboxMessages => _messages.outboxMessages;
737+
@override
735738
void registerMessageList(MessageListView view) =>
736739
_messages.registerMessageList(view);
737740
@override
@@ -911,6 +914,9 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
911914
return _messages.sendMessage(destination: destination, content: content);
912915
}
913916

917+
@override
918+
void removeOutboxMessage(int localMessageId) => _messages.removeOutboxMessage(localMessageId);
919+
914920
static List<CustomProfileField> _sortCustomProfileFields(List<CustomProfileField> initialCustomProfileFields) {
915921
// TODO(server): The realm-wide field objects have an `order` property,
916922
// but the actual API appears to be that the fields should be shown in

test/api/model/model_checks.dart

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ extension TopicNameChecks on Subject<TopicName> {
3030
}
3131

3232
extension StreamConversationChecks on Subject<StreamConversation> {
33+
Subject<TopicName> get topic => has((x) => x.topic, 'topic');
3334
Subject<String?> get displayRecipient => has((x) => x.displayRecipient, 'displayRecipient');
3435
}
3536

test/example_data.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,8 @@ UserTopicEvent userTopicEvent(
636636
);
637637
}
638638

639-
MessageEvent messageEvent(Message message) =>
640-
MessageEvent(id: 0, message: message, localMessageId: null);
639+
MessageEvent messageEvent(Message message, {int? localMessageId}) =>
640+
MessageEvent(id: 0, message: message, localMessageId: localMessageId?.toString());
641641

642642
DeleteMessageEvent deleteMessageEvent(List<StreamMessage> messages) {
643643
assert(messages.isNotEmpty);

test/fake_async_checks.dart

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import 'package:checks/checks.dart';
2+
import 'package:fake_async/fake_async.dart';
3+
4+
extension FakeTimerChecks on Subject<FakeTimer> {
5+
Subject<Duration> get duration => has((t) => t.duration, 'duration');
6+
}

test/model/message_checks.dart

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import 'package:checks/checks.dart';
2+
import 'package:zulip/api/model/model.dart';
3+
import 'package:zulip/model/message.dart';
4+
5+
extension OutboxMessageChecks<T extends Conversation> on Subject<OutboxMessage<T>> {
6+
Subject<int> get localMessageId => has((x) => x.localMessageId, 'localMessageId');
7+
Subject<OutboxMessageState> get state => has((x) => x.state, 'state');
8+
Subject<bool> get hidden => has((x) => x.hidden, 'hidden');
9+
}

0 commit comments

Comments
 (0)