api: Mark {InitialSnapshot,PerAccountStore}.userSettings as required, relying on server 5+, FL 89+

See "Feature level 89" from Zulip API changelog:

   https://zulip.com/api/changelog

Signed-off-by: Zixuan James Li <[email protected]>

Author: PIG208

lib/api/model/initial_snapshot.dart

@@ -55,13 +55,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)
 

lib/api/model/initial_snapshot.g.dart

@@ -334,7 +334,7 @@ class PerAccountStore extends ChangeNotifier with ChannelStore, MessageStore {
   /// Always equal to `account.userId`.
   final int selfUserId;
 
-  final UserSettings? userSettings; // TODO(server-5)
+  final UserSettings userSettings;
 
   ////////////////////////////////
   // Users and data about them.
@@ -435,11 +435,11 @@ class PerAccountStore extends ChangeNotifier with ChannelStore, MessageStore {
         }
         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();
 

lib/model/store.dart

@@ -117,7 +117,7 @@ class ReactionChipsList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final store = PerAccountStoreWidget.of(context);
-    final displayEmojiReactionUsers = store.userSettings?.displayEmojiReactionUsers ?? false;
+    final displayEmojiReactionUsers = store.userSettings.displayEmojiReactionUsers ?? false;
     final showNames = displayEmojiReactionUsers && reactions.total <= 3;
 
     return Wrap(spacing: 4, runSpacing: 4, crossAxisAlignment: WrapCrossAlignment.center,
@@ -149,7 +149,7 @@ class ReactionChip extends StatelessWidget {
     final emojiName = reactionWithVotes.emojiName;
     final userIds = reactionWithVotes.userIds;
 
-    final emojiset = store.userSettings?.emojiset ?? Emojiset.google;
+    final emojiset = store.userSettings.emojiset;
 
     final selfVoted = userIds.contains(store.selfUserId);
     final label = showName

lib/widgets/emoji_reaction.dart

@@ -38,7 +38,7 @@ extension PerAccountStoreChecks on Subject<PerAccountStore> {
   Subject<int> get accountId => has((x) => x.accountId, 'accountId');
   Subject<Account> get account => has((x) => x.account, 'account');
   Subject<int> get selfUserId => has((x) => x.selfUserId, 'selfUserId');
-  Subject<UserSettings?> get userSettings => has((x) => x.userSettings, 'userSettings');
+  Subject<UserSettings> get userSettings => has((x) => x.userSettings, 'userSettings');
   Subject<Map<int, User>> get users => has((x) => x.users, 'users');
   Subject<Map<int, ZulipStream>> get streams => has((x) => x.streams, 'streams');
   Subject<Map<String, ZulipStream>> get streamsByName => has((x) => x.streamsByName, 'streamsByName');

test/model/store_checks.dart

@@ -380,15 +380,15 @@ void main() {
       updateMachine.poll();
 
       // Pick some arbitrary event and check it gets processed on the store.
-      check(store.userSettings!.twentyFourHourTime).isFalse();
+      check(store.userSettings.twentyFourHourTime).isFalse();
       connection.prepare(json: GetEventsResult(events: [
         UserSettingsUpdateEvent(id: 2,
           property: UserSettingName.twentyFourHourTime, value: true),
       ], queueId: null).toJson());
       updateMachine.debugAdvanceLoop();
       async.flushMicrotasks();
       await Future<void>.delayed(Duration.zero);
-      check(store.userSettings!.twentyFourHourTime).isTrue();
+      check(store.userSettings.twentyFourHourTime).isTrue();
     }));
 
     test('handles expired queue', () => awaitFakeAsync((async) async {
@@ -416,15 +416,15 @@ void main() {
       // The new UpdateMachine updates the new store.
       updateMachine.debugPauseLoop();
       updateMachine.poll();
-      check(store.userSettings!.twentyFourHourTime).isFalse();
+      check(store.userSettings.twentyFourHourTime).isFalse();
       connection.prepare(json: GetEventsResult(events: [
         UserSettingsUpdateEvent(id: 2,
           property: UserSettingName.twentyFourHourTime, value: true),
       ], queueId: null).toJson());
       updateMachine.debugAdvanceLoop();
       async.flushMicrotasks();
       await Future<void>.delayed(Duration.zero);
-      check(store.userSettings!.twentyFourHourTime).isTrue();
+      check(store.userSettings.twentyFourHourTime).isTrue();
     }));
 
     void checkRetry(void Function() prepareError) {