Start Requiring Zulip Server 5

lib/api/model/events.dart

@@ -708,13 +708,13 @@ class UpdateMessageEvent extends Event {
   @JsonKey(includeToJson: true)
   String get type => 'update_message';
 
-  final int? userId; // TODO(server-5)
-  final bool? renderingOnly; // TODO(server-5)
+  final int userId;
+  final bool renderingOnly;
   final int messageId;
   final List<int> messageIds;
 
   final List<MessageFlag> flags;
-  final int? editTimestamp; // TODO(server-5)
+  final int editTimestamp;
 
   // final String? streamName; // ignore
 

lib/api/model/initial_snapshot.dart

@@ -18,7 +18,7 @@ class InitialSnapshot {
   final int lastEventId;
   final int zulipFeatureLevel;
   final String zulipVersion;
-  final String? zulipMergeBase; // TODO(server-5)
+  final String zulipMergeBase;
 
   final List<String> alertWords;
 
@@ -54,13 +54,7 @@ class InitialSnapshot {
 
   final List<ZulipStream> streams;
 
-  // Servers pre-5.0 don't have `user_settings`, and instead provide whatever
-  // user settings they support at toplevel in the initial snapshot. Since we're
-  // likely to desupport pre-5.0 servers before wide release, we prefer to
-  // ignore the toplevel fields and use `user_settings` where present instead,
-  // even at the expense of functionality with pre-5.0 servers.
-  // TODO(server-5) remove pre-5.0 comment
-  final UserSettings? userSettings; // TODO(server-5)
+  final UserSettings userSettings;
 
   final List<UserTopicItem>? userTopics; // TODO(server-6)
 
@@ -312,15 +306,9 @@ class UnreadMessagesSnapshot {
 /// An item in [UnreadMessagesSnapshot.dms].
 @JsonSerializable(fieldRename: FieldRename.snake)
 class UnreadDmSnapshot {
-  @JsonKey(readValue: _readOtherUserId)
   final int otherUserId;
   final List<int> unreadMessageIds;
 
-  // TODO(server-5): Simplify away.
-  static dynamic _readOtherUserId(Map<dynamic, dynamic> json, String key) {
-    return json[key] ?? json['sender_id'];
-  }
-
   UnreadDmSnapshot({
     required this.otherUserId,
     required this.unreadMessageIds,

lib/api/model/model.dart

@@ -205,7 +205,7 @@ class User {
   // bool isOwner; // obsoleted by [role]; ignore
   // bool isAdmin; // obsoleted by [role]; ignore
   // bool isGuest; // obsoleted by [role]; ignore
-  bool? isBillingAdmin; // TODO(server-5)
+  bool isBillingAdmin;
   final bool isBot;
   final int? botType; // TODO enum
   int? botOwnerId;
@@ -221,7 +221,9 @@ class User {
   @JsonKey(readValue: _readProfileData)
   Map<int, ProfileFieldUserData>? profileData;
 
-  @JsonKey(readValue: _readIsSystemBot)
+  // This field is absent in `realm_users` and `realm_non_active_users`,
+  // which contain no system bots; it's present in `cross_realm_bots`.
+  @JsonKey(defaultValue: false)
   final bool isSystemBot;
 
   static Map<String, dynamic>? _readProfileData(Map<dynamic, dynamic> json, String key) {
@@ -233,14 +235,6 @@ class User {
     return (value != null && value.isNotEmpty) ? value : null;
   }
 
-  static bool _readIsSystemBot(Map<dynamic, dynamic> json, String key) {
-    // This field is absent in `realm_users` and `realm_non_active_users`,
-    // which contain no system bots; it's present in `cross_realm_bots`.
-    return (json[key] as bool?)
-        ?? (json['is_cross_realm_bot'] as bool?) // TODO(server-5): renamed to `is_system_bot`
-        ?? false;
-  }
-
   User({
     required this.userId,
     required this.deliveryEmail,
@@ -924,18 +918,15 @@ enum MessageEditState {
         continue;
       }
 
-      // TODO(server-5) prev_subject was the old name of prev_topic on pre-5.0 servers
-      final prevTopicStr = (entry['prev_topic'] ?? entry['prev_subject']) as String?;
+      final prevTopicStr = entry['prev_topic'] as String?;
       final prevTopic = prevTopicStr == null ? null : TopicName.fromJson(prevTopicStr);
       final topicStr = entry['topic'] as String?;
       final topic = topicStr == null ? null : TopicName.fromJson(topicStr);
-      if (prevTopic != null) {
-        // TODO(server-5) pre-5.0 servers do not have the 'topic' field
-        if (topic == null) {
-          hasMoved = true;
-        } else {
-          hasMoved |= !topicMoveWasResolveOrUnresolve(topic, prevTopic);
-        }
+      if (topic != null || prevTopic != null) {
+        // Crunchy-shell validation: Both are present if the topic was edited
+        topic as TopicName;
+        prevTopic as TopicName;
+        hasMoved |= !topicMoveWasResolveOrUnresolve(topic, prevTopic);
       }
     }
 

lib/api/model/web_auth.dart

@@ -7,7 +7,7 @@ import 'package:flutter/foundation.dart';
 class WebAuthPayload {
   final Uri realm;
   final String email;
-  final int? userId; // TODO(server-5) new in FL 108
+  final int userId;
   final String otpEncryptedApiKey;
 
   WebAuthPayload._({
@@ -25,21 +25,16 @@ class WebAuthPayload {
         queryParameters: {
           'realm': String realmStr,
           'email': String email,
-          // 'user_id' handled below
+          'user_id': String userIdStr,
           'otp_encrypted_api_key': String otpEncryptedApiKey,
         },
       )
     ) {
       final Uri? realm = Uri.tryParse(realmStr);
       if (realm == null) throw const FormatException();
 
-      // TODO(server-5) require in queryParameters (new in FL 108)
-      final userIdStr = url.queryParameters['user_id'];
-      int? userId;
-      if (userIdStr != null) {
-        userId = int.tryParse(userIdStr, radix: 10);
-        if (userId == null) throw const FormatException();
-      }
+      final userId = int.tryParse(userIdStr, radix: 10);
+      if (userId == null) throw const FormatException();
 
       if (!RegExp(r'^[0-9a-fA-F]{64}$').hasMatch(otpEncryptedApiKey)) {
         throw const FormatException();

lib/api/notifications.dart

@@ -177,13 +177,9 @@ sealed class FcmMessageRecipient {
 @JsonSerializable(fieldRename: FieldRename.snake, createToJson: false)
 @_IntConverter()
 class FcmMessageChannelRecipient extends FcmMessageRecipient {
-  // Sending the stream ID in notifications is new in Zulip Server 5.
-  // But handling the lack of it would add complication, and we don't strictly
-  // need to -- we intend (#268) to cut pre-server-5 support before beta release.
-  // TODO(server-5): cut comment
   final int streamId;
 
-  // Current servers (as of 2023) always send the stream name.  But
+  // Current servers (as of 2025) always send the stream name.  But
   // future servers might not, once clients get the name from local data.
   // So might as well be ready.
   @JsonKey(name: 'stream')

lib/api/route/messages.dart

@@ -1,64 +1,16 @@
 import 'package:json_annotation/json_annotation.dart';
 
 import '../core.dart';
-import '../exception.dart';
 import '../model/model.dart';
 import '../model/narrow.dart';
 
 part 'messages.g.dart';
 
-/// Convenience function to get a single message from any server.
-///
-/// This encapsulates a server-feature check.
-///
-/// Gives null if the server reports that the message doesn't exist.
-// TODO(server-5) Simplify this away; just use getMessage.
-Future<Message?> getMessageCompat(ApiConnection connection, {
-  required int messageId,
-  bool? applyMarkdown,
-}) async {
-  final useLegacyApi = connection.zulipFeatureLevel! < 120;
-  if (useLegacyApi) {
-    final response = await getMessages(connection,
-      narrow: [ApiNarrowMessageId(messageId)],
-      anchor: NumericAnchor(messageId),
-      numBefore: 0,
-      numAfter: 0,
-      applyMarkdown: applyMarkdown,
-
-      // Hard-code this param to `true`, as the new single-message API
-      // effectively does:
-      //   https://chat.zulip.org/#narrow/stream/378-api-design/topic/.60client_gravatar.60.20in.20.60messages.2F.7Bmessage_id.7D.60/near/1418337
-      clientGravatar: true,
-    );
-    return response.messages.firstOrNull;
-  } else {
-    try {
-      final response = await getMessage(connection,
-        messageId: messageId,
-        applyMarkdown: applyMarkdown,
-      );
-      return response.message;
-    } on ZulipApiException catch (e) {
-      if (e.code == 'BAD_REQUEST') {
-        // Servers use this code when the message doesn't exist, according to
-        // the example in the doc.
-        return null;
-      }
-      rethrow;
-    }
-  }
-}
-
 /// https://zulip.com/api/get-message
-///
-/// This binding only supports feature levels 120+.
-// TODO(server-5) remove FL 120+ mention in doc, and the related `assert`
 Future<GetMessageResult> getMessage(ApiConnection connection, {
   required int messageId,
   bool? applyMarkdown,
 }) {
-  assert(connection.zulipFeatureLevel! >= 120);
   return connection.get('getMessage', GetMessageResult.fromJson, 'messages/$messageId', {
     if (applyMarkdown != null) 'apply_markdown': applyMarkdown,
   });

lib/api/route/realm.dart

@@ -36,7 +36,8 @@ class GetServerSettingsResult {
 
   final int zulipFeatureLevel;
   final String zulipVersion;
-  final String? zulipMergeBase; // TODO(server-5)
+  // TODO(server-5): Modernize this once we get to #267.
+  final String? zulipMergeBase;
 
   final bool pushNotificationsEnabled;
   final bool isIncompatible;
@@ -50,7 +51,7 @@ class GetServerSettingsResult {
   final String realmName;
   final String realmIcon;
   final String realmDescription;
-  final bool? realmWebPublicAccessEnabled; // TODO(server-5)
+  final bool realmWebPublicAccessEnabled;
 
   GetServerSettingsResult({
     required this.authenticationMethods,

lib/model/emoji.dart

@@ -18,9 +18,9 @@ sealed class EmojiDisplay {
 
   EmojiDisplay({required this.emojiName});
 
-  EmojiDisplay resolve(UserSettings? userSettings) { // TODO(server-5)
+  EmojiDisplay resolve(UserSettings userSettings) {
     if (this is TextEmojiDisplay) return this;
-    if (userSettings?.emojiset == Emojiset.text) {
+    if (userSettings.emojiset == Emojiset.text) {
       return TextEmojiDisplay(emojiName: emojiName);
     }
     return this;

lib/model/message.dart

@@ -128,9 +128,7 @@ class MessageStoreImpl with MessageStore {
   }
 
   void _handleUpdateMessageEventTimestamp(UpdateMessageEvent event) {
-    // TODO(server-5): Cut this fallback; rely on renderingOnly from FL 114
-    final isRenderingOnly = event.renderingOnly ?? (event.userId == null);
-    if (event.editTimestamp == null || isRenderingOnly) {
+    if (event.renderingOnly) {
       // A rendering-only update gets omitted from the message edit history,
       // and [Message.lastEditTimestamp] is the last timestamp of that history.
       // So on a rendering-only update, the timestamp doesn't get updated.

lib/model/store.dart

@@ -456,7 +456,7 @@ class PerAccountStore extends ChangeNotifier with EmojiStore, UserStore, Channel
   /// Will throw if called after [dispose] has been called.
   Account get account => _globalStore.getAccount(accountId)!;
 
-  final UserSettings? userSettings; // TODO(server-5)
+  final UserSettings userSettings;
 
   final TypingNotifier typingNotifier;
 
@@ -626,11 +626,11 @@ class PerAccountStore extends ChangeNotifier with EmojiStore, UserStore, Channel
         }
         switch (event.property!) {
           case UserSettingName.twentyFourHourTime:
-            userSettings?.twentyFourHourTime        = event.value as bool;
+            userSettings.twentyFourHourTime        = event.value as bool;
           case UserSettingName.displayEmojiReactionUsers:
-            userSettings?.displayEmojiReactionUsers = event.value as bool;
+            userSettings.displayEmojiReactionUsers = event.value as bool;
           case UserSettingName.emojiset:
-            userSettings?.emojiset                  = event.value as Emojiset;
+            userSettings.emojiset                  = event.value as Emojiset;
         }
         notifyListeners();