diff --git a/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt b/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt
index d1b91c9614..7d01fdc291 100644
--- a/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt
+++ b/android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt
@@ -1,5 +1,6 @@
-// Autogenerated from Pigeon (v18.0.0), do not edit directly.
+// Autogenerated from Pigeon (v19.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
+@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
 
 package com.zulip.flutter
 
@@ -16,14 +17,14 @@ private fun wrapResult(result: Any?): List<Any?> {
 }
 
 private fun wrapError(exception: Throwable): List<Any?> {
-  if (exception is FlutterError) {
-    return listOf(
+  return if (exception is FlutterError) {
+    listOf(
       exception.code,
       exception.message,
       exception.details
     )
   } else {
-    return listOf(
+    listOf(
       exception.javaClass.simpleName,
       exception.toString(),
       "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
@@ -65,11 +66,11 @@ data class PendingIntent (
 
 ) {
   companion object {
-    @Suppress("UNCHECKED_CAST")
-    fun fromList(list: List<Any?>): PendingIntent {
-      val requestCode = list[0].let { if (it is Int) it.toLong() else it as Long }
-      val intentPayload = list[1] as String
-      val flags = list[2].let { if (it is Int) it.toLong() else it as Long }
+    @Suppress("LocalVariableName")
+    fun fromList(__pigeon_list: List<Any?>): PendingIntent {
+      val requestCode = __pigeon_list[0].let { num -> if (num is Int) num.toLong() else num as Long }
+      val intentPayload = __pigeon_list[1] as String
+      val flags = __pigeon_list[2].let { num -> if (num is Int) num.toLong() else num as Long }
       return PendingIntent(requestCode, intentPayload, flags)
     }
   }
@@ -81,7 +82,6 @@ data class PendingIntent (
     )
   }
 }
-@Suppress("UNCHECKED_CAST")
 private object AndroidNotificationHostApiCodec : StandardMessageCodec() {
   override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
     return when (type) {
@@ -133,7 +133,6 @@ interface AndroidNotificationHostApi {
       AndroidNotificationHostApiCodec
     }
     /** Sets up an instance of `AndroidNotificationHostApi` to handle messages through the `binaryMessenger`. */
-    @Suppress("UNCHECKED_CAST")
     fun setUp(binaryMessenger: BinaryMessenger, api: AndroidNotificationHostApi?, messageChannelSuffix: String = "") {
       val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
       run {
@@ -142,20 +141,19 @@ interface AndroidNotificationHostApi {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
             val tagArg = args[0] as String?
-            val idArg = args[1].let { if (it is Int) it.toLong() else it as Long }
+            val idArg = args[1].let { num -> if (num is Int) num.toLong() else num as Long }
             val channelIdArg = args[2] as String
-            val colorArg = args[3].let { if (it is Int) it.toLong() else it as Long? }
+            val colorArg = args[3].let { num -> if (num is Int) num.toLong() else num as Long? }
             val contentIntentArg = args[4] as PendingIntent?
             val contentTextArg = args[5] as String?
             val contentTitleArg = args[6] as String?
             val extrasArg = args[7] as Map<String?, String?>?
             val smallIconResourceNameArg = args[8] as String?
-            var wrapped: List<Any?>
-            try {
+            val wrapped: List<Any?> = try {
               api.notify(tagArg, idArg, channelIdArg, colorArg, contentIntentArg, contentTextArg, contentTitleArg, extrasArg, smallIconResourceNameArg)
-              wrapped = listOf<Any?>(null)
+              listOf<Any?>(null)
             } catch (exception: Throwable) {
-              wrapped = wrapError(exception)
+              wrapError(exception)
             }
             reply.reply(wrapped)
           }
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index e16ed49e88..68b19ec3d4 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -3,64 +3,64 @@ PODS:
     - Flutter
   - device_info_plus (0.0.1):
     - Flutter
-  - DKImagePickerController/Core (4.3.8):
+  - DKImagePickerController/Core (4.3.9):
     - DKImagePickerController/ImageDataManager
     - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.8)
-  - DKImagePickerController/PhotoGallery (4.3.8):
+  - DKImagePickerController/ImageDataManager (4.3.9)
+  - DKImagePickerController/PhotoGallery (4.3.9):
     - DKImagePickerController/Core
     - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.8)
-  - DKPhotoGallery (0.0.17):
-    - DKPhotoGallery/Core (= 0.0.17)
-    - DKPhotoGallery/Model (= 0.0.17)
-    - DKPhotoGallery/Preview (= 0.0.17)
-    - DKPhotoGallery/Resource (= 0.0.17)
+  - DKImagePickerController/Resource (4.3.9)
+  - DKPhotoGallery (0.0.19):
+    - DKPhotoGallery/Core (= 0.0.19)
+    - DKPhotoGallery/Model (= 0.0.19)
+    - DKPhotoGallery/Preview (= 0.0.19)
+    - DKPhotoGallery/Resource (= 0.0.19)
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Core (0.0.17):
+  - DKPhotoGallery/Core (0.0.19):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Preview
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Model (0.0.17):
+  - DKPhotoGallery/Model (0.0.19):
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Preview (0.0.17):
+  - DKPhotoGallery/Preview (0.0.19):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Resource
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Resource (0.0.17):
+  - DKPhotoGallery/Resource (0.0.19):
     - SDWebImage
     - SwiftyGif
   - file_picker (0.0.1):
     - DKImagePickerController/PhotoGallery
     - Flutter
-  - Firebase/CoreOnly (10.24.0):
-    - FirebaseCore (= 10.24.0)
-  - Firebase/Messaging (10.24.0):
+  - Firebase/CoreOnly (10.25.0):
+    - FirebaseCore (= 10.25.0)
+  - Firebase/Messaging (10.25.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 10.24.0)
-  - firebase_core (2.30.1):
-    - Firebase/CoreOnly (= 10.24.0)
+    - FirebaseMessaging (~> 10.25.0)
+  - firebase_core (2.32.0):
+    - Firebase/CoreOnly (= 10.25.0)
     - Flutter
-  - firebase_messaging (14.9.0):
-    - Firebase/Messaging (= 10.24.0)
+  - firebase_messaging (14.9.4):
+    - Firebase/Messaging (= 10.25.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (10.24.0):
+  - FirebaseCore (10.25.0):
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.12)
     - GoogleUtilities/Logger (~> 7.12)
-  - FirebaseCoreInternal (10.24.0):
+  - FirebaseCoreInternal (10.25.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (10.24.0):
+  - FirebaseInstallations (10.25.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
     - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (10.24.0):
+  - FirebaseMessaging (10.25.0):
     - FirebaseCore (~> 10.0)
     - FirebaseInstallations (~> 10.0)
     - GoogleDataTransport (~> 9.3)
@@ -76,29 +76,29 @@ PODS:
     - GoogleUtilities/Environment (~> 7.7)
     - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.13.0):
+  - GoogleUtilities/AppDelegateSwizzler (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Environment (7.13.0):
+  - GoogleUtilities/Environment (7.13.3):
     - GoogleUtilities/Privacy
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.13.0):
+  - GoogleUtilities/Logger (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Network (7.13.0):
+  - GoogleUtilities/Network (7.13.3):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.13.0)":
+  - "GoogleUtilities/NSData+zlib (7.13.3)":
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (7.13.0)
-  - GoogleUtilities/Reachability (7.13.0):
+  - GoogleUtilities/Privacy (7.13.3)
+  - GoogleUtilities/Reachability (7.13.3):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - GoogleUtilities/UserDefaults (7.13.0):
+  - GoogleUtilities/UserDefaults (7.13.3):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
   - image_picker_ios (0.0.1):
@@ -116,23 +116,23 @@ PODS:
     - Flutter
     - FlutterMacOS
   - PromisesObjC (2.4.0)
-  - SDWebImage (5.19.1):
-    - SDWebImage/Core (= 5.19.1)
-  - SDWebImage/Core (5.19.1)
+  - SDWebImage (5.19.2):
+    - SDWebImage/Core (= 5.19.2)
+  - SDWebImage/Core (5.19.2)
   - share_plus (0.0.1):
     - Flutter
-  - "sqlite3 (3.45.3+1)":
-    - "sqlite3/common (= 3.45.3+1)"
-  - "sqlite3/common (3.45.3+1)"
-  - "sqlite3/fts5 (3.45.3+1)":
+  - sqlite3 (3.46.0):
+    - sqlite3/common (= 3.46.0)
+  - sqlite3/common (3.46.0)
+  - sqlite3/fts5 (3.46.0):
     - sqlite3/common
-  - "sqlite3/perf-threadsafe (3.45.3+1)":
+  - sqlite3/perf-threadsafe (3.46.0):
     - sqlite3/common
-  - "sqlite3/rtree (3.45.3+1)":
+  - sqlite3/rtree (3.46.0):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
-    - "sqlite3 (~> 3.45.3+1)"
+    - sqlite3 (~> 3.46.0)
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
@@ -212,33 +212,33 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   app_settings: 017320c6a680cdc94c799949d95b84cb69389ebc
   device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
-  DKImagePickerController: a7836546cfdfe014171694f643a7d575bc8ace7f
-  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
+  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
+  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
   file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
-  Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
-  firebase_core: 7f1e1156934d0da3be260174812842df9420e4ab
-  firebase_messaging: 917a590db1d2f6fec494c5d9aa83c010f518c28f
-  FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894
-  FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af
-  FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e
-  FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d
+  Firebase: 0312a2352584f782ea56f66d91606891d4607f06
+  firebase_core: a626d00494efa398e7c54f25f1454a64c8abf197
+  firebase_messaging: 06391e8f35dc65a00c56580266285263d2861f10
+  FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483
+  FirebaseCoreInternal: 910a81992c33715fec9263ca7381d59ab3a750b7
+  FirebaseInstallations: 91950fe859846fff0fbd296180909dd273103b09
+  FirebaseMessaging: 88950ba9485052891ebe26f6c43a52bb62248952
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
-  GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
-  image_picker_ios: b545a5f16c0fa88e3ecbbce3ed4de45567a8ec18
+  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
+  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
   integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  SDWebImage: 40b0b4053e36c660a764958bff99eed16610acbb
+  SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
-  sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a
-  sqlite3_flutter_libs: 9bfe005308998aeca155330bbc2ea6dddf834a3b
+  sqlite3: 154b084339ede06960a5b3c8160066adc9176b7d
+  sqlite3_flutter_libs: 0d611efdf6d1c9297d5ab03dab21b75aeebdae31
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-  url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
-  video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
 
 PODFILE CHECKSUM: 7ed5116924b3be7e8fb75f7aada61e057028f5c7
 
diff --git a/lib/api/model/events.g.dart b/lib/api/model/events.g.dart
index b7257df594..d20ff78d48 100644
--- a/lib/api/model/events.g.dart
+++ b/lib/api/model/events.g.dart
@@ -11,7 +11,7 @@ part of 'events.dart';
 RealmEmojiUpdateEvent _$RealmEmojiUpdateEventFromJson(
         Map<String, dynamic> json) =>
     RealmEmojiUpdateEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       realmEmoji: (json['realm_emoji'] as Map<String, dynamic>).map(
         (k, e) =>
             MapEntry(k, RealmEmojiItem.fromJson(e as Map<String, dynamic>)),
@@ -29,7 +29,7 @@ Map<String, dynamic> _$RealmEmojiUpdateEventToJson(
 
 AlertWordsEvent _$AlertWordsEventFromJson(Map<String, dynamic> json) =>
     AlertWordsEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       alertWords: (json['alert_words'] as List<dynamic>)
           .map((e) => e as String)
           .toList(),
@@ -45,7 +45,7 @@ Map<String, dynamic> _$AlertWordsEventToJson(AlertWordsEvent instance) =>
 UserSettingsUpdateEvent _$UserSettingsUpdateEventFromJson(
         Map<String, dynamic> json) =>
     UserSettingsUpdateEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       property: $enumDecodeNullable(_$UserSettingNameEnumMap, json['property'],
           unknownValue: JsonKey.nullForUndefinedEnumValue),
       value: UserSettingsUpdateEvent._readValue(json, 'value'),
@@ -70,7 +70,7 @@ const _$UserSettingNameEnumMap = {
 CustomProfileFieldsEvent _$CustomProfileFieldsEventFromJson(
         Map<String, dynamic> json) =>
     CustomProfileFieldsEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       fields: (json['fields'] as List<dynamic>)
           .map((e) => CustomProfileField.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -86,7 +86,7 @@ Map<String, dynamic> _$CustomProfileFieldsEventToJson(
 
 RealmUserAddEvent _$RealmUserAddEventFromJson(Map<String, dynamic> json) =>
     RealmUserAddEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       person: User.fromJson(json['person'] as Map<String, dynamic>),
     );
 
@@ -100,7 +100,7 @@ Map<String, dynamic> _$RealmUserAddEventToJson(RealmUserAddEvent instance) =>
 RealmUserUpdateCustomProfileField _$RealmUserUpdateCustomProfileFieldFromJson(
         Map<String, dynamic> json) =>
     RealmUserUpdateCustomProfileField(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       value: json['value'] as String?,
       renderedValue: json['rendered_value'] as String?,
     );
@@ -116,18 +116,21 @@ Map<String, dynamic> _$RealmUserUpdateCustomProfileFieldToJson(
 RealmUserUpdateEvent _$RealmUserUpdateEventFromJson(
         Map<String, dynamic> json) =>
     RealmUserUpdateEvent(
-      id: json['id'] as int,
-      userId: RealmUserUpdateEvent._readFromPerson(json, 'user_id') as int,
+      id: (json['id'] as num).toInt(),
+      userId: (RealmUserUpdateEvent._readFromPerson(json, 'user_id') as num)
+          .toInt(),
       fullName:
           RealmUserUpdateEvent._readFromPerson(json, 'full_name') as String?,
       avatarUrl:
           RealmUserUpdateEvent._readFromPerson(json, 'avatar_url') as String?,
       avatarVersion:
-          RealmUserUpdateEvent._readFromPerson(json, 'avatar_version') as int?,
+          (RealmUserUpdateEvent._readFromPerson(json, 'avatar_version') as num?)
+              ?.toInt(),
       timezone:
           RealmUserUpdateEvent._readFromPerson(json, 'timezone') as String?,
       botOwnerId:
-          RealmUserUpdateEvent._readFromPerson(json, 'bot_owner_id') as int?,
+          (RealmUserUpdateEvent._readFromPerson(json, 'bot_owner_id') as num?)
+              ?.toInt(),
       role: $enumDecodeNullable(
           _$UserRoleEnumMap, RealmUserUpdateEvent._readFromPerson(json, 'role'),
           unknownValue: UserRole.unknown),
@@ -177,7 +180,7 @@ const _$UserRoleEnumMap = {
 
 StreamCreateEvent _$StreamCreateEventFromJson(Map<String, dynamic> json) =>
     StreamCreateEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       streams: (json['streams'] as List<dynamic>)
           .map((e) => ZulipStream.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -192,7 +195,7 @@ Map<String, dynamic> _$StreamCreateEventToJson(StreamCreateEvent instance) =>
 
 StreamDeleteEvent _$StreamDeleteEventFromJson(Map<String, dynamic> json) =>
     StreamDeleteEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       streams: (json['streams'] as List<dynamic>)
           .map((e) => ZulipStream.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -208,7 +211,7 @@ Map<String, dynamic> _$StreamDeleteEventToJson(StreamDeleteEvent instance) =>
 SubscriptionAddEvent _$SubscriptionAddEventFromJson(
         Map<String, dynamic> json) =>
     SubscriptionAddEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       subscriptions: (json['subscriptions'] as List<dynamic>)
           .map((e) => Subscription.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -226,10 +229,10 @@ Map<String, dynamic> _$SubscriptionAddEventToJson(
 SubscriptionRemoveEvent _$SubscriptionRemoveEventFromJson(
         Map<String, dynamic> json) =>
     SubscriptionRemoveEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       streamIds: (SubscriptionRemoveEvent._readStreamIds(json, 'stream_ids')
               as List<dynamic>)
-          .map((e) => e as int)
+          .map((e) => (e as num).toInt())
           .toList(),
     );
 
@@ -245,8 +248,8 @@ Map<String, dynamic> _$SubscriptionRemoveEventToJson(
 SubscriptionUpdateEvent _$SubscriptionUpdateEventFromJson(
         Map<String, dynamic> json) =>
     SubscriptionUpdateEvent(
-      id: json['id'] as int,
-      streamId: json['stream_id'] as int,
+      id: (json['id'] as num).toInt(),
+      streamId: (json['stream_id'] as num).toInt(),
       property: $enumDecode(_$SubscriptionPropertyEnumMap, json['property']),
       value: SubscriptionUpdateEvent._readValue(json, 'value'),
     );
@@ -278,11 +281,13 @@ const _$SubscriptionPropertyEnumMap = {
 SubscriptionPeerAddEvent _$SubscriptionPeerAddEventFromJson(
         Map<String, dynamic> json) =>
     SubscriptionPeerAddEvent(
-      id: json['id'] as int,
-      streamIds:
-          (json['stream_ids'] as List<dynamic>).map((e) => e as int).toList(),
-      userIds:
-          (json['user_ids'] as List<dynamic>).map((e) => e as int).toList(),
+      id: (json['id'] as num).toInt(),
+      streamIds: (json['stream_ids'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
+      userIds: (json['user_ids'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
     );
 
 Map<String, dynamic> _$SubscriptionPeerAddEventToJson(
@@ -298,11 +303,13 @@ Map<String, dynamic> _$SubscriptionPeerAddEventToJson(
 SubscriptionPeerRemoveEvent _$SubscriptionPeerRemoveEventFromJson(
         Map<String, dynamic> json) =>
     SubscriptionPeerRemoveEvent(
-      id: json['id'] as int,
-      streamIds:
-          (json['stream_ids'] as List<dynamic>).map((e) => e as int).toList(),
-      userIds:
-          (json['user_ids'] as List<dynamic>).map((e) => e as int).toList(),
+      id: (json['id'] as num).toInt(),
+      streamIds: (json['stream_ids'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
+      userIds: (json['user_ids'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
     );
 
 Map<String, dynamic> _$SubscriptionPeerRemoveEventToJson(
@@ -317,10 +324,10 @@ Map<String, dynamic> _$SubscriptionPeerRemoveEventToJson(
 
 UserTopicEvent _$UserTopicEventFromJson(Map<String, dynamic> json) =>
     UserTopicEvent(
-      id: json['id'] as int,
-      streamId: json['stream_id'] as int,
+      id: (json['id'] as num).toInt(),
+      streamId: (json['stream_id'] as num).toInt(),
       topicName: json['topic_name'] as String,
-      lastUpdated: json['last_updated'] as int,
+      lastUpdated: (json['last_updated'] as num).toInt(),
       visibilityPolicy: $enumDecode(
           _$UserTopicVisibilityPolicyEnumMap, json['visibility_policy']),
     );
@@ -345,19 +352,20 @@ const _$UserTopicVisibilityPolicyEnumMap = {
 
 UpdateMessageEvent _$UpdateMessageEventFromJson(Map<String, dynamic> json) =>
     UpdateMessageEvent(
-      id: json['id'] as int,
-      userId: json['user_id'] as int?,
+      id: (json['id'] as num).toInt(),
+      userId: (json['user_id'] as num?)?.toInt(),
       renderingOnly: json['rendering_only'] as bool?,
-      messageId: json['message_id'] as int,
-      messageIds:
-          (json['message_ids'] as List<dynamic>).map((e) => e as int).toList(),
+      messageId: (json['message_id'] as num).toInt(),
+      messageIds: (json['message_ids'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
       flags: (json['flags'] as List<dynamic>)
           .map((e) => $enumDecode(_$MessageFlagEnumMap, e))
           .toList(),
-      editTimestamp: json['edit_timestamp'] as int?,
+      editTimestamp: (json['edit_timestamp'] as num?)?.toInt(),
       streamName: json['stream_name'] as String?,
-      streamId: json['stream_id'] as int?,
-      newStreamId: json['new_stream_id'] as int?,
+      streamId: (json['stream_id'] as num?)?.toInt(),
+      newStreamId: (json['new_stream_id'] as num?)?.toInt(),
       propagateMode:
           $enumDecodeNullable(_$PropagateModeEnumMap, json['propagate_mode']),
       origSubject: json['orig_subject'] as String?,
@@ -410,11 +418,12 @@ const _$PropagateModeEnumMap = {
 
 DeleteMessageEvent _$DeleteMessageEventFromJson(Map<String, dynamic> json) =>
     DeleteMessageEvent(
-      id: json['id'] as int,
-      messageIds:
-          (json['message_ids'] as List<dynamic>).map((e) => e as int).toList(),
+      id: (json['id'] as num).toInt(),
+      messageIds: (json['message_ids'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
       messageType: $enumDecode(_$MessageTypeEnumMap, json['message_type']),
-      streamId: json['stream_id'] as int?,
+      streamId: (json['stream_id'] as num?)?.toInt(),
       topic: json['topic'] as String?,
     );
 
@@ -435,11 +444,12 @@ const _$MessageTypeEnumMap = {
 UpdateMessageFlagsAddEvent _$UpdateMessageFlagsAddEventFromJson(
         Map<String, dynamic> json) =>
     UpdateMessageFlagsAddEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       flag: $enumDecode(_$MessageFlagEnumMap, json['flag'],
           unknownValue: MessageFlag.unknown),
-      messages:
-          (json['messages'] as List<dynamic>).map((e) => e as int).toList(),
+      messages: (json['messages'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
       all: json['all'] as bool,
     );
 
@@ -456,11 +466,12 @@ Map<String, dynamic> _$UpdateMessageFlagsAddEventToJson(
 UpdateMessageFlagsRemoveEvent _$UpdateMessageFlagsRemoveEventFromJson(
         Map<String, dynamic> json) =>
     UpdateMessageFlagsRemoveEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       flag: $enumDecode(_$MessageFlagEnumMap, json['flag'],
           unknownValue: MessageFlag.unknown),
-      messages:
-          (json['messages'] as List<dynamic>).map((e) => e as int).toList(),
+      messages: (json['messages'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
       messageDetails: (json['message_details'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(
             int.parse(k),
@@ -485,9 +496,10 @@ UpdateMessageFlagsMessageDetail _$UpdateMessageFlagsMessageDetailFromJson(
     UpdateMessageFlagsMessageDetail(
       type: $enumDecode(_$MessageTypeEnumMap, json['type']),
       mentioned: json['mentioned'] as bool?,
-      userIds:
-          (json['user_ids'] as List<dynamic>?)?.map((e) => e as int).toList(),
-      streamId: json['stream_id'] as int?,
+      userIds: (json['user_ids'] as List<dynamic>?)
+          ?.map((e) => (e as num).toInt())
+          .toList(),
+      streamId: (json['stream_id'] as num?)?.toInt(),
       topic: json['topic'] as String?,
     );
 
@@ -503,13 +515,13 @@ Map<String, dynamic> _$UpdateMessageFlagsMessageDetailToJson(
 
 ReactionEvent _$ReactionEventFromJson(Map<String, dynamic> json) =>
     ReactionEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       op: $enumDecode(_$ReactionOpEnumMap, json['op']),
       emojiName: json['emoji_name'] as String,
       emojiCode: json['emoji_code'] as String,
       reactionType: $enumDecode(_$ReactionTypeEnumMap, json['reaction_type']),
-      userId: json['user_id'] as int,
-      messageId: json['message_id'] as int,
+      userId: (json['user_id'] as num).toInt(),
+      messageId: (json['message_id'] as num).toInt(),
     );
 
 Map<String, dynamic> _$ReactionEventToJson(ReactionEvent instance) =>
@@ -537,7 +549,7 @@ const _$ReactionTypeEnumMap = {
 
 HeartbeatEvent _$HeartbeatEventFromJson(Map<String, dynamic> json) =>
     HeartbeatEvent(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
     );
 
 Map<String, dynamic> _$HeartbeatEventToJson(HeartbeatEvent instance) =>
diff --git a/lib/api/model/initial_snapshot.g.dart b/lib/api/model/initial_snapshot.g.dart
index 23687879ff..ec8f95ea7b 100644
--- a/lib/api/model/initial_snapshot.g.dart
+++ b/lib/api/model/initial_snapshot.g.dart
@@ -11,8 +11,8 @@ part of 'initial_snapshot.dart';
 InitialSnapshot _$InitialSnapshotFromJson(Map<String, dynamic> json) =>
     InitialSnapshot(
       queueId: json['queue_id'] as String?,
-      lastEventId: json['last_event_id'] as int,
-      zulipFeatureLevel: json['zulip_feature_level'] as int,
+      lastEventId: (json['last_event_id'] as num).toInt(),
+      zulipFeatureLevel: (json['zulip_feature_level'] as num).toInt(),
       zulipVersion: json['zulip_version'] as String,
       zulipMergeBase: json['zulip_merge_base'] as String?,
       alertWords: (json['alert_words'] as List<dynamic>)
@@ -49,7 +49,7 @@ InitialSnapshot _$InitialSnapshotFromJson(Map<String, dynamic> json) =>
         (k, e) => MapEntry(
             k, RealmDefaultExternalAccount.fromJson(e as Map<String, dynamic>)),
       ),
-      maxFileUploadSizeMib: json['max_file_upload_size_mib'] as int,
+      maxFileUploadSizeMib: (json['max_file_upload_size_mib'] as num).toInt(),
       realmUsers:
           (InitialSnapshot._readUsersIsActiveFallbackTrue(json, 'realm_users')
                   as List<dynamic>)
@@ -109,9 +109,10 @@ Map<String, dynamic> _$RealmDefaultExternalAccountToJson(
 RecentDmConversation _$RecentDmConversationFromJson(
         Map<String, dynamic> json) =>
     RecentDmConversation(
-      maxMessageId: json['max_message_id'] as int,
-      userIds:
-          (json['user_ids'] as List<dynamic>).map((e) => e as int).toList(),
+      maxMessageId: (json['max_message_id'] as num).toInt(),
+      userIds: (json['user_ids'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
     );
 
 Map<String, dynamic> _$RecentDmConversationToJson(
@@ -149,9 +150,9 @@ const _$EmojisetEnumMap = {
 
 UserTopicItem _$UserTopicItemFromJson(Map<String, dynamic> json) =>
     UserTopicItem(
-      streamId: json['stream_id'] as int,
+      streamId: (json['stream_id'] as num).toInt(),
       topicName: json['topic_name'] as String,
-      lastUpdated: json['last_updated'] as int,
+      lastUpdated: (json['last_updated'] as num).toInt(),
       visibilityPolicy: $enumDecode(
           _$UserTopicVisibilityPolicyEnumMap, json['visibility_policy'],
           unknownValue: UserTopicVisibilityPolicy.unknown),
@@ -176,7 +177,7 @@ const _$UserTopicVisibilityPolicyEnumMap = {
 UnreadMessagesSnapshot _$UnreadMessagesSnapshotFromJson(
         Map<String, dynamic> json) =>
     UnreadMessagesSnapshot(
-      count: json['count'] as int,
+      count: (json['count'] as num).toInt(),
       dms: (json['pms'] as List<dynamic>)
           .map((e) => UnreadDmSnapshot.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -186,8 +187,9 @@ UnreadMessagesSnapshot _$UnreadMessagesSnapshotFromJson(
       huddles: (json['huddles'] as List<dynamic>)
           .map((e) => UnreadHuddleSnapshot.fromJson(e as Map<String, dynamic>))
           .toList(),
-      mentions:
-          (json['mentions'] as List<dynamic>).map((e) => e as int).toList(),
+      mentions: (json['mentions'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
       oldUnreadsMissing: json['old_unreads_missing'] as bool,
     );
 
@@ -205,9 +207,10 @@ Map<String, dynamic> _$UnreadMessagesSnapshotToJson(
 UnreadDmSnapshot _$UnreadDmSnapshotFromJson(Map<String, dynamic> json) =>
     UnreadDmSnapshot(
       otherUserId:
-          UnreadDmSnapshot._readOtherUserId(json, 'other_user_id') as int,
+          (UnreadDmSnapshot._readOtherUserId(json, 'other_user_id') as num)
+              .toInt(),
       unreadMessageIds: (json['unread_message_ids'] as List<dynamic>)
-          .map((e) => e as int)
+          .map((e) => (e as num).toInt())
           .toList(),
     );
 
@@ -221,9 +224,9 @@ UnreadStreamSnapshot _$UnreadStreamSnapshotFromJson(
         Map<String, dynamic> json) =>
     UnreadStreamSnapshot(
       topic: json['topic'] as String,
-      streamId: json['stream_id'] as int,
+      streamId: (json['stream_id'] as num).toInt(),
       unreadMessageIds: (json['unread_message_ids'] as List<dynamic>)
-          .map((e) => e as int)
+          .map((e) => (e as num).toInt())
           .toList(),
     );
 
@@ -240,7 +243,7 @@ UnreadHuddleSnapshot _$UnreadHuddleSnapshotFromJson(
     UnreadHuddleSnapshot(
       userIdsString: json['user_ids_string'] as String,
       unreadMessageIds: (json['unread_message_ids'] as List<dynamic>)
-          .map((e) => e as int)
+          .map((e) => (e as num).toInt())
           .toList(),
     );
 
diff --git a/lib/api/model/model.g.dart b/lib/api/model/model.g.dart
index fd1e355d69..44cd4adf38 100644
--- a/lib/api/model/model.g.dart
+++ b/lib/api/model/model.g.dart
@@ -10,10 +10,10 @@ part of 'model.dart';
 
 CustomProfileField _$CustomProfileFieldFromJson(Map<String, dynamic> json) =>
     CustomProfileField(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       type: $enumDecode(_$CustomProfileFieldTypeEnumMap, json['type'],
           unknownValue: CustomProfileFieldType.unknown),
-      order: json['order'] as int,
+      order: (json['order'] as num).toInt(),
       name: json['name'] as String,
       hint: json['hint'] as String,
       fieldData: json['field_data'] as String,
@@ -77,7 +77,7 @@ RealmEmojiItem _$RealmEmojiItemFromJson(Map<String, dynamic> json) =>
       sourceUrl: json['source_url'] as String,
       stillUrl: json['still_url'] as String?,
       deactivated: json['deactivated'] as bool,
-      authorId: json['author_id'] as int?,
+      authorId: (json['author_id'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$RealmEmojiItemToJson(RealmEmojiItem instance) =>
@@ -91,7 +91,7 @@ Map<String, dynamic> _$RealmEmojiItemToJson(RealmEmojiItem instance) =>
     };
 
 User _$UserFromJson(Map<String, dynamic> json) => User(
-      userId: json['user_id'] as int,
+      userId: (json['user_id'] as num).toInt(),
       deliveryEmailStaleDoNotUse: json['delivery_email'] as String?,
       email: json['email'] as String,
       fullName: json['full_name'] as String,
@@ -102,13 +102,13 @@ User _$UserFromJson(Map<String, dynamic> json) => User(
       isGuest: json['is_guest'] as bool,
       isBillingAdmin: json['is_billing_admin'] as bool?,
       isBot: json['is_bot'] as bool,
-      botType: json['bot_type'] as int?,
-      botOwnerId: json['bot_owner_id'] as int?,
+      botType: (json['bot_type'] as num?)?.toInt(),
+      botOwnerId: (json['bot_owner_id'] as num?)?.toInt(),
       role: $enumDecode(_$UserRoleEnumMap, json['role'],
           unknownValue: UserRole.unknown),
       timezone: json['timezone'] as String,
       avatarUrl: json['avatar_url'] as String?,
-      avatarVersion: json['avatar_version'] as int,
+      avatarVersion: (json['avatar_version'] as num).toInt(),
       profileData:
           (User._readProfileData(json, 'profile_data') as Map<String, dynamic>?)
               ?.map(
@@ -165,21 +165,22 @@ Map<String, dynamic> _$ProfileFieldUserDataToJson(
     };
 
 ZulipStream _$ZulipStreamFromJson(Map<String, dynamic> json) => ZulipStream(
-      streamId: json['stream_id'] as int,
+      streamId: (json['stream_id'] as num).toInt(),
       name: json['name'] as String,
       description: json['description'] as String,
       renderedDescription: json['rendered_description'] as String,
-      dateCreated: json['date_created'] as int,
-      firstMessageId: json['first_message_id'] as int?,
+      dateCreated: (json['date_created'] as num).toInt(),
+      firstMessageId: (json['first_message_id'] as num?)?.toInt(),
       inviteOnly: json['invite_only'] as bool,
       isWebPublic: json['is_web_public'] as bool,
       historyPublicToSubscribers: json['history_public_to_subscribers'] as bool,
-      messageRetentionDays: json['message_retention_days'] as int?,
+      messageRetentionDays: (json['message_retention_days'] as num?)?.toInt(),
       streamPostPolicy:
           $enumDecode(_$StreamPostPolicyEnumMap, json['stream_post_policy']),
-      canRemoveSubscribersGroup: ZulipStream._readCanRemoveSubscribersGroup(
-          json, 'can_remove_subscribers_group') as int?,
-      streamWeeklyTraffic: json['stream_weekly_traffic'] as int?,
+      canRemoveSubscribersGroup: (ZulipStream._readCanRemoveSubscribersGroup(
+              json, 'can_remove_subscribers_group') as num?)
+          ?.toInt(),
+      streamWeeklyTraffic: (json['stream_weekly_traffic'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$ZulipStreamToJson(ZulipStream instance) =>
@@ -208,21 +209,22 @@ const _$StreamPostPolicyEnumMap = {
 };
 
 Subscription _$SubscriptionFromJson(Map<String, dynamic> json) => Subscription(
-      streamId: json['stream_id'] as int,
+      streamId: (json['stream_id'] as num).toInt(),
       name: json['name'] as String,
       description: json['description'] as String,
       renderedDescription: json['rendered_description'] as String,
-      dateCreated: json['date_created'] as int,
-      firstMessageId: json['first_message_id'] as int?,
+      dateCreated: (json['date_created'] as num).toInt(),
+      firstMessageId: (json['first_message_id'] as num?)?.toInt(),
       inviteOnly: json['invite_only'] as bool,
       isWebPublic: json['is_web_public'] as bool,
       historyPublicToSubscribers: json['history_public_to_subscribers'] as bool,
-      messageRetentionDays: json['message_retention_days'] as int?,
+      messageRetentionDays: (json['message_retention_days'] as num?)?.toInt(),
       streamPostPolicy:
           $enumDecode(_$StreamPostPolicyEnumMap, json['stream_post_policy']),
-      canRemoveSubscribersGroup: ZulipStream._readCanRemoveSubscribersGroup(
-          json, 'can_remove_subscribers_group') as int?,
-      streamWeeklyTraffic: json['stream_weekly_traffic'] as int?,
+      canRemoveSubscribersGroup: (ZulipStream._readCanRemoveSubscribersGroup(
+              json, 'can_remove_subscribers_group') as num?)
+          ?.toInt(),
+      streamWeeklyTraffic: (json['stream_weekly_traffic'] as num?)?.toInt(),
       desktopNotifications: json['desktop_notifications'] as bool?,
       emailNotifications: json['email_notifications'] as bool?,
       wildcardMentionsNotify: json['wildcard_mentions_notify'] as bool?,
@@ -230,7 +232,7 @@ Subscription _$SubscriptionFromJson(Map<String, dynamic> json) => Subscription(
       audibleNotifications: json['audible_notifications'] as bool?,
       pinToTop: json['pin_to_top'] as bool,
       isMuted: json['is_muted'] as bool,
-      color: Subscription._readColor(json, 'color') as int,
+      color: (Subscription._readColor(json, 'color') as num).toInt(),
     );
 
 Map<String, dynamic> _$SubscriptionToJson(Subscription instance) =>
@@ -263,22 +265,22 @@ StreamMessage _$StreamMessageFromJson(Map<String, dynamic> json) =>
       client: json['client'] as String,
       content: json['content'] as String,
       contentType: json['content_type'] as String,
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       isMeMessage: json['is_me_message'] as bool,
-      lastEditTimestamp: json['last_edit_timestamp'] as int?,
+      lastEditTimestamp: (json['last_edit_timestamp'] as num?)?.toInt(),
       reactions: Message._reactionsFromJson(json['reactions']),
-      recipientId: json['recipient_id'] as int,
+      recipientId: (json['recipient_id'] as num).toInt(),
       senderEmail: json['sender_email'] as String,
       senderFullName: json['sender_full_name'] as String,
-      senderId: json['sender_id'] as int,
+      senderId: (json['sender_id'] as num).toInt(),
       senderRealmStr: json['sender_realm_str'] as String,
       subject: json['subject'] as String,
-      timestamp: json['timestamp'] as int,
+      timestamp: (json['timestamp'] as num).toInt(),
       flags: Message._flagsFromJson(json['flags']),
       matchContent: json['match_content'] as String?,
       matchSubject: json['match_subject'] as String?,
       displayRecipient: json['display_recipient'] as String,
-      streamId: json['stream_id'] as int,
+      streamId: (json['stream_id'] as num).toInt(),
     );
 
 Map<String, dynamic> _$StreamMessageToJson(StreamMessage instance) =>
@@ -306,7 +308,7 @@ Map<String, dynamic> _$StreamMessageToJson(StreamMessage instance) =>
     };
 
 DmRecipient _$DmRecipientFromJson(Map<String, dynamic> json) => DmRecipient(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       email: json['email'] as String,
       fullName: json['full_name'] as String,
     );
@@ -322,17 +324,17 @@ DmMessage _$DmMessageFromJson(Map<String, dynamic> json) => DmMessage(
       client: json['client'] as String,
       content: json['content'] as String,
       contentType: json['content_type'] as String,
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
       isMeMessage: json['is_me_message'] as bool,
-      lastEditTimestamp: json['last_edit_timestamp'] as int?,
+      lastEditTimestamp: (json['last_edit_timestamp'] as num?)?.toInt(),
       reactions: Message._reactionsFromJson(json['reactions']),
-      recipientId: json['recipient_id'] as int,
+      recipientId: (json['recipient_id'] as num).toInt(),
       senderEmail: json['sender_email'] as String,
       senderFullName: json['sender_full_name'] as String,
-      senderId: json['sender_id'] as int,
+      senderId: (json['sender_id'] as num).toInt(),
       senderRealmStr: json['sender_realm_str'] as String,
       subject: json['subject'] as String,
-      timestamp: json['timestamp'] as int,
+      timestamp: (json['timestamp'] as num).toInt(),
       flags: Message._flagsFromJson(json['flags']),
       matchContent: json['match_content'] as String?,
       matchSubject: json['match_subject'] as String?,
diff --git a/lib/api/model/reaction.g.dart b/lib/api/model/reaction.g.dart
index 97fc0023a2..886c774063 100644
--- a/lib/api/model/reaction.g.dart
+++ b/lib/api/model/reaction.g.dart
@@ -12,7 +12,7 @@ Reaction _$ReactionFromJson(Map<String, dynamic> json) => Reaction(
       emojiName: json['emoji_name'] as String,
       emojiCode: json['emoji_code'] as String,
       reactionType: $enumDecode(_$ReactionTypeEnumMap, json['reaction_type']),
-      userId: json['user_id'] as int,
+      userId: (json['user_id'] as num).toInt(),
     );
 
 Map<String, dynamic> _$ReactionToJson(Reaction instance) => <String, dynamic>{
diff --git a/lib/api/route/account.g.dart b/lib/api/route/account.g.dart
index d246d5a0f1..b46fd098b9 100644
--- a/lib/api/route/account.g.dart
+++ b/lib/api/route/account.g.dart
@@ -12,7 +12,7 @@ FetchApiKeyResult _$FetchApiKeyResultFromJson(Map<String, dynamic> json) =>
     FetchApiKeyResult(
       apiKey: json['api_key'] as String,
       email: json['email'] as String,
-      userId: json['user_id'] as int?,
+      userId: (json['user_id'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$FetchApiKeyResultToJson(FetchApiKeyResult instance) =>
diff --git a/lib/api/route/messages.g.dart b/lib/api/route/messages.g.dart
index 94ffafd939..161ea7588e 100644
--- a/lib/api/route/messages.g.dart
+++ b/lib/api/route/messages.g.dart
@@ -20,7 +20,7 @@ Map<String, dynamic> _$GetMessageResultToJson(GetMessageResult instance) =>
 
 GetMessagesResult _$GetMessagesResultFromJson(Map<String, dynamic> json) =>
     GetMessagesResult(
-      anchor: json['anchor'] as int,
+      anchor: (json['anchor'] as num).toInt(),
       foundNewest: json['found_newest'] as bool,
       foundOldest: json['found_oldest'] as bool,
       foundAnchor: json['found_anchor'] as bool,
@@ -42,7 +42,7 @@ Map<String, dynamic> _$GetMessagesResultToJson(GetMessagesResult instance) =>
 
 SendMessageResult _$SendMessageResultFromJson(Map<String, dynamic> json) =>
     SendMessageResult(
-      id: json['id'] as int,
+      id: (json['id'] as num).toInt(),
     );
 
 Map<String, dynamic> _$SendMessageResultToJson(SendMessageResult instance) =>
@@ -63,8 +63,9 @@ Map<String, dynamic> _$UploadFileResultToJson(UploadFileResult instance) =>
 UpdateMessageFlagsResult _$UpdateMessageFlagsResultFromJson(
         Map<String, dynamic> json) =>
     UpdateMessageFlagsResult(
-      messages:
-          (json['messages'] as List<dynamic>).map((e) => e as int).toList(),
+      messages: (json['messages'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
     );
 
 Map<String, dynamic> _$UpdateMessageFlagsResultToJson(
@@ -76,10 +77,10 @@ Map<String, dynamic> _$UpdateMessageFlagsResultToJson(
 UpdateMessageFlagsForNarrowResult _$UpdateMessageFlagsForNarrowResultFromJson(
         Map<String, dynamic> json) =>
     UpdateMessageFlagsForNarrowResult(
-      processedCount: json['processed_count'] as int,
-      updatedCount: json['updated_count'] as int,
-      firstProcessedId: json['first_processed_id'] as int?,
-      lastProcessedId: json['last_processed_id'] as int?,
+      processedCount: (json['processed_count'] as num).toInt(),
+      updatedCount: (json['updated_count'] as num).toInt(),
+      firstProcessedId: (json['first_processed_id'] as num?)?.toInt(),
+      lastProcessedId: (json['last_processed_id'] as num?)?.toInt(),
       foundOldest: json['found_oldest'] as bool,
       foundNewest: json['found_newest'] as bool,
     );
diff --git a/lib/api/route/realm.g.dart b/lib/api/route/realm.g.dart
index 463eecc66e..8957739f30 100644
--- a/lib/api/route/realm.g.dart
+++ b/lib/api/route/realm.g.dart
@@ -18,7 +18,7 @@ GetServerSettingsResult _$GetServerSettingsResultFromJson(
           .map((e) =>
               ExternalAuthenticationMethod.fromJson(e as Map<String, dynamic>))
           .toList(),
-      zulipFeatureLevel: json['zulip_feature_level'] as int,
+      zulipFeatureLevel: (json['zulip_feature_level'] as num).toInt(),
       zulipVersion: json['zulip_version'] as String,
       zulipMergeBase: json['zulip_merge_base'] as String?,
       pushNotificationsEnabled: json['push_notifications_enabled'] as bool,
diff --git a/lib/api/route/users.g.dart b/lib/api/route/users.g.dart
index 8d9b94ca5f..a8b41f65dd 100644
--- a/lib/api/route/users.g.dart
+++ b/lib/api/route/users.g.dart
@@ -10,7 +10,7 @@ part of 'users.dart';
 
 GetOwnUserResult _$GetOwnUserResultFromJson(Map<String, dynamic> json) =>
     GetOwnUserResult(
-      userId: json['user_id'] as int,
+      userId: (json['user_id'] as num).toInt(),
     );
 
 Map<String, dynamic> _$GetOwnUserResultToJson(GetOwnUserResult instance) =>
diff --git a/lib/host/android_notifications.g.dart b/lib/host/android_notifications.g.dart
index 9dcf09a74e..ad4b0e2fcb 100644
--- a/lib/host/android_notifications.g.dart
+++ b/lib/host/android_notifications.g.dart
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v18.0.0), do not edit directly.
+// Autogenerated from Pigeon (v19.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
 
diff --git a/lib/model/database.g.dart b/lib/model/database.g.dart
index 52d9c00c0c..c199cb6d20 100644
--- a/lib/model/database.g.dart
+++ b/lib/model/database.g.dart
@@ -481,6 +481,7 @@ class AccountsCompanion extends UpdateCompanion<Account> {
 
 abstract class _$AppDatabase extends GeneratedDatabase {
   _$AppDatabase(QueryExecutor e) : super(e);
+  _$AppDatabaseManager get managers => _$AppDatabaseManager(this);
   late final $AccountsTable accounts = $AccountsTable(this);
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
@@ -488,3 +489,211 @@ abstract class _$AppDatabase extends GeneratedDatabase {
   @override
   List<DatabaseSchemaEntity> get allSchemaEntities => [accounts];
 }
+
+typedef $$AccountsTableInsertCompanionBuilder = AccountsCompanion Function({
+  Value<int> id,
+  required Uri realmUrl,
+  required int userId,
+  required String email,
+  required String apiKey,
+  required String zulipVersion,
+  Value<String?> zulipMergeBase,
+  required int zulipFeatureLevel,
+  Value<String?> ackedPushToken,
+});
+typedef $$AccountsTableUpdateCompanionBuilder = AccountsCompanion Function({
+  Value<int> id,
+  Value<Uri> realmUrl,
+  Value<int> userId,
+  Value<String> email,
+  Value<String> apiKey,
+  Value<String> zulipVersion,
+  Value<String?> zulipMergeBase,
+  Value<int> zulipFeatureLevel,
+  Value<String?> ackedPushToken,
+});
+
+class $$AccountsTableTableManager extends RootTableManager<
+    _$AppDatabase,
+    $AccountsTable,
+    Account,
+    $$AccountsTableFilterComposer,
+    $$AccountsTableOrderingComposer,
+    $$AccountsTableProcessedTableManager,
+    $$AccountsTableInsertCompanionBuilder,
+    $$AccountsTableUpdateCompanionBuilder> {
+  $$AccountsTableTableManager(_$AppDatabase db, $AccountsTable table)
+      : super(TableManagerState(
+          db: db,
+          table: table,
+          filteringComposer:
+              $$AccountsTableFilterComposer(ComposerState(db, table)),
+          orderingComposer:
+              $$AccountsTableOrderingComposer(ComposerState(db, table)),
+          getChildManagerBuilder: (p) =>
+              $$AccountsTableProcessedTableManager(p),
+          getUpdateCompanionBuilder: ({
+            Value<int> id = const Value.absent(),
+            Value<Uri> realmUrl = const Value.absent(),
+            Value<int> userId = const Value.absent(),
+            Value<String> email = const Value.absent(),
+            Value<String> apiKey = const Value.absent(),
+            Value<String> zulipVersion = const Value.absent(),
+            Value<String?> zulipMergeBase = const Value.absent(),
+            Value<int> zulipFeatureLevel = const Value.absent(),
+            Value<String?> ackedPushToken = const Value.absent(),
+          }) =>
+              AccountsCompanion(
+            id: id,
+            realmUrl: realmUrl,
+            userId: userId,
+            email: email,
+            apiKey: apiKey,
+            zulipVersion: zulipVersion,
+            zulipMergeBase: zulipMergeBase,
+            zulipFeatureLevel: zulipFeatureLevel,
+            ackedPushToken: ackedPushToken,
+          ),
+          getInsertCompanionBuilder: ({
+            Value<int> id = const Value.absent(),
+            required Uri realmUrl,
+            required int userId,
+            required String email,
+            required String apiKey,
+            required String zulipVersion,
+            Value<String?> zulipMergeBase = const Value.absent(),
+            required int zulipFeatureLevel,
+            Value<String?> ackedPushToken = const Value.absent(),
+          }) =>
+              AccountsCompanion.insert(
+            id: id,
+            realmUrl: realmUrl,
+            userId: userId,
+            email: email,
+            apiKey: apiKey,
+            zulipVersion: zulipVersion,
+            zulipMergeBase: zulipMergeBase,
+            zulipFeatureLevel: zulipFeatureLevel,
+            ackedPushToken: ackedPushToken,
+          ),
+        ));
+}
+
+class $$AccountsTableProcessedTableManager extends ProcessedTableManager<
+    _$AppDatabase,
+    $AccountsTable,
+    Account,
+    $$AccountsTableFilterComposer,
+    $$AccountsTableOrderingComposer,
+    $$AccountsTableProcessedTableManager,
+    $$AccountsTableInsertCompanionBuilder,
+    $$AccountsTableUpdateCompanionBuilder> {
+  $$AccountsTableProcessedTableManager(super.$state);
+}
+
+class $$AccountsTableFilterComposer
+    extends FilterComposer<_$AppDatabase, $AccountsTable> {
+  $$AccountsTableFilterComposer(super.$state);
+  ColumnFilters<int> get id => $state.composableBuilder(
+      column: $state.table.id,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
+
+  ColumnWithTypeConverterFilters<Uri, Uri, String> get realmUrl =>
+      $state.composableBuilder(
+          column: $state.table.realmUrl,
+          builder: (column, joinBuilders) => ColumnWithTypeConverterFilters(
+              column,
+              joinBuilders: joinBuilders));
+
+  ColumnFilters<int> get userId => $state.composableBuilder(
+      column: $state.table.userId,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
+
+  ColumnFilters<String> get email => $state.composableBuilder(
+      column: $state.table.email,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
+
+  ColumnFilters<String> get apiKey => $state.composableBuilder(
+      column: $state.table.apiKey,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
+
+  ColumnFilters<String> get zulipVersion => $state.composableBuilder(
+      column: $state.table.zulipVersion,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
+
+  ColumnFilters<String> get zulipMergeBase => $state.composableBuilder(
+      column: $state.table.zulipMergeBase,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
+
+  ColumnFilters<int> get zulipFeatureLevel => $state.composableBuilder(
+      column: $state.table.zulipFeatureLevel,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
+
+  ColumnFilters<String> get ackedPushToken => $state.composableBuilder(
+      column: $state.table.ackedPushToken,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
+}
+
+class $$AccountsTableOrderingComposer
+    extends OrderingComposer<_$AppDatabase, $AccountsTable> {
+  $$AccountsTableOrderingComposer(super.$state);
+  ColumnOrderings<int> get id => $state.composableBuilder(
+      column: $state.table.id,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<String> get realmUrl => $state.composableBuilder(
+      column: $state.table.realmUrl,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<int> get userId => $state.composableBuilder(
+      column: $state.table.userId,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<String> get email => $state.composableBuilder(
+      column: $state.table.email,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<String> get apiKey => $state.composableBuilder(
+      column: $state.table.apiKey,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<String> get zulipVersion => $state.composableBuilder(
+      column: $state.table.zulipVersion,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<String> get zulipMergeBase => $state.composableBuilder(
+      column: $state.table.zulipMergeBase,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<int> get zulipFeatureLevel => $state.composableBuilder(
+      column: $state.table.zulipFeatureLevel,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<String> get ackedPushToken => $state.composableBuilder(
+      column: $state.table.ackedPushToken,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
+}
+
+class _$AppDatabaseManager {
+  final _$AppDatabase _db;
+  _$AppDatabaseManager(this._db);
+  $$AccountsTableTableManager get accounts =>
+      $$AccountsTableTableManager(_db, _db.accounts);
+}
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index 82f4a0a939..5c0f7c7c67 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -3,31 +3,31 @@ PODS:
     - FlutterMacOS
   - file_selector_macos (0.0.1):
     - FlutterMacOS
-  - Firebase/CoreOnly (10.24.0):
-    - FirebaseCore (= 10.24.0)
-  - Firebase/Messaging (10.24.0):
+  - Firebase/CoreOnly (10.25.0):
+    - FirebaseCore (= 10.25.0)
+  - Firebase/Messaging (10.25.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 10.24.0)
-  - firebase_core (2.30.1):
-    - Firebase/CoreOnly (~> 10.24.0)
+    - FirebaseMessaging (~> 10.25.0)
+  - firebase_core (2.32.0):
+    - Firebase/CoreOnly (~> 10.25.0)
     - FlutterMacOS
-  - firebase_messaging (14.9.0):
-    - Firebase/CoreOnly (~> 10.24.0)
-    - Firebase/Messaging (~> 10.24.0)
+  - firebase_messaging (14.9.4):
+    - Firebase/CoreOnly (~> 10.25.0)
+    - Firebase/Messaging (~> 10.25.0)
     - firebase_core
     - FlutterMacOS
-  - FirebaseCore (10.24.0):
+  - FirebaseCore (10.25.0):
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.12)
     - GoogleUtilities/Logger (~> 7.12)
-  - FirebaseCoreInternal (10.24.0):
+  - FirebaseCoreInternal (10.25.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (10.24.0):
+  - FirebaseInstallations (10.25.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
     - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (10.24.0):
+  - FirebaseMessaging (10.25.0):
     - FirebaseCore (~> 10.0)
     - FirebaseInstallations (~> 10.0)
     - GoogleDataTransport (~> 9.3)
@@ -43,29 +43,29 @@ PODS:
     - GoogleUtilities/Environment (~> 7.7)
     - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.13.0):
+  - GoogleUtilities/AppDelegateSwizzler (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Environment (7.13.0):
+  - GoogleUtilities/Environment (7.13.3):
     - GoogleUtilities/Privacy
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.13.0):
+  - GoogleUtilities/Logger (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Network (7.13.0):
+  - GoogleUtilities/Network (7.13.3):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.13.0)":
+  - "GoogleUtilities/NSData+zlib (7.13.3)":
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (7.13.0)
-  - GoogleUtilities/Reachability (7.13.0):
+  - GoogleUtilities/Privacy (7.13.3)
+  - GoogleUtilities/Reachability (7.13.3):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - GoogleUtilities/UserDefaults (7.13.0):
+  - GoogleUtilities/UserDefaults (7.13.3):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
   - nanopb (2.30910.0):
@@ -81,18 +81,18 @@ PODS:
   - PromisesObjC (2.4.0)
   - share_plus (0.0.1):
     - FlutterMacOS
-  - "sqlite3 (3.45.3+1)":
-    - "sqlite3/common (= 3.45.3+1)"
-  - "sqlite3/common (3.45.3+1)"
-  - "sqlite3/fts5 (3.45.3+1)":
+  - sqlite3 (3.46.0):
+    - sqlite3/common (= 3.46.0)
+  - sqlite3/common (3.46.0)
+  - sqlite3/fts5 (3.46.0):
     - sqlite3/common
-  - "sqlite3/perf-threadsafe (3.45.3+1)":
+  - sqlite3/perf-threadsafe (3.46.0):
     - sqlite3/common
-  - "sqlite3/rtree (3.45.3+1)":
+  - sqlite3/rtree (3.46.0):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - FlutterMacOS
-    - "sqlite3 (~> 3.45.3+1)"
+    - sqlite3 (~> 3.46.0)
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
@@ -157,27 +157,27 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720
-  file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9
-  Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
-  firebase_core: 59eec96207757ff60fa76232d0b0bb749f2c4b89
-  firebase_messaging: eb3c1afa3c6756407f2d9f22a4b6c58d50f4c9b2
-  FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894
-  FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af
-  FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e
-  FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d
+  file_selector_macos: 54fdab7caa3ac3fc43c9fac4d7d8d231277f8cf2
+  Firebase: 0312a2352584f782ea56f66d91606891d4607f06
+  firebase_core: b5b8b60dad71f93132bbaa21e8d1379367d824f0
+  firebase_messaging: d821ad7103878837085612e389fe66203c5c6c0c
+  FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483
+  FirebaseCoreInternal: 910a81992c33715fec9263ca7381d59ab3a750b7
+  FirebaseInstallations: 91950fe859846fff0fbd296180909dd273103b09
+  FirebaseMessaging: 88950ba9485052891ebe26f6c43a52bb62248952
   flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
-  GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
+  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
   package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf
-  sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a
-  sqlite3_flutter_libs: 8d204ef443cf0d5c1c8b058044eab53f3943a9c5
-  url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
-  video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
+  sqlite3: 154b084339ede06960a5b3c8160066adc9176b7d
+  sqlite3_flutter_libs: 1be4459672f8168ded2d8667599b8e3ca5e72b83
+  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
 
diff --git a/pubspec.lock b/pubspec.lock
index 7550f0eb92..b0e8cdae55 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,26 +5,31 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
+      sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3"
       url: "https://pub.dev"
     source: hosted
-    version: "67.0.0"
+    version: "68.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "1639d96851f9e9e215dd39c9baad56846488aef3df392cb3221f37f70beac686"
+      sha256: "37a42d06068e2fe3deddb2da079a8c4d105f241225ba27b7122b37e9865fd8f7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.31"
+    version: "1.3.35"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.1.3"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
+      sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808"
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.1"
+    version: "6.5.0"
   analyzer_plugin:
     dependency: transitive
     description:
@@ -85,10 +90,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   build_resolvers:
     dependency: transitive
     description:
@@ -101,10 +106,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.10"
   build_runner_core:
     dependency: transitive
     description:
@@ -213,10 +218,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
+      sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.2"
+    version: "1.8.0"
   cross_file:
     dependency: transitive
     description:
@@ -277,18 +282,18 @@ packages:
     dependency: "direct main"
     description:
       name: drift
-      sha256: "049057eba8692cc097c9d0be7612d0a6dd65e3bd283de7e352f9dc81de23169a"
+      sha256: "6acedc562ffeed308049f78fb1906abad3d65714580b6745441ee6d50ec564cd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.17.0"
+    version: "2.18.0"
   drift_dev:
     dependency: "direct dev"
     description:
       name: drift_dev
-      sha256: eb327c76604f3e84fff12b246d52da1c160d3aa44d7d433f000d416b4d5e8d8d
+      sha256: d9b020736ea85fff1568699ce18b89fabb3f0f042e8a7a05e84a3ec20d39acde
       url: "https://pub.dev"
     source: hosted
-    version: "2.17.0"
+    version: "2.18.0"
   fake_async:
     dependency: "direct dev"
     description:
@@ -317,10 +322,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "45c70b43df893027e441a6fa0aacc8f484fb9f9c60c746dc8f1dc4f774cf55cd"
+      sha256: "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.2"
+    version: "8.0.3"
   file_selector_linux:
     dependency: transitive
     description:
@@ -333,10 +338,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_macos
-      sha256: b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6
+      sha256: f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3+3"
+    version: "0.9.4"
   file_selector_platform_interface:
     dependency: transitive
     description:
@@ -357,10 +362,10 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "4aef2a23d0f3265545807d68fbc2f76a6b994ca3c778d88453b99325abd63284"
+      sha256: "26de145bb9688a90962faec6f838247377b0b0d32cc0abecd9a4e43525fc856c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.30.1"
+    version: "2.32.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -373,34 +378,34 @@ packages:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: "67f2fcc600fc78c2f731c370a3a5e6c87ee862e3a2fba6f951eca6d5dafe5c29"
+      sha256: "43d9e951ac52b87ae9cc38ecdcca1e8fa7b52a1dd26a96085ba41ce5108db8e9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.16.0"
+    version: "2.17.0"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: d8b12bcfe535f9bf8e24b4f9685036a8614f11b6fdcdff54ce9758ea8585a8a9
+      sha256: a1662cc95d9750a324ad9df349b873360af6f11414902021f130c68ec02267c4
       url: "https://pub.dev"
     source: hosted
-    version: "14.9.0"
+    version: "14.9.4"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: "8355f089bfc06691f00e0bc01c4214bc0aeff22acabdb5090b734a551d33ca43"
+      sha256: "87c4a922cb6f811cfb7a889bdbb3622702443c52a0271636cbc90d813ceac147"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.33"
+    version: "4.5.37"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: d6f3ea91e0aae479a09355af91e65b19cfbc485d596c5448a87356af4923e582
+      sha256: "0d34dca01a7b103ed7f20138bffbb28eb0e61a677bf9e78a028a932e2c7322d5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.3"
+    version: "3.8.7"
   fixnum:
     dependency: transitive
     description:
@@ -431,18 +436,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   flutter_local_notifications:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "8cdc719114ab1c86c64bb7a86d3a679674c3637edd229e3a994797d4a1504ce4"
+      sha256: "40e6fbd2da7dcc7ed78432c5cdab1559674b4af035fddbfb2f9a8f9c2112fcef"
       url: "https://pub.dev"
     source: hosted
-    version: "17.1.0"
+    version: "17.1.2"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -547,18 +552,18 @@ packages:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: fe9ee64ccb8d599a5dfb0e21cc6652232c610bcf667af4e79b9eb175cc30a7a5
+      sha256: "33974eca2e87e8b4e3727f1b94fa3abcb25afe80b6bc2c4d449a0e150aedf720"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   image_picker_android:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: "8e75431a62b7feb4fd55cb4a5c6f0ac4564460ec5dc09f9c4a0d50a5ce7c4cb9"
+      sha256: "0f57fee1e8bfadf8cc41818bbcd7f72e53bb768a54d9496355d5e8a5681a19f1"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.10"
+    version: "0.8.12+1"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -571,10 +576,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: f74064bc548b5164a033ec05638e23c91be1a249c255e0f56319dddffd759794
+      sha256: "4824d8c7f6f89121ef0122ff79bb00b009607faecc8545b86bca9ab5ce1e95bf"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.10+1"
+    version: "0.8.11+2"
   image_picker_linux:
     dependency: transitive
     description:
@@ -640,18 +645,18 @@ packages:
     dependency: "direct main"
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969
+      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.1"
+    version: "6.8.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -680,10 +685,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   logging:
     dependency: transitive
     description:
@@ -692,6 +697,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: e4a273c4a7a81fdbea1f3faed45faa6a7c0b78a50076e89d3f02350caefc8939
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0-main.3"
   matcher:
     dependency: transitive
     description:
@@ -792,10 +805,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -832,10 +845,10 @@ packages:
     dependency: "direct dev"
     description:
       name: pigeon
-      sha256: be883401d09121c427ed9c5f6e96427787d93d335f55e5e2b0d780a0a22cd561
+      sha256: "0f703377350033c955f63d3cd904a18cab42002b4a46d20348553730d65426b1"
       url: "https://pub.dev"
     source: hosted
-    version: "18.0.0"
+    version: "19.0.0"
   platform:
     dependency: transitive
     description:
@@ -944,10 +957,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1005,26 +1018,26 @@ packages:
     dependency: "direct main"
     description:
       name: sqlite3
-      sha256: "1abbeb84bf2b1a10e5e1138c913123c8aa9d83cd64e5f9a0dd847b3c83063202"
+      sha256: b384f598b813b347c5a7e5ffad82cbaff1bec3d1561af267041e66f6f0899295
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
   sqlite3_flutter_libs:
     dependency: "direct main"
     description:
       name: sqlite3_flutter_libs
-      sha256: fb2a106a2ea6042fe57de2c47074cc31539a941819c91e105b864744605da3f5
+      sha256: "1e62698dc1ab396152ccaf3b3990d826244e9f3c8c39b51805f209adcd6dbea3"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.21"
+    version: "0.5.22"
   sqlparser:
     dependency: transitive
     description:
       name: sqlparser
-      sha256: "462a7be9feb74328ddbd275b39fdacf64fbd8c4149ad85becb488664859cf9f3"
+      sha256: ade9a67fd70d0369329ed3373208de7ebd8662470e8c396fc8d0d60f9acdfc9f
       url: "https://pub.dev"
     source: hosted
-    version: "0.35.0"
+    version: "0.36.0"
   stack_trace:
     dependency: "direct dev"
     description:
@@ -1077,10 +1090,10 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: d72b538180efcf8413cd2e4e6fcc7ae99c7712e0909eb9223f9da6e6d0ef715f
+      sha256: d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.4"
+    version: "1.25.5"
   test_api:
     dependency: transitive
     description:
@@ -1101,10 +1114,10 @@ packages:
     dependency: transitive
     description:
       name: timezone
-      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
+      sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.2"
+    version: "0.9.3"
   timing:
     dependency: transitive
     description:
@@ -1133,18 +1146,18 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher_android
-      sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
+      sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.5"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1157,10 +1170,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1205,26 +1218,26 @@ packages:
     dependency: "direct main"
     description:
       name: video_player
-      sha256: "822e68b62403bebea846b012988ee1e77262e7b786345594a444c59338096ddf"
+      sha256: db6a72d8f4fd155d0189845678f55ad2fd54b02c10dcafd11c068dbb631286c0
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.4"
+    version: "2.8.6"
   video_player_android:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: "4dd9b8b86d70d65eecf3dcabfcdfbb9c9115d244d022654aba49a00336d540c2"
+      sha256: "134e1ad410d67e18a19486ed9512c72dfc6d8ffb284d0e8f2e99e903d1ba8fa3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.12"
+    version: "2.4.14"
   video_player_avfoundation:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed"
+      sha256: d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.6"
+    version: "2.6.1"
   video_player_platform_interface:
     dependency: "direct dev"
     description:
@@ -1237,10 +1250,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_web
-      sha256: "8e9cb7fe94e49490e67bbc15149691792b58a0ade31b32e3f3688d104a0e057b"
+      sha256: "41245cef5ef29c4585dbabcbcbe9b209e34376642c7576cabf11b4ad9289d6e4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   vm_service:
     dependency: transitive
     description:
@@ -1265,14 +1278,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.5"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
+      sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "3.0.0"
   webdriver:
     dependency: transitive
     description:
@@ -1293,10 +1314,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.1"
   win32_registry:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 19e8a5edcf..e9ece5c092 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -80,9 +80,9 @@ dev_dependencies:
   clock: ^1.1.1
   drift_dev: ^2.5.2
   fake_async: ^1.3.1
-  flutter_lints: ^3.0.0
+  flutter_lints: ^4.0.0
   json_serializable: ^6.5.4
-  pigeon: ^18.0.0
+  pigeon: ^19.0.0
   plugin_platform_interface: ^2.1.8
   stack_trace: ^1.11.1
   test: ^1.23.1
diff --git a/tools/upgrade b/tools/upgrade
index 56e8b979e8..809dbacba8 100755
--- a/tools/upgrade
+++ b/tools/upgrade
@@ -163,7 +163,7 @@ upgrade_pub_major() {
     git commit -a -m "\
 WIP deps: Upgrade packages to latest, namely TODO:(which packages?)
 
-This is the result of \`tools/upgrade pod-major\`, and
+This is the result of \`tools/upgrade pub-major\`, and
 TODO:(describe any other changes you had to make).
 
 Changelogs: