user [nfc]: Move selfUserId to UserStore

Author: gnprice

lib/model/store.dart

@@ -279,7 +279,6 @@ class PerAccountStore extends ChangeNotifier with EmojiStore, UserStore, Channel
       emoji: EmojiStoreImpl(
         realmUrl: realmUrl, allRealmEmoji: initialSnapshot.realmEmoji),
       accountId: accountId,
-      selfUserId: account.userId,
       userSettings: initialSnapshot.userSettings,
       typingNotifier: TypingNotifier(
         connection: connection,
@@ -288,7 +287,9 @@ class PerAccountStore extends ChangeNotifier with EmojiStore, UserStore, Channel
         typingStartedWaitPeriod: Duration(
           milliseconds: initialSnapshot.serverTypingStartedWaitPeriodMilliseconds),
       ),
-      users: UserStoreImpl(initialSnapshot: initialSnapshot),
+      users: UserStoreImpl(
+        selfUserId: account.userId,
+        initialSnapshot: initialSnapshot),
       typingStatus: TypingStatus(
         selfUserId: account.userId,
         typingStartedExpiryPeriod: Duration(milliseconds: initialSnapshot.serverTypingStartedExpiryPeriodMilliseconds),
@@ -319,7 +320,6 @@ class PerAccountStore extends ChangeNotifier with EmojiStore, UserStore, Channel
     required this.emailAddressVisibility,
     required EmojiStoreImpl emoji,
     required this.accountId,
-    required this.selfUserId,
     required this.userSettings,
     required this.typingNotifier,
     required UserStoreImpl users,
@@ -329,8 +329,7 @@ class PerAccountStore extends ChangeNotifier with EmojiStore, UserStore, Channel
     required this.unreads,
     required this.recentDmConversationsView,
     required this.recentSenders,
-  }) : assert(selfUserId == globalStore.getAccount(accountId)!.userId),
-       assert(realmUrl == globalStore.getAccount(accountId)!.realmUrl),
+  }) : assert(realmUrl == globalStore.getAccount(accountId)!.realmUrl),
        assert(realmUrl == connection.realmUrl),
        assert(emoji.realmUrl == realmUrl),
        _globalStore = globalStore,
@@ -428,16 +427,16 @@ class PerAccountStore extends ChangeNotifier with EmojiStore, UserStore, Channel
   /// Will throw if called after [dispose] has been called.
   Account get account => _globalStore.getAccount(accountId)!;
 
-  /// Always equal to `account.userId`.
-  final int selfUserId;
-
   final UserSettings? userSettings; // TODO(server-5)
 
   final TypingNotifier typingNotifier;
 
   ////////////////////////////////
   // Users and data about them.
 
+  @override
+  int get selfUserId => _users.selfUserId;
+
   @override
   Map<int, User> get users => _users.users;
 

lib/model/user.dart

@@ -5,6 +5,12 @@ import 'localizations.dart';
 
 /// The portion of [PerAccountStore] describing the users in the realm.
 mixin UserStore {
+  /// The user ID of the "self-user",
+  /// i.e. the account the person using this app is logged into.
+  ///
+  /// This always equals the [Account.userId] on [PerAccountStore.account].
+  int get selfUserId;
+
   /// All known users in the realm, by [User.userId].
   ///
   /// There may be other users not found in this map, for multiple reasons:
@@ -41,13 +47,18 @@ mixin UserStore {
 /// itself.  Other code accesses this functionality through [PerAccountStore],
 /// or through the mixin [UserStore] which describes its interface.
 class UserStoreImpl with UserStore {
-  UserStoreImpl({required InitialSnapshot initialSnapshot})
-     : users = Map.fromEntries(
+  UserStoreImpl({
+    required this.selfUserId,
+    required InitialSnapshot initialSnapshot,
+  }) : users = Map.fromEntries(
          initialSnapshot.realmUsers
          .followedBy(initialSnapshot.realmNonActiveUsers)
          .followedBy(initialSnapshot.crossRealmBots)
          .map((user) => MapEntry(user.userId, user)));
 
+  @override
+  final int selfUserId;
+
   @override
   final Map<int, User> users;