Skip to content

Commit f52ce7f

Browse files
committed
msglist: Remove backward-compat code for servers without includeAnchor
Fixes-partly: #1837
1 parent 13a2447 commit f52ce7f

File tree

3 files changed

+2
-50
lines changed

3 files changed

+2
-50
lines changed

lib/model/message_list.dart

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -873,12 +873,6 @@ class MessageListView with ChangeNotifier, _MessageSequence {
873873
numBefore: kMessageListFetchBatchSize,
874874
numAfter: 0,
875875
processResult: (result) {
876-
if (result.messages.isNotEmpty
877-
&& result.messages.last.id == messages[0].id) {
878-
// TODO(server-6): includeAnchor should make this impossible
879-
result.messages.removeLast();
880-
}
881-
882876
store.reconcileMessages(result.messages);
883877
store.recentSenders.handleMessages(result.messages); // TODO(#824)
884878

@@ -909,12 +903,6 @@ class MessageListView with ChangeNotifier, _MessageSequence {
909903
numBefore: 0,
910904
numAfter: kMessageListFetchBatchSize,
911905
processResult: (result) {
912-
if (result.messages.isNotEmpty
913-
&& result.messages.first.id == messages.last.id) {
914-
// TODO(server-6): includeAnchor should make this impossible
915-
result.messages.removeAt(0);
916-
}
917-
918906
store.reconcileMessages(result.messages);
919907
store.recentSenders.handleMessages(result.messages); // TODO(#824)
920908

test/example_data.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -821,14 +821,13 @@ GetMessagesResult nearGetMessagesResult({
821821
/// A GetMessagesResult the server might return when we request older messages.
822822
GetMessagesResult olderGetMessagesResult({
823823
required int anchor,
824-
bool foundAnchor = false, // the value if the server understood includeAnchor false
825824
required bool foundOldest,
826825
bool historyLimited = false,
827826
required List<Message> messages,
828827
}) {
829828
return GetMessagesResult(
830829
anchor: anchor,
831-
foundAnchor: foundAnchor,
830+
foundAnchor: false,
832831
foundNewest: false, // empirically always this, even when anchor happens to be latest
833832
foundOldest: foundOldest,
834833
historyLimited: historyLimited,
@@ -839,14 +838,13 @@ GetMessagesResult olderGetMessagesResult({
839838
/// A GetMessagesResult the server might return when we request newer messages.
840839
GetMessagesResult newerGetMessagesResult({
841840
required int anchor,
842-
bool foundAnchor = false, // the value if the server understood includeAnchor false
843841
required bool foundNewest,
844842
bool historyLimited = false,
845843
required List<Message> messages,
846844
}) {
847845
return GetMessagesResult(
848846
anchor: anchor,
849-
foundAnchor: foundAnchor,
847+
foundAnchor: false,
850848
foundOldest: false,
851849
foundNewest: foundNewest,
852850
historyLimited: historyLimited,

test/model/message_list_test.dart

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -625,40 +625,6 @@ void main() {
625625
check(connection.takeRequests()).single;
626626
}));
627627

628-
test('fetchOlder handles servers not understanding includeAnchor', () async {
629-
await prepare();
630-
await prepareMessages(foundOldest: false,
631-
messages: List.generate(100, (i) => eg.streamMessage(id: 1000 + i)));
632-
633-
// The old behavior is to include the anchor message regardless of includeAnchor.
634-
connection.prepare(json: olderResult(
635-
anchor: 1000, foundOldest: false, foundAnchor: true,
636-
messages: List.generate(101, (i) => eg.streamMessage(id: 900 + i)),
637-
).toJson());
638-
await model.fetchOlder();
639-
checkNotified(count: 2);
640-
check(model)
641-
..busyFetchingMore.isFalse()
642-
..messages.length.equals(200);
643-
});
644-
645-
test('fetchNewer handles servers not understanding includeAnchor', () async {
646-
await prepare(anchor: NumericAnchor(1000));
647-
await prepareMessages(foundOldest: true, foundNewest: false,
648-
messages: List.generate(101, (i) => eg.streamMessage(id: 1000 + i)));
649-
650-
// The old behavior is to include the anchor message regardless of includeAnchor.
651-
connection.prepare(json: newerResult(
652-
anchor: 1100, foundNewest: false, foundAnchor: true,
653-
messages: List.generate(101, (i) => eg.streamMessage(id: 1100 + i)),
654-
).toJson());
655-
await model.fetchNewer();
656-
checkNotified(count: 2);
657-
check(model)
658-
..busyFetchingMore.isFalse()
659-
..messages.length.equals(201);
660-
});
661-
662628
// TODO(#824): move this test
663629
test('fetchOlder recent senders track all the messages', () async {
664630
await prepare();

0 commit comments

Comments
 (0)