Skip to content

Conversation

chrisbobbe
Copy link
Collaborator

Fixes #1837.

This isn't our most urgent issue, but I was looking for some low-hanging fruit I could clear during yesterday's heat wave when it was really hot and uncomfortable at home. :)

@chrisbobbe chrisbobbe added the maintainer review PR ready for review by Zulip maintainers label Sep 24, 2025
Issue zulip#992 was closed as a duplicate of zulip#1837, and zulip#1838 exists as
the issue for TODO(server-7) comments.
The doc for this says
> This field is only included when its value is `true`.
so the TODO(server-6) isn't reason enough to make it a required
field.

Fixes-partly: zulip#1837
This isn't a case of special backward-compat code to be trimmed out;
the backwards compatibility was simply that older servers wouldn't
exercise this code.

Fixes-partly: zulip#1837
@chrisbobbe chrisbobbe force-pushed the pr-clear-todo-server-6 branch from f29237b to 4a8cebc Compare September 26, 2025 20:38
Copy link
Member

@rajveermalviya rajveermalviya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @chrisbobbe! LGTM, moving over to Greg's review.

@rajveermalviya rajveermalviya added integration review Added by maintainers when PR may be ready for integration and removed maintainer review PR ready for review by Zulip maintainers labels Sep 30, 2025
Copy link
Member

@gnprice gnprice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for cleaning these up! Generally all looks good. A few comments below.

In addition to the TODO-server comments in our code, I also took this as a prompt to read through the API changelog https://zulip.com/api/changelog for Server 6. Items I found there which should also be part of relying on Server 6:

  • FL-139: no more in_home_view in subscription/update events
  • FL-148: no more away in user status, which we had commented out

Also grepped -i for server.?6 at the tip of the branch; the only match was that FL-148 removal of away.

final UserSettings userSettings;

final List<UserTopicItem>? userTopics; // TODO(server-6)
final List<UserTopicItem> userTopics;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This replaced muted_topics. Grepping (with git grep -i muted.?topic`), we have a commented-out reference to that, above, which we can delete.

Also a comment in the list of event types.

GetMessagesResult olderGetMessagesResult({
required int anchor,
bool foundAnchor = false, // the value if the server understood includeAnchor false
bool foundAnchor = false,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should mean we can drop this parameter, right? And just hard-code the value in this test helper's body. (Because we no longer need to exercise scenarios where it has any other value.)

Comment on lines 534 to 538
topics.update(topic,
ifAbsent: () => messageIds,
// setUnion dedupes existing and incoming unread IDs,
// so we tolerate zulip/zulip#22164, fixed in 6.0
// TODO(server-6) remove 6.0 comment
(existing) => setUnion(existing, messageIds),
);
(existing) => setUnion(existing, messageIds));
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment appears to have been explaining why we had this setUnion. Do we no longer need it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integration review Added by maintainers when PR may be ready for integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rely on Zulip Server 6 APIs
3 participants