mobile bluesky app made with flutter lazurite.stormlightlabs.org/
mobile bluesky flutter
3
fork

Configure Feed

Select the types of activity you want to include in your feed.

feat: Harden OAuth DPoP Transport, Persist OAuth Client ID, and Improve Log Share Naming (#16)

* feat: add oauthClientId to account model

- XrpcNetworkInterceptor to normalize DPoP proof headers.

* feat: dated log file naming

* feat: normalize client id lookup

* optimize XRPC interceptor debug overhead

authored by

Owais and committed by
GitHub
5d8eb133 8fb42fdc

+1456 -2803
+8 -7
lib/core/database/app_database.dart
··· 37 37 static const activeAccountDidSettingKey = 'active_account_did'; 38 38 39 39 @override 40 - int get schemaVersion => 22; 40 + int get schemaVersion => 23; 41 41 42 42 @override 43 43 MigrationStrategy get migration => MigrationStrategy( ··· 169 169 await _createPostSearchFtsSchema(); 170 170 await _rebuildPostSearchFts(); 171 171 } 172 + if (from < 23) { 173 + await migrator.addColumn(accounts, accounts.oauthClientId); 174 + } 172 175 }, 173 176 ); 174 177 175 - static QueryExecutor _openConnection() { 176 - return driftDatabase( 177 - name: 'lazurite_db', 178 - native: const DriftNativeOptions(databaseDirectory: getApplicationSupportDirectory), 179 - ); 180 - } 178 + static QueryExecutor _openConnection() => driftDatabase( 179 + name: 'lazurite_db', 180 + native: const DriftNativeOptions(databaseDirectory: getApplicationSupportDirectory), 181 + ); 181 182 182 183 Future<Account?> getAccount(String did) => (select(accounts)..where((a) => a.did.equals(did))).getSingleOrNull(); 183 184
+1024 -2706
lib/core/database/app_database.g.dart
··· 26 26 type: DriftSqlType.string, 27 27 requiredDuringInsert: true, 28 28 ); 29 - static const VerificationMeta _displayNameMeta = const VerificationMeta( 30 - 'displayName', 31 - ); 29 + static const VerificationMeta _displayNameMeta = const VerificationMeta('displayName'); 32 30 @override 33 31 late final GeneratedColumn<String> displayName = GeneratedColumn<String>( 34 32 'display_name', ··· 37 35 type: DriftSqlType.string, 38 36 requiredDuringInsert: false, 39 37 ); 40 - static const VerificationMeta _serviceMeta = const VerificationMeta( 41 - 'service', 42 - ); 38 + static const VerificationMeta _serviceMeta = const VerificationMeta('service'); 43 39 @override 44 40 late final GeneratedColumn<String> service = GeneratedColumn<String>( 45 41 'service', ··· 48 44 type: DriftSqlType.string, 49 45 requiredDuringInsert: false, 50 46 ); 51 - static const VerificationMeta _oauthServiceMeta = const VerificationMeta( 52 - 'oauthService', 53 - ); 47 + static const VerificationMeta _oauthServiceMeta = const VerificationMeta('oauthService'); 54 48 @override 55 49 late final GeneratedColumn<String> oauthService = GeneratedColumn<String>( 56 50 'oauth_service', ··· 59 53 type: DriftSqlType.string, 60 54 requiredDuringInsert: false, 61 55 ); 62 - static const VerificationMeta _accessTokenMeta = const VerificationMeta( 63 - 'accessToken', 56 + static const VerificationMeta _oauthClientIdMeta = const VerificationMeta('oauthClientId'); 57 + @override 58 + late final GeneratedColumn<String> oauthClientId = GeneratedColumn<String>( 59 + 'oauth_client_id', 60 + aliasedName, 61 + true, 62 + type: DriftSqlType.string, 63 + requiredDuringInsert: false, 64 64 ); 65 + static const VerificationMeta _accessTokenMeta = const VerificationMeta('accessToken'); 65 66 @override 66 67 late final GeneratedColumn<String> accessToken = GeneratedColumn<String>( 67 68 'access_token', ··· 70 71 type: DriftSqlType.string, 71 72 requiredDuringInsert: true, 72 73 ); 73 - static const VerificationMeta _refreshTokenMeta = const VerificationMeta( 74 - 'refreshToken', 75 - ); 74 + static const VerificationMeta _refreshTokenMeta = const VerificationMeta('refreshToken'); 76 75 @override 77 76 late final GeneratedColumn<String> refreshToken = GeneratedColumn<String>( 78 77 'refresh_token', ··· 81 80 type: DriftSqlType.string, 82 81 requiredDuringInsert: false, 83 82 ); 84 - static const VerificationMeta _dpopPublicKeyMeta = const VerificationMeta( 85 - 'dpopPublicKey', 86 - ); 83 + static const VerificationMeta _dpopPublicKeyMeta = const VerificationMeta('dpopPublicKey'); 87 84 @override 88 85 late final GeneratedColumn<String> dpopPublicKey = GeneratedColumn<String>( 89 86 'dpop_public_key', ··· 92 89 type: DriftSqlType.string, 93 90 requiredDuringInsert: false, 94 91 ); 95 - static const VerificationMeta _dpopPrivateKeyMeta = const VerificationMeta( 96 - 'dpopPrivateKey', 97 - ); 92 + static const VerificationMeta _dpopPrivateKeyMeta = const VerificationMeta('dpopPrivateKey'); 98 93 @override 99 94 late final GeneratedColumn<String> dpopPrivateKey = GeneratedColumn<String>( 100 95 'dpop_private_key', ··· 103 98 type: DriftSqlType.string, 104 99 requiredDuringInsert: false, 105 100 ); 106 - static const VerificationMeta _dpopNonceMeta = const VerificationMeta( 107 - 'dpopNonce', 108 - ); 101 + static const VerificationMeta _dpopNonceMeta = const VerificationMeta('dpopNonce'); 109 102 @override 110 103 late final GeneratedColumn<String> dpopNonce = GeneratedColumn<String>( 111 104 'dpop_nonce', ··· 114 107 type: DriftSqlType.string, 115 108 requiredDuringInsert: false, 116 109 ); 117 - static const VerificationMeta _expiresAtMeta = const VerificationMeta( 118 - 'expiresAt', 119 - ); 110 + static const VerificationMeta _expiresAtMeta = const VerificationMeta('expiresAt'); 120 111 @override 121 112 late final GeneratedColumn<DateTime> expiresAt = GeneratedColumn<DateTime>( 122 113 'expires_at', ··· 125 116 type: DriftSqlType.dateTime, 126 117 requiredDuringInsert: false, 127 118 ); 128 - static const VerificationMeta _createdAtMeta = const VerificationMeta( 129 - 'createdAt', 130 - ); 119 + static const VerificationMeta _createdAtMeta = const VerificationMeta('createdAt'); 131 120 @override 132 121 late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>( 133 122 'created_at', ··· 137 126 requiredDuringInsert: false, 138 127 defaultValue: currentDateAndTime, 139 128 ); 140 - static const VerificationMeta _updatedAtMeta = const VerificationMeta( 141 - 'updatedAt', 142 - ); 129 + static const VerificationMeta _updatedAtMeta = const VerificationMeta('updatedAt'); 143 130 @override 144 131 late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>( 145 132 'updated_at', ··· 156 143 displayName, 157 144 service, 158 145 oauthService, 146 + oauthClientId, 159 147 accessToken, 160 148 refreshToken, 161 149 dpopPublicKey, ··· 171 159 String get actualTableName => $name; 172 160 static const String $name = 'accounts'; 173 161 @override 174 - VerificationContext validateIntegrity( 175 - Insertable<Account> instance, { 176 - bool isInserting = false, 177 - }) { 162 + VerificationContext validateIntegrity(Insertable<Account> instance, {bool isInserting = false}) { 178 163 final context = VerificationContext(); 179 164 final data = instance.toColumns(true); 180 165 if (data.containsKey('did')) { 181 - context.handle( 182 - _didMeta, 183 - did.isAcceptableOrUnknown(data['did']!, _didMeta), 184 - ); 166 + context.handle(_didMeta, did.isAcceptableOrUnknown(data['did']!, _didMeta)); 185 167 } else if (isInserting) { 186 168 context.missing(_didMeta); 187 169 } 188 170 if (data.containsKey('handle')) { 189 - context.handle( 190 - _handleMeta, 191 - handle.isAcceptableOrUnknown(data['handle']!, _handleMeta), 192 - ); 171 + context.handle(_handleMeta, handle.isAcceptableOrUnknown(data['handle']!, _handleMeta)); 193 172 } else if (isInserting) { 194 173 context.missing(_handleMeta); 195 174 } 196 175 if (data.containsKey('display_name')) { 197 - context.handle( 198 - _displayNameMeta, 199 - displayName.isAcceptableOrUnknown( 200 - data['display_name']!, 201 - _displayNameMeta, 202 - ), 203 - ); 176 + context.handle(_displayNameMeta, displayName.isAcceptableOrUnknown(data['display_name']!, _displayNameMeta)); 204 177 } 205 178 if (data.containsKey('service')) { 206 - context.handle( 207 - _serviceMeta, 208 - service.isAcceptableOrUnknown(data['service']!, _serviceMeta), 209 - ); 179 + context.handle(_serviceMeta, service.isAcceptableOrUnknown(data['service']!, _serviceMeta)); 210 180 } 211 181 if (data.containsKey('oauth_service')) { 182 + context.handle(_oauthServiceMeta, oauthService.isAcceptableOrUnknown(data['oauth_service']!, _oauthServiceMeta)); 183 + } 184 + if (data.containsKey('oauth_client_id')) { 212 185 context.handle( 213 - _oauthServiceMeta, 214 - oauthService.isAcceptableOrUnknown( 215 - data['oauth_service']!, 216 - _oauthServiceMeta, 217 - ), 186 + _oauthClientIdMeta, 187 + oauthClientId.isAcceptableOrUnknown(data['oauth_client_id']!, _oauthClientIdMeta), 218 188 ); 219 189 } 220 190 if (data.containsKey('access_token')) { 221 - context.handle( 222 - _accessTokenMeta, 223 - accessToken.isAcceptableOrUnknown( 224 - data['access_token']!, 225 - _accessTokenMeta, 226 - ), 227 - ); 191 + context.handle(_accessTokenMeta, accessToken.isAcceptableOrUnknown(data['access_token']!, _accessTokenMeta)); 228 192 } else if (isInserting) { 229 193 context.missing(_accessTokenMeta); 230 194 } 231 195 if (data.containsKey('refresh_token')) { 232 - context.handle( 233 - _refreshTokenMeta, 234 - refreshToken.isAcceptableOrUnknown( 235 - data['refresh_token']!, 236 - _refreshTokenMeta, 237 - ), 238 - ); 196 + context.handle(_refreshTokenMeta, refreshToken.isAcceptableOrUnknown(data['refresh_token']!, _refreshTokenMeta)); 239 197 } 240 198 if (data.containsKey('dpop_public_key')) { 241 199 context.handle( 242 200 _dpopPublicKeyMeta, 243 - dpopPublicKey.isAcceptableOrUnknown( 244 - data['dpop_public_key']!, 245 - _dpopPublicKeyMeta, 246 - ), 201 + dpopPublicKey.isAcceptableOrUnknown(data['dpop_public_key']!, _dpopPublicKeyMeta), 247 202 ); 248 203 } 249 204 if (data.containsKey('dpop_private_key')) { 250 205 context.handle( 251 206 _dpopPrivateKeyMeta, 252 - dpopPrivateKey.isAcceptableOrUnknown( 253 - data['dpop_private_key']!, 254 - _dpopPrivateKeyMeta, 255 - ), 207 + dpopPrivateKey.isAcceptableOrUnknown(data['dpop_private_key']!, _dpopPrivateKeyMeta), 256 208 ); 257 209 } 258 210 if (data.containsKey('dpop_nonce')) { 259 - context.handle( 260 - _dpopNonceMeta, 261 - dpopNonce.isAcceptableOrUnknown(data['dpop_nonce']!, _dpopNonceMeta), 262 - ); 211 + context.handle(_dpopNonceMeta, dpopNonce.isAcceptableOrUnknown(data['dpop_nonce']!, _dpopNonceMeta)); 263 212 } 264 213 if (data.containsKey('expires_at')) { 265 - context.handle( 266 - _expiresAtMeta, 267 - expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta), 268 - ); 214 + context.handle(_expiresAtMeta, expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta)); 269 215 } 270 216 if (data.containsKey('created_at')) { 271 - context.handle( 272 - _createdAtMeta, 273 - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), 274 - ); 217 + context.handle(_createdAtMeta, createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); 275 218 } 276 219 if (data.containsKey('updated_at')) { 277 - context.handle( 278 - _updatedAtMeta, 279 - updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), 280 - ); 220 + context.handle(_updatedAtMeta, updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta)); 281 221 } 282 222 return context; 283 223 } ··· 288 228 Account map(Map<String, dynamic> data, {String? tablePrefix}) { 289 229 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 290 230 return Account( 291 - did: attachedDatabase.typeMapping.read( 292 - DriftSqlType.string, 293 - data['${effectivePrefix}did'], 294 - )!, 295 - handle: attachedDatabase.typeMapping.read( 296 - DriftSqlType.string, 297 - data['${effectivePrefix}handle'], 298 - )!, 299 - displayName: attachedDatabase.typeMapping.read( 300 - DriftSqlType.string, 301 - data['${effectivePrefix}display_name'], 302 - ), 303 - service: attachedDatabase.typeMapping.read( 304 - DriftSqlType.string, 305 - data['${effectivePrefix}service'], 306 - ), 307 - oauthService: attachedDatabase.typeMapping.read( 308 - DriftSqlType.string, 309 - data['${effectivePrefix}oauth_service'], 310 - ), 311 - accessToken: attachedDatabase.typeMapping.read( 312 - DriftSqlType.string, 313 - data['${effectivePrefix}access_token'], 314 - )!, 315 - refreshToken: attachedDatabase.typeMapping.read( 316 - DriftSqlType.string, 317 - data['${effectivePrefix}refresh_token'], 318 - ), 319 - dpopPublicKey: attachedDatabase.typeMapping.read( 320 - DriftSqlType.string, 321 - data['${effectivePrefix}dpop_public_key'], 322 - ), 231 + did: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}did'])!, 232 + handle: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}handle'])!, 233 + displayName: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}display_name']), 234 + service: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}service']), 235 + oauthService: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}oauth_service']), 236 + oauthClientId: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}oauth_client_id']), 237 + accessToken: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}access_token'])!, 238 + refreshToken: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}refresh_token']), 239 + dpopPublicKey: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}dpop_public_key']), 323 240 dpopPrivateKey: attachedDatabase.typeMapping.read( 324 241 DriftSqlType.string, 325 242 data['${effectivePrefix}dpop_private_key'], 326 243 ), 327 - dpopNonce: attachedDatabase.typeMapping.read( 328 - DriftSqlType.string, 329 - data['${effectivePrefix}dpop_nonce'], 330 - ), 331 - expiresAt: attachedDatabase.typeMapping.read( 332 - DriftSqlType.dateTime, 333 - data['${effectivePrefix}expires_at'], 334 - ), 335 - createdAt: attachedDatabase.typeMapping.read( 336 - DriftSqlType.dateTime, 337 - data['${effectivePrefix}created_at'], 338 - )!, 339 - updatedAt: attachedDatabase.typeMapping.read( 340 - DriftSqlType.dateTime, 341 - data['${effectivePrefix}updated_at'], 342 - )!, 244 + dpopNonce: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}dpop_nonce']), 245 + expiresAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}expires_at']), 246 + createdAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, 247 + updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, 343 248 ); 344 249 } 345 250 ··· 355 260 final String? displayName; 356 261 final String? service; 357 262 final String? oauthService; 263 + final String? oauthClientId; 358 264 final String accessToken; 359 265 final String? refreshToken; 360 266 final String? dpopPublicKey; ··· 369 275 this.displayName, 370 276 this.service, 371 277 this.oauthService, 278 + this.oauthClientId, 372 279 required this.accessToken, 373 280 this.refreshToken, 374 281 this.dpopPublicKey, ··· 391 298 } 392 299 if (!nullToAbsent || oauthService != null) { 393 300 map['oauth_service'] = Variable<String>(oauthService); 301 + } 302 + if (!nullToAbsent || oauthClientId != null) { 303 + map['oauth_client_id'] = Variable<String>(oauthClientId); 394 304 } 395 305 map['access_token'] = Variable<String>(accessToken); 396 306 if (!nullToAbsent || refreshToken != null) { ··· 417 327 return AccountsCompanion( 418 328 did: Value(did), 419 329 handle: Value(handle), 420 - displayName: displayName == null && nullToAbsent 421 - ? const Value.absent() 422 - : Value(displayName), 423 - service: service == null && nullToAbsent 424 - ? const Value.absent() 425 - : Value(service), 426 - oauthService: oauthService == null && nullToAbsent 427 - ? const Value.absent() 428 - : Value(oauthService), 330 + displayName: displayName == null && nullToAbsent ? const Value.absent() : Value(displayName), 331 + service: service == null && nullToAbsent ? const Value.absent() : Value(service), 332 + oauthService: oauthService == null && nullToAbsent ? const Value.absent() : Value(oauthService), 333 + oauthClientId: oauthClientId == null && nullToAbsent ? const Value.absent() : Value(oauthClientId), 429 334 accessToken: Value(accessToken), 430 - refreshToken: refreshToken == null && nullToAbsent 431 - ? const Value.absent() 432 - : Value(refreshToken), 433 - dpopPublicKey: dpopPublicKey == null && nullToAbsent 434 - ? const Value.absent() 435 - : Value(dpopPublicKey), 436 - dpopPrivateKey: dpopPrivateKey == null && nullToAbsent 437 - ? const Value.absent() 438 - : Value(dpopPrivateKey), 439 - dpopNonce: dpopNonce == null && nullToAbsent 440 - ? const Value.absent() 441 - : Value(dpopNonce), 442 - expiresAt: expiresAt == null && nullToAbsent 443 - ? const Value.absent() 444 - : Value(expiresAt), 335 + refreshToken: refreshToken == null && nullToAbsent ? const Value.absent() : Value(refreshToken), 336 + dpopPublicKey: dpopPublicKey == null && nullToAbsent ? const Value.absent() : Value(dpopPublicKey), 337 + dpopPrivateKey: dpopPrivateKey == null && nullToAbsent ? const Value.absent() : Value(dpopPrivateKey), 338 + dpopNonce: dpopNonce == null && nullToAbsent ? const Value.absent() : Value(dpopNonce), 339 + expiresAt: expiresAt == null && nullToAbsent ? const Value.absent() : Value(expiresAt), 445 340 createdAt: Value(createdAt), 446 341 updatedAt: Value(updatedAt), 447 342 ); 448 343 } 449 344 450 - factory Account.fromJson( 451 - Map<String, dynamic> json, { 452 - ValueSerializer? serializer, 453 - }) { 345 + factory Account.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 454 346 serializer ??= driftRuntimeOptions.defaultSerializer; 455 347 return Account( 456 348 did: serializer.fromJson<String>(json['did']), ··· 458 350 displayName: serializer.fromJson<String?>(json['displayName']), 459 351 service: serializer.fromJson<String?>(json['service']), 460 352 oauthService: serializer.fromJson<String?>(json['oauthService']), 353 + oauthClientId: serializer.fromJson<String?>(json['oauthClientId']), 461 354 accessToken: serializer.fromJson<String>(json['accessToken']), 462 355 refreshToken: serializer.fromJson<String?>(json['refreshToken']), 463 356 dpopPublicKey: serializer.fromJson<String?>(json['dpopPublicKey']), ··· 477 370 'displayName': serializer.toJson<String?>(displayName), 478 371 'service': serializer.toJson<String?>(service), 479 372 'oauthService': serializer.toJson<String?>(oauthService), 373 + 'oauthClientId': serializer.toJson<String?>(oauthClientId), 480 374 'accessToken': serializer.toJson<String>(accessToken), 481 375 'refreshToken': serializer.toJson<String?>(refreshToken), 482 376 'dpopPublicKey': serializer.toJson<String?>(dpopPublicKey), ··· 494 388 Value<String?> displayName = const Value.absent(), 495 389 Value<String?> service = const Value.absent(), 496 390 Value<String?> oauthService = const Value.absent(), 391 + Value<String?> oauthClientId = const Value.absent(), 497 392 String? accessToken, 498 393 Value<String?> refreshToken = const Value.absent(), 499 394 Value<String?> dpopPublicKey = const Value.absent(), ··· 508 403 displayName: displayName.present ? displayName.value : this.displayName, 509 404 service: service.present ? service.value : this.service, 510 405 oauthService: oauthService.present ? oauthService.value : this.oauthService, 406 + oauthClientId: oauthClientId.present ? oauthClientId.value : this.oauthClientId, 511 407 accessToken: accessToken ?? this.accessToken, 512 408 refreshToken: refreshToken.present ? refreshToken.value : this.refreshToken, 513 - dpopPublicKey: dpopPublicKey.present 514 - ? dpopPublicKey.value 515 - : this.dpopPublicKey, 516 - dpopPrivateKey: dpopPrivateKey.present 517 - ? dpopPrivateKey.value 518 - : this.dpopPrivateKey, 409 + dpopPublicKey: dpopPublicKey.present ? dpopPublicKey.value : this.dpopPublicKey, 410 + dpopPrivateKey: dpopPrivateKey.present ? dpopPrivateKey.value : this.dpopPrivateKey, 519 411 dpopNonce: dpopNonce.present ? dpopNonce.value : this.dpopNonce, 520 412 expiresAt: expiresAt.present ? expiresAt.value : this.expiresAt, 521 413 createdAt: createdAt ?? this.createdAt, ··· 525 417 return Account( 526 418 did: data.did.present ? data.did.value : this.did, 527 419 handle: data.handle.present ? data.handle.value : this.handle, 528 - displayName: data.displayName.present 529 - ? data.displayName.value 530 - : this.displayName, 420 + displayName: data.displayName.present ? data.displayName.value : this.displayName, 531 421 service: data.service.present ? data.service.value : this.service, 532 - oauthService: data.oauthService.present 533 - ? data.oauthService.value 534 - : this.oauthService, 535 - accessToken: data.accessToken.present 536 - ? data.accessToken.value 537 - : this.accessToken, 538 - refreshToken: data.refreshToken.present 539 - ? data.refreshToken.value 540 - : this.refreshToken, 541 - dpopPublicKey: data.dpopPublicKey.present 542 - ? data.dpopPublicKey.value 543 - : this.dpopPublicKey, 544 - dpopPrivateKey: data.dpopPrivateKey.present 545 - ? data.dpopPrivateKey.value 546 - : this.dpopPrivateKey, 422 + oauthService: data.oauthService.present ? data.oauthService.value : this.oauthService, 423 + oauthClientId: data.oauthClientId.present ? data.oauthClientId.value : this.oauthClientId, 424 + accessToken: data.accessToken.present ? data.accessToken.value : this.accessToken, 425 + refreshToken: data.refreshToken.present ? data.refreshToken.value : this.refreshToken, 426 + dpopPublicKey: data.dpopPublicKey.present ? data.dpopPublicKey.value : this.dpopPublicKey, 427 + dpopPrivateKey: data.dpopPrivateKey.present ? data.dpopPrivateKey.value : this.dpopPrivateKey, 547 428 dpopNonce: data.dpopNonce.present ? data.dpopNonce.value : this.dpopNonce, 548 429 expiresAt: data.expiresAt.present ? data.expiresAt.value : this.expiresAt, 549 430 createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, ··· 559 440 ..write('displayName: $displayName, ') 560 441 ..write('service: $service, ') 561 442 ..write('oauthService: $oauthService, ') 443 + ..write('oauthClientId: $oauthClientId, ') 562 444 ..write('accessToken: $accessToken, ') 563 445 ..write('refreshToken: $refreshToken, ') 564 446 ..write('dpopPublicKey: $dpopPublicKey, ') ··· 578 460 displayName, 579 461 service, 580 462 oauthService, 463 + oauthClientId, 581 464 accessToken, 582 465 refreshToken, 583 466 dpopPublicKey, ··· 596 479 other.displayName == this.displayName && 597 480 other.service == this.service && 598 481 other.oauthService == this.oauthService && 482 + other.oauthClientId == this.oauthClientId && 599 483 other.accessToken == this.accessToken && 600 484 other.refreshToken == this.refreshToken && 601 485 other.dpopPublicKey == this.dpopPublicKey && ··· 612 496 final Value<String?> displayName; 613 497 final Value<String?> service; 614 498 final Value<String?> oauthService; 499 + final Value<String?> oauthClientId; 615 500 final Value<String> accessToken; 616 501 final Value<String?> refreshToken; 617 502 final Value<String?> dpopPublicKey; ··· 627 512 this.displayName = const Value.absent(), 628 513 this.service = const Value.absent(), 629 514 this.oauthService = const Value.absent(), 515 + this.oauthClientId = const Value.absent(), 630 516 this.accessToken = const Value.absent(), 631 517 this.refreshToken = const Value.absent(), 632 518 this.dpopPublicKey = const Value.absent(), ··· 643 529 this.displayName = const Value.absent(), 644 530 this.service = const Value.absent(), 645 531 this.oauthService = const Value.absent(), 532 + this.oauthClientId = const Value.absent(), 646 533 required String accessToken, 647 534 this.refreshToken = const Value.absent(), 648 535 this.dpopPublicKey = const Value.absent(), ··· 661 548 Expression<String>? displayName, 662 549 Expression<String>? service, 663 550 Expression<String>? oauthService, 551 + Expression<String>? oauthClientId, 664 552 Expression<String>? accessToken, 665 553 Expression<String>? refreshToken, 666 554 Expression<String>? dpopPublicKey, ··· 677 565 if (displayName != null) 'display_name': displayName, 678 566 if (service != null) 'service': service, 679 567 if (oauthService != null) 'oauth_service': oauthService, 568 + if (oauthClientId != null) 'oauth_client_id': oauthClientId, 680 569 if (accessToken != null) 'access_token': accessToken, 681 570 if (refreshToken != null) 'refresh_token': refreshToken, 682 571 if (dpopPublicKey != null) 'dpop_public_key': dpopPublicKey, ··· 695 584 Value<String?>? displayName, 696 585 Value<String?>? service, 697 586 Value<String?>? oauthService, 587 + Value<String?>? oauthClientId, 698 588 Value<String>? accessToken, 699 589 Value<String?>? refreshToken, 700 590 Value<String?>? dpopPublicKey, ··· 711 601 displayName: displayName ?? this.displayName, 712 602 service: service ?? this.service, 713 603 oauthService: oauthService ?? this.oauthService, 604 + oauthClientId: oauthClientId ?? this.oauthClientId, 714 605 accessToken: accessToken ?? this.accessToken, 715 606 refreshToken: refreshToken ?? this.refreshToken, 716 607 dpopPublicKey: dpopPublicKey ?? this.dpopPublicKey, ··· 740 631 } 741 632 if (oauthService.present) { 742 633 map['oauth_service'] = Variable<String>(oauthService.value); 634 + } 635 + if (oauthClientId.present) { 636 + map['oauth_client_id'] = Variable<String>(oauthClientId.value); 743 637 } 744 638 if (accessToken.present) { 745 639 map['access_token'] = Variable<String>(accessToken.value); ··· 779 673 ..write('displayName: $displayName, ') 780 674 ..write('service: $service, ') 781 675 ..write('oauthService: $oauthService, ') 676 + ..write('oauthClientId: $oauthClientId, ') 782 677 ..write('accessToken: $accessToken, ') 783 678 ..write('refreshToken: $refreshToken, ') 784 679 ..write('dpopPublicKey: $dpopPublicKey, ') ··· 793 688 } 794 689 } 795 690 796 - class $CachedProfilesTable extends CachedProfiles 797 - with TableInfo<$CachedProfilesTable, CachedProfile> { 691 + class $CachedProfilesTable extends CachedProfiles with TableInfo<$CachedProfilesTable, CachedProfile> { 798 692 @override 799 693 final GeneratedDatabase attachedDatabase; 800 694 final String? _alias; ··· 817 711 type: DriftSqlType.string, 818 712 requiredDuringInsert: true, 819 713 ); 820 - static const VerificationMeta _payloadMeta = const VerificationMeta( 821 - 'payload', 822 - ); 714 + static const VerificationMeta _payloadMeta = const VerificationMeta('payload'); 823 715 @override 824 716 late final GeneratedColumn<String> payload = GeneratedColumn<String>( 825 717 'payload', ··· 828 720 type: DriftSqlType.string, 829 721 requiredDuringInsert: true, 830 722 ); 831 - static const VerificationMeta _fetchedAtMeta = const VerificationMeta( 832 - 'fetchedAt', 833 - ); 723 + static const VerificationMeta _fetchedAtMeta = const VerificationMeta('fetchedAt'); 834 724 @override 835 725 late final GeneratedColumn<DateTime> fetchedAt = GeneratedColumn<DateTime>( 836 726 'fetched_at', ··· 848 738 String get actualTableName => $name; 849 739 static const String $name = 'cached_profiles'; 850 740 @override 851 - VerificationContext validateIntegrity( 852 - Insertable<CachedProfile> instance, { 853 - bool isInserting = false, 854 - }) { 741 + VerificationContext validateIntegrity(Insertable<CachedProfile> instance, {bool isInserting = false}) { 855 742 final context = VerificationContext(); 856 743 final data = instance.toColumns(true); 857 744 if (data.containsKey('did')) { 858 - context.handle( 859 - _didMeta, 860 - did.isAcceptableOrUnknown(data['did']!, _didMeta), 861 - ); 745 + context.handle(_didMeta, did.isAcceptableOrUnknown(data['did']!, _didMeta)); 862 746 } else if (isInserting) { 863 747 context.missing(_didMeta); 864 748 } 865 749 if (data.containsKey('handle')) { 866 - context.handle( 867 - _handleMeta, 868 - handle.isAcceptableOrUnknown(data['handle']!, _handleMeta), 869 - ); 750 + context.handle(_handleMeta, handle.isAcceptableOrUnknown(data['handle']!, _handleMeta)); 870 751 } else if (isInserting) { 871 752 context.missing(_handleMeta); 872 753 } 873 754 if (data.containsKey('payload')) { 874 - context.handle( 875 - _payloadMeta, 876 - payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta), 877 - ); 755 + context.handle(_payloadMeta, payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta)); 878 756 } else if (isInserting) { 879 757 context.missing(_payloadMeta); 880 758 } 881 759 if (data.containsKey('fetched_at')) { 882 - context.handle( 883 - _fetchedAtMeta, 884 - fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta), 885 - ); 760 + context.handle(_fetchedAtMeta, fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta)); 886 761 } 887 762 return context; 888 763 } ··· 893 768 CachedProfile map(Map<String, dynamic> data, {String? tablePrefix}) { 894 769 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 895 770 return CachedProfile( 896 - did: attachedDatabase.typeMapping.read( 897 - DriftSqlType.string, 898 - data['${effectivePrefix}did'], 899 - )!, 900 - handle: attachedDatabase.typeMapping.read( 901 - DriftSqlType.string, 902 - data['${effectivePrefix}handle'], 903 - )!, 904 - payload: attachedDatabase.typeMapping.read( 905 - DriftSqlType.string, 906 - data['${effectivePrefix}payload'], 907 - )!, 908 - fetchedAt: attachedDatabase.typeMapping.read( 909 - DriftSqlType.dateTime, 910 - data['${effectivePrefix}fetched_at'], 911 - )!, 771 + did: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}did'])!, 772 + handle: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}handle'])!, 773 + payload: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}payload'])!, 774 + fetchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}fetched_at'])!, 912 775 ); 913 776 } 914 777 ··· 923 786 final String handle; 924 787 final String payload; 925 788 final DateTime fetchedAt; 926 - const CachedProfile({ 927 - required this.did, 928 - required this.handle, 929 - required this.payload, 930 - required this.fetchedAt, 931 - }); 789 + const CachedProfile({required this.did, required this.handle, required this.payload, required this.fetchedAt}); 932 790 @override 933 791 Map<String, Expression> toColumns(bool nullToAbsent) { 934 792 final map = <String, Expression>{}; ··· 948 806 ); 949 807 } 950 808 951 - factory CachedProfile.fromJson( 952 - Map<String, dynamic> json, { 953 - ValueSerializer? serializer, 954 - }) { 809 + factory CachedProfile.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 955 810 serializer ??= driftRuntimeOptions.defaultSerializer; 956 811 return CachedProfile( 957 812 did: serializer.fromJson<String>(json['did']), ··· 971 826 }; 972 827 } 973 828 974 - CachedProfile copyWith({ 975 - String? did, 976 - String? handle, 977 - String? payload, 978 - DateTime? fetchedAt, 979 - }) => CachedProfile( 829 + CachedProfile copyWith({String? did, String? handle, String? payload, DateTime? fetchedAt}) => CachedProfile( 980 830 did: did ?? this.did, 981 831 handle: handle ?? this.handle, 982 832 payload: payload ?? this.payload, ··· 1102 952 } 1103 953 } 1104 954 1105 - class $CachedPostsTable extends CachedPosts 1106 - with TableInfo<$CachedPostsTable, CachedPost> { 955 + class $CachedPostsTable extends CachedPosts with TableInfo<$CachedPostsTable, CachedPost> { 1107 956 @override 1108 957 final GeneratedDatabase attachedDatabase; 1109 958 final String? _alias; ··· 1117 966 type: DriftSqlType.string, 1118 967 requiredDuringInsert: true, 1119 968 ); 1120 - static const VerificationMeta _authorDidMeta = const VerificationMeta( 1121 - 'authorDid', 1122 - ); 969 + static const VerificationMeta _authorDidMeta = const VerificationMeta('authorDid'); 1123 970 @override 1124 971 late final GeneratedColumn<String> authorDid = GeneratedColumn<String>( 1125 972 'author_did', ··· 1128 975 type: DriftSqlType.string, 1129 976 requiredDuringInsert: true, 1130 977 ); 1131 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 1132 - 'accountDid', 1133 - ); 978 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 1134 979 @override 1135 980 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 1136 981 'account_did', ··· 1139 984 type: DriftSqlType.string, 1140 985 requiredDuringInsert: false, 1141 986 ); 1142 - static const VerificationMeta _payloadMeta = const VerificationMeta( 1143 - 'payload', 1144 - ); 987 + static const VerificationMeta _payloadMeta = const VerificationMeta('payload'); 1145 988 @override 1146 989 late final GeneratedColumn<String> payload = GeneratedColumn<String>( 1147 990 'payload', ··· 1150 993 type: DriftSqlType.string, 1151 994 requiredDuringInsert: true, 1152 995 ); 1153 - static const VerificationMeta _createdAtMeta = const VerificationMeta( 1154 - 'createdAt', 1155 - ); 996 + static const VerificationMeta _createdAtMeta = const VerificationMeta('createdAt'); 1156 997 @override 1157 998 late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>( 1158 999 'created_at', ··· 1161 1002 type: DriftSqlType.dateTime, 1162 1003 requiredDuringInsert: false, 1163 1004 ); 1164 - static const VerificationMeta _fetchedAtMeta = const VerificationMeta( 1165 - 'fetchedAt', 1166 - ); 1005 + static const VerificationMeta _fetchedAtMeta = const VerificationMeta('fetchedAt'); 1167 1006 @override 1168 1007 late final GeneratedColumn<DateTime> fetchedAt = GeneratedColumn<DateTime>( 1169 1008 'fetched_at', ··· 1174 1013 defaultValue: currentDateAndTime, 1175 1014 ); 1176 1015 @override 1177 - List<GeneratedColumn> get $columns => [ 1178 - uri, 1179 - authorDid, 1180 - accountDid, 1181 - payload, 1182 - createdAt, 1183 - fetchedAt, 1184 - ]; 1016 + List<GeneratedColumn> get $columns => [uri, authorDid, accountDid, payload, createdAt, fetchedAt]; 1185 1017 @override 1186 1018 String get aliasedName => _alias ?? actualTableName; 1187 1019 @override 1188 1020 String get actualTableName => $name; 1189 1021 static const String $name = 'cached_posts'; 1190 1022 @override 1191 - VerificationContext validateIntegrity( 1192 - Insertable<CachedPost> instance, { 1193 - bool isInserting = false, 1194 - }) { 1023 + VerificationContext validateIntegrity(Insertable<CachedPost> instance, {bool isInserting = false}) { 1195 1024 final context = VerificationContext(); 1196 1025 final data = instance.toColumns(true); 1197 1026 if (data.containsKey('uri')) { 1198 - context.handle( 1199 - _uriMeta, 1200 - uri.isAcceptableOrUnknown(data['uri']!, _uriMeta), 1201 - ); 1027 + context.handle(_uriMeta, uri.isAcceptableOrUnknown(data['uri']!, _uriMeta)); 1202 1028 } else if (isInserting) { 1203 1029 context.missing(_uriMeta); 1204 1030 } 1205 1031 if (data.containsKey('author_did')) { 1206 - context.handle( 1207 - _authorDidMeta, 1208 - authorDid.isAcceptableOrUnknown(data['author_did']!, _authorDidMeta), 1209 - ); 1032 + context.handle(_authorDidMeta, authorDid.isAcceptableOrUnknown(data['author_did']!, _authorDidMeta)); 1210 1033 } else if (isInserting) { 1211 1034 context.missing(_authorDidMeta); 1212 1035 } 1213 1036 if (data.containsKey('account_did')) { 1214 - context.handle( 1215 - _accountDidMeta, 1216 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 1217 - ); 1037 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 1218 1038 } 1219 1039 if (data.containsKey('payload')) { 1220 - context.handle( 1221 - _payloadMeta, 1222 - payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta), 1223 - ); 1040 + context.handle(_payloadMeta, payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta)); 1224 1041 } else if (isInserting) { 1225 1042 context.missing(_payloadMeta); 1226 1043 } 1227 1044 if (data.containsKey('created_at')) { 1228 - context.handle( 1229 - _createdAtMeta, 1230 - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), 1231 - ); 1045 + context.handle(_createdAtMeta, createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); 1232 1046 } 1233 1047 if (data.containsKey('fetched_at')) { 1234 - context.handle( 1235 - _fetchedAtMeta, 1236 - fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta), 1237 - ); 1048 + context.handle(_fetchedAtMeta, fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta)); 1238 1049 } 1239 1050 return context; 1240 1051 } ··· 1245 1056 CachedPost map(Map<String, dynamic> data, {String? tablePrefix}) { 1246 1057 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 1247 1058 return CachedPost( 1248 - uri: attachedDatabase.typeMapping.read( 1249 - DriftSqlType.string, 1250 - data['${effectivePrefix}uri'], 1251 - )!, 1252 - authorDid: attachedDatabase.typeMapping.read( 1253 - DriftSqlType.string, 1254 - data['${effectivePrefix}author_did'], 1255 - )!, 1256 - accountDid: attachedDatabase.typeMapping.read( 1257 - DriftSqlType.string, 1258 - data['${effectivePrefix}account_did'], 1259 - ), 1260 - payload: attachedDatabase.typeMapping.read( 1261 - DriftSqlType.string, 1262 - data['${effectivePrefix}payload'], 1263 - )!, 1264 - createdAt: attachedDatabase.typeMapping.read( 1265 - DriftSqlType.dateTime, 1266 - data['${effectivePrefix}created_at'], 1267 - ), 1268 - fetchedAt: attachedDatabase.typeMapping.read( 1269 - DriftSqlType.dateTime, 1270 - data['${effectivePrefix}fetched_at'], 1271 - )!, 1059 + uri: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}uri'])!, 1060 + authorDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}author_did'])!, 1061 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did']), 1062 + payload: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}payload'])!, 1063 + createdAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']), 1064 + fetchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}fetched_at'])!, 1272 1065 ); 1273 1066 } 1274 1067 ··· 1313 1106 return CachedPostsCompanion( 1314 1107 uri: Value(uri), 1315 1108 authorDid: Value(authorDid), 1316 - accountDid: accountDid == null && nullToAbsent 1317 - ? const Value.absent() 1318 - : Value(accountDid), 1109 + accountDid: accountDid == null && nullToAbsent ? const Value.absent() : Value(accountDid), 1319 1110 payload: Value(payload), 1320 - createdAt: createdAt == null && nullToAbsent 1321 - ? const Value.absent() 1322 - : Value(createdAt), 1111 + createdAt: createdAt == null && nullToAbsent ? const Value.absent() : Value(createdAt), 1323 1112 fetchedAt: Value(fetchedAt), 1324 1113 ); 1325 1114 } 1326 1115 1327 - factory CachedPost.fromJson( 1328 - Map<String, dynamic> json, { 1329 - ValueSerializer? serializer, 1330 - }) { 1116 + factory CachedPost.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 1331 1117 serializer ??= driftRuntimeOptions.defaultSerializer; 1332 1118 return CachedPost( 1333 1119 uri: serializer.fromJson<String>(json['uri']), ··· 1370 1156 return CachedPost( 1371 1157 uri: data.uri.present ? data.uri.value : this.uri, 1372 1158 authorDid: data.authorDid.present ? data.authorDid.value : this.authorDid, 1373 - accountDid: data.accountDid.present 1374 - ? data.accountDid.value 1375 - : this.accountDid, 1159 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 1376 1160 payload: data.payload.present ? data.payload.value : this.payload, 1377 1161 createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, 1378 1162 fetchedAt: data.fetchedAt.present ? data.fetchedAt.value : this.fetchedAt, ··· 1393 1177 } 1394 1178 1395 1179 @override 1396 - int get hashCode => 1397 - Object.hash(uri, authorDid, accountDid, payload, createdAt, fetchedAt); 1180 + int get hashCode => Object.hash(uri, authorDid, accountDid, payload, createdAt, fetchedAt); 1398 1181 @override 1399 1182 bool operator ==(Object other) => 1400 1183 identical(this, other) || ··· 1517 1300 } 1518 1301 } 1519 1302 1520 - class $SettingsTable extends Settings 1521 - with TableInfo<$SettingsTable, SettingsEntry> { 1303 + class $SettingsTable extends Settings with TableInfo<$SettingsTable, SettingsEntry> { 1522 1304 @override 1523 1305 final GeneratedDatabase attachedDatabase; 1524 1306 final String? _alias; ··· 1541 1323 type: DriftSqlType.string, 1542 1324 requiredDuringInsert: true, 1543 1325 ); 1544 - static const VerificationMeta _updatedAtMeta = const VerificationMeta( 1545 - 'updatedAt', 1546 - ); 1326 + static const VerificationMeta _updatedAtMeta = const VerificationMeta('updatedAt'); 1547 1327 @override 1548 1328 late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>( 1549 1329 'updated_at', ··· 1561 1341 String get actualTableName => $name; 1562 1342 static const String $name = 'settings'; 1563 1343 @override 1564 - VerificationContext validateIntegrity( 1565 - Insertable<SettingsEntry> instance, { 1566 - bool isInserting = false, 1567 - }) { 1344 + VerificationContext validateIntegrity(Insertable<SettingsEntry> instance, {bool isInserting = false}) { 1568 1345 final context = VerificationContext(); 1569 1346 final data = instance.toColumns(true); 1570 1347 if (data.containsKey('key')) { 1571 - context.handle( 1572 - _keyMeta, 1573 - key.isAcceptableOrUnknown(data['key']!, _keyMeta), 1574 - ); 1348 + context.handle(_keyMeta, key.isAcceptableOrUnknown(data['key']!, _keyMeta)); 1575 1349 } else if (isInserting) { 1576 1350 context.missing(_keyMeta); 1577 1351 } 1578 1352 if (data.containsKey('value')) { 1579 - context.handle( 1580 - _valueMeta, 1581 - value.isAcceptableOrUnknown(data['value']!, _valueMeta), 1582 - ); 1353 + context.handle(_valueMeta, value.isAcceptableOrUnknown(data['value']!, _valueMeta)); 1583 1354 } else if (isInserting) { 1584 1355 context.missing(_valueMeta); 1585 1356 } 1586 1357 if (data.containsKey('updated_at')) { 1587 - context.handle( 1588 - _updatedAtMeta, 1589 - updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), 1590 - ); 1358 + context.handle(_updatedAtMeta, updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta)); 1591 1359 } 1592 1360 return context; 1593 1361 } ··· 1598 1366 SettingsEntry map(Map<String, dynamic> data, {String? tablePrefix}) { 1599 1367 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 1600 1368 return SettingsEntry( 1601 - key: attachedDatabase.typeMapping.read( 1602 - DriftSqlType.string, 1603 - data['${effectivePrefix}key'], 1604 - )!, 1605 - value: attachedDatabase.typeMapping.read( 1606 - DriftSqlType.string, 1607 - data['${effectivePrefix}value'], 1608 - )!, 1609 - updatedAt: attachedDatabase.typeMapping.read( 1610 - DriftSqlType.dateTime, 1611 - data['${effectivePrefix}updated_at'], 1612 - )!, 1369 + key: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}key'])!, 1370 + value: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}value'])!, 1371 + updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, 1613 1372 ); 1614 1373 } 1615 1374 ··· 1623 1382 final String key; 1624 1383 final String value; 1625 1384 final DateTime updatedAt; 1626 - const SettingsEntry({ 1627 - required this.key, 1628 - required this.value, 1629 - required this.updatedAt, 1630 - }); 1385 + const SettingsEntry({required this.key, required this.value, required this.updatedAt}); 1631 1386 @override 1632 1387 Map<String, Expression> toColumns(bool nullToAbsent) { 1633 1388 final map = <String, Expression>{}; ··· 1638 1393 } 1639 1394 1640 1395 SettingsCompanion toCompanion(bool nullToAbsent) { 1641 - return SettingsCompanion( 1642 - key: Value(key), 1643 - value: Value(value), 1644 - updatedAt: Value(updatedAt), 1645 - ); 1396 + return SettingsCompanion(key: Value(key), value: Value(value), updatedAt: Value(updatedAt)); 1646 1397 } 1647 1398 1648 - factory SettingsEntry.fromJson( 1649 - Map<String, dynamic> json, { 1650 - ValueSerializer? serializer, 1651 - }) { 1399 + factory SettingsEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 1652 1400 serializer ??= driftRuntimeOptions.defaultSerializer; 1653 1401 return SettingsEntry( 1654 1402 key: serializer.fromJson<String>(json['key']), ··· 1667 1415 } 1668 1416 1669 1417 SettingsEntry copyWith({String? key, String? value, DateTime? updatedAt}) => 1670 - SettingsEntry( 1671 - key: key ?? this.key, 1672 - value: value ?? this.value, 1673 - updatedAt: updatedAt ?? this.updatedAt, 1674 - ); 1418 + SettingsEntry(key: key ?? this.key, value: value ?? this.value, updatedAt: updatedAt ?? this.updatedAt); 1675 1419 SettingsEntry copyWithCompanion(SettingsCompanion data) { 1676 1420 return SettingsEntry( 1677 1421 key: data.key.present ? data.key.value : this.key, ··· 1777 1521 } 1778 1522 } 1779 1523 1780 - class $SavedFeedsTable extends SavedFeeds 1781 - with TableInfo<$SavedFeedsTable, SavedFeedEntry> { 1524 + class $SavedFeedsTable extends SavedFeeds with TableInfo<$SavedFeedsTable, SavedFeedEntry> { 1782 1525 @override 1783 1526 final GeneratedDatabase attachedDatabase; 1784 1527 final String? _alias; ··· 1792 1535 type: DriftSqlType.string, 1793 1536 requiredDuringInsert: true, 1794 1537 ); 1795 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 1796 - 'accountDid', 1797 - ); 1538 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 1798 1539 @override 1799 1540 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 1800 1541 'account_did', ··· 1829 1570 false, 1830 1571 type: DriftSqlType.bool, 1831 1572 requiredDuringInsert: false, 1832 - defaultConstraints: GeneratedColumn.constraintIsAlways( 1833 - 'CHECK ("pinned" IN (0, 1))', 1834 - ), 1573 + defaultConstraints: GeneratedColumn.constraintIsAlways('CHECK ("pinned" IN (0, 1))'), 1835 1574 defaultValue: const Constant(false), 1836 1575 ); 1837 - static const VerificationMeta _sortOrderMeta = const VerificationMeta( 1838 - 'sortOrder', 1839 - ); 1576 + static const VerificationMeta _sortOrderMeta = const VerificationMeta('sortOrder'); 1840 1577 @override 1841 1578 late final GeneratedColumn<int> sortOrder = GeneratedColumn<int>( 1842 1579 'sort_order', ··· 1846 1583 requiredDuringInsert: false, 1847 1584 defaultValue: const Constant(0), 1848 1585 ); 1849 - static const VerificationMeta _updatedAtMeta = const VerificationMeta( 1850 - 'updatedAt', 1851 - ); 1586 + static const VerificationMeta _updatedAtMeta = const VerificationMeta('updatedAt'); 1852 1587 @override 1853 1588 late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>( 1854 1589 'updated_at', ··· 1859 1594 defaultValue: currentDateAndTime, 1860 1595 ); 1861 1596 @override 1862 - List<GeneratedColumn> get $columns => [ 1863 - id, 1864 - accountDid, 1865 - type, 1866 - value, 1867 - pinned, 1868 - sortOrder, 1869 - updatedAt, 1870 - ]; 1597 + List<GeneratedColumn> get $columns => [id, accountDid, type, value, pinned, sortOrder, updatedAt]; 1871 1598 @override 1872 1599 String get aliasedName => _alias ?? actualTableName; 1873 1600 @override 1874 1601 String get actualTableName => $name; 1875 1602 static const String $name = 'saved_feeds'; 1876 1603 @override 1877 - VerificationContext validateIntegrity( 1878 - Insertable<SavedFeedEntry> instance, { 1879 - bool isInserting = false, 1880 - }) { 1604 + VerificationContext validateIntegrity(Insertable<SavedFeedEntry> instance, {bool isInserting = false}) { 1881 1605 final context = VerificationContext(); 1882 1606 final data = instance.toColumns(true); 1883 1607 if (data.containsKey('id')) { ··· 1886 1610 context.missing(_idMeta); 1887 1611 } 1888 1612 if (data.containsKey('account_did')) { 1889 - context.handle( 1890 - _accountDidMeta, 1891 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 1892 - ); 1613 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 1893 1614 } else if (isInserting) { 1894 1615 context.missing(_accountDidMeta); 1895 1616 } 1896 1617 if (data.containsKey('type')) { 1897 - context.handle( 1898 - _typeMeta, 1899 - type.isAcceptableOrUnknown(data['type']!, _typeMeta), 1900 - ); 1618 + context.handle(_typeMeta, type.isAcceptableOrUnknown(data['type']!, _typeMeta)); 1901 1619 } else if (isInserting) { 1902 1620 context.missing(_typeMeta); 1903 1621 } 1904 1622 if (data.containsKey('value')) { 1905 - context.handle( 1906 - _valueMeta, 1907 - value.isAcceptableOrUnknown(data['value']!, _valueMeta), 1908 - ); 1623 + context.handle(_valueMeta, value.isAcceptableOrUnknown(data['value']!, _valueMeta)); 1909 1624 } else if (isInserting) { 1910 1625 context.missing(_valueMeta); 1911 1626 } 1912 1627 if (data.containsKey('pinned')) { 1913 - context.handle( 1914 - _pinnedMeta, 1915 - pinned.isAcceptableOrUnknown(data['pinned']!, _pinnedMeta), 1916 - ); 1628 + context.handle(_pinnedMeta, pinned.isAcceptableOrUnknown(data['pinned']!, _pinnedMeta)); 1917 1629 } 1918 1630 if (data.containsKey('sort_order')) { 1919 - context.handle( 1920 - _sortOrderMeta, 1921 - sortOrder.isAcceptableOrUnknown(data['sort_order']!, _sortOrderMeta), 1922 - ); 1631 + context.handle(_sortOrderMeta, sortOrder.isAcceptableOrUnknown(data['sort_order']!, _sortOrderMeta)); 1923 1632 } 1924 1633 if (data.containsKey('updated_at')) { 1925 - context.handle( 1926 - _updatedAtMeta, 1927 - updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), 1928 - ); 1634 + context.handle(_updatedAtMeta, updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta)); 1929 1635 } 1930 1636 return context; 1931 1637 } ··· 1936 1642 SavedFeedEntry map(Map<String, dynamic> data, {String? tablePrefix}) { 1937 1643 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 1938 1644 return SavedFeedEntry( 1939 - id: attachedDatabase.typeMapping.read( 1940 - DriftSqlType.string, 1941 - data['${effectivePrefix}id'], 1942 - )!, 1943 - accountDid: attachedDatabase.typeMapping.read( 1944 - DriftSqlType.string, 1945 - data['${effectivePrefix}account_did'], 1946 - )!, 1947 - type: attachedDatabase.typeMapping.read( 1948 - DriftSqlType.string, 1949 - data['${effectivePrefix}type'], 1950 - )!, 1951 - value: attachedDatabase.typeMapping.read( 1952 - DriftSqlType.string, 1953 - data['${effectivePrefix}value'], 1954 - )!, 1955 - pinned: attachedDatabase.typeMapping.read( 1956 - DriftSqlType.bool, 1957 - data['${effectivePrefix}pinned'], 1958 - )!, 1959 - sortOrder: attachedDatabase.typeMapping.read( 1960 - DriftSqlType.int, 1961 - data['${effectivePrefix}sort_order'], 1962 - )!, 1963 - updatedAt: attachedDatabase.typeMapping.read( 1964 - DriftSqlType.dateTime, 1965 - data['${effectivePrefix}updated_at'], 1966 - )!, 1645 + id: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}id'])!, 1646 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 1647 + type: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}type'])!, 1648 + value: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}value'])!, 1649 + pinned: attachedDatabase.typeMapping.read(DriftSqlType.bool, data['${effectivePrefix}pinned'])!, 1650 + sortOrder: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}sort_order'])!, 1651 + updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, 1967 1652 ); 1968 1653 } 1969 1654 ··· 2015 1700 ); 2016 1701 } 2017 1702 2018 - factory SavedFeedEntry.fromJson( 2019 - Map<String, dynamic> json, { 2020 - ValueSerializer? serializer, 2021 - }) { 1703 + factory SavedFeedEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 2022 1704 serializer ??= driftRuntimeOptions.defaultSerializer; 2023 1705 return SavedFeedEntry( 2024 1706 id: serializer.fromJson<String>(json['id']), ··· 2064 1746 SavedFeedEntry copyWithCompanion(SavedFeedsCompanion data) { 2065 1747 return SavedFeedEntry( 2066 1748 id: data.id.present ? data.id.value : this.id, 2067 - accountDid: data.accountDid.present 2068 - ? data.accountDid.value 2069 - : this.accountDid, 1749 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 2070 1750 type: data.type.present ? data.type.value : this.type, 2071 1751 value: data.value.present ? data.value.value : this.value, 2072 1752 pinned: data.pinned.present ? data.pinned.value : this.pinned, ··· 2090 1770 } 2091 1771 2092 1772 @override 2093 - int get hashCode => 2094 - Object.hash(id, accountDid, type, value, pinned, sortOrder, updatedAt); 1773 + int get hashCode => Object.hash(id, accountDid, type, value, pinned, sortOrder, updatedAt); 2095 1774 @override 2096 1775 bool operator ==(Object other) => 2097 1776 identical(this, other) || ··· 2227 1906 } 2228 1907 } 2229 1908 2230 - class $CachedFeedPagesTable extends CachedFeedPages 2231 - with TableInfo<$CachedFeedPagesTable, CachedFeedPage> { 1909 + class $CachedFeedPagesTable extends CachedFeedPages with TableInfo<$CachedFeedPagesTable, CachedFeedPage> { 2232 1910 @override 2233 1911 final GeneratedDatabase attachedDatabase; 2234 1912 final String? _alias; 2235 1913 $CachedFeedPagesTable(this.attachedDatabase, [this._alias]); 2236 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 2237 - 'accountDid', 2238 - ); 1914 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 2239 1915 @override 2240 1916 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 2241 1917 'account_did', ··· 2244 1920 type: DriftSqlType.string, 2245 1921 requiredDuringInsert: true, 2246 1922 ); 2247 - static const VerificationMeta _feedKeyMeta = const VerificationMeta( 2248 - 'feedKey', 2249 - ); 1923 + static const VerificationMeta _feedKeyMeta = const VerificationMeta('feedKey'); 2250 1924 @override 2251 1925 late final GeneratedColumn<String> feedKey = GeneratedColumn<String>( 2252 1926 'feed_key', ··· 2255 1929 type: DriftSqlType.string, 2256 1930 requiredDuringInsert: true, 2257 1931 ); 2258 - static const VerificationMeta _payloadMeta = const VerificationMeta( 2259 - 'payload', 2260 - ); 1932 + static const VerificationMeta _payloadMeta = const VerificationMeta('payload'); 2261 1933 @override 2262 1934 late final GeneratedColumn<String> payload = GeneratedColumn<String>( 2263 1935 'payload', ··· 2266 1938 type: DriftSqlType.string, 2267 1939 requiredDuringInsert: true, 2268 1940 ); 2269 - static const VerificationMeta _fetchedAtMeta = const VerificationMeta( 2270 - 'fetchedAt', 2271 - ); 1941 + static const VerificationMeta _fetchedAtMeta = const VerificationMeta('fetchedAt'); 2272 1942 @override 2273 1943 late final GeneratedColumn<DateTime> fetchedAt = GeneratedColumn<DateTime>( 2274 1944 'fetched_at', ··· 2279 1949 defaultValue: currentDateAndTime, 2280 1950 ); 2281 1951 @override 2282 - List<GeneratedColumn> get $columns => [ 2283 - accountDid, 2284 - feedKey, 2285 - payload, 2286 - fetchedAt, 2287 - ]; 1952 + List<GeneratedColumn> get $columns => [accountDid, feedKey, payload, fetchedAt]; 2288 1953 @override 2289 1954 String get aliasedName => _alias ?? actualTableName; 2290 1955 @override 2291 1956 String get actualTableName => $name; 2292 1957 static const String $name = 'cached_feed_pages'; 2293 1958 @override 2294 - VerificationContext validateIntegrity( 2295 - Insertable<CachedFeedPage> instance, { 2296 - bool isInserting = false, 2297 - }) { 1959 + VerificationContext validateIntegrity(Insertable<CachedFeedPage> instance, {bool isInserting = false}) { 2298 1960 final context = VerificationContext(); 2299 1961 final data = instance.toColumns(true); 2300 1962 if (data.containsKey('account_did')) { 2301 - context.handle( 2302 - _accountDidMeta, 2303 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 2304 - ); 1963 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 2305 1964 } else if (isInserting) { 2306 1965 context.missing(_accountDidMeta); 2307 1966 } 2308 1967 if (data.containsKey('feed_key')) { 2309 - context.handle( 2310 - _feedKeyMeta, 2311 - feedKey.isAcceptableOrUnknown(data['feed_key']!, _feedKeyMeta), 2312 - ); 1968 + context.handle(_feedKeyMeta, feedKey.isAcceptableOrUnknown(data['feed_key']!, _feedKeyMeta)); 2313 1969 } else if (isInserting) { 2314 1970 context.missing(_feedKeyMeta); 2315 1971 } 2316 1972 if (data.containsKey('payload')) { 2317 - context.handle( 2318 - _payloadMeta, 2319 - payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta), 2320 - ); 1973 + context.handle(_payloadMeta, payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta)); 2321 1974 } else if (isInserting) { 2322 1975 context.missing(_payloadMeta); 2323 1976 } 2324 1977 if (data.containsKey('fetched_at')) { 2325 - context.handle( 2326 - _fetchedAtMeta, 2327 - fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta), 2328 - ); 1978 + context.handle(_fetchedAtMeta, fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta)); 2329 1979 } 2330 1980 return context; 2331 1981 } ··· 2336 1986 CachedFeedPage map(Map<String, dynamic> data, {String? tablePrefix}) { 2337 1987 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 2338 1988 return CachedFeedPage( 2339 - accountDid: attachedDatabase.typeMapping.read( 2340 - DriftSqlType.string, 2341 - data['${effectivePrefix}account_did'], 2342 - )!, 2343 - feedKey: attachedDatabase.typeMapping.read( 2344 - DriftSqlType.string, 2345 - data['${effectivePrefix}feed_key'], 2346 - )!, 2347 - payload: attachedDatabase.typeMapping.read( 2348 - DriftSqlType.string, 2349 - data['${effectivePrefix}payload'], 2350 - )!, 2351 - fetchedAt: attachedDatabase.typeMapping.read( 2352 - DriftSqlType.dateTime, 2353 - data['${effectivePrefix}fetched_at'], 2354 - )!, 1989 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 1990 + feedKey: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}feed_key'])!, 1991 + payload: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}payload'])!, 1992 + fetchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}fetched_at'])!, 2355 1993 ); 2356 1994 } 2357 1995 ··· 2391 2029 ); 2392 2030 } 2393 2031 2394 - factory CachedFeedPage.fromJson( 2395 - Map<String, dynamic> json, { 2396 - ValueSerializer? serializer, 2397 - }) { 2032 + factory CachedFeedPage.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 2398 2033 serializer ??= driftRuntimeOptions.defaultSerializer; 2399 2034 return CachedFeedPage( 2400 2035 accountDid: serializer.fromJson<String>(json['accountDid']), ··· 2414 2049 }; 2415 2050 } 2416 2051 2417 - CachedFeedPage copyWith({ 2418 - String? accountDid, 2419 - String? feedKey, 2420 - String? payload, 2421 - DateTime? fetchedAt, 2422 - }) => CachedFeedPage( 2423 - accountDid: accountDid ?? this.accountDid, 2424 - feedKey: feedKey ?? this.feedKey, 2425 - payload: payload ?? this.payload, 2426 - fetchedAt: fetchedAt ?? this.fetchedAt, 2427 - ); 2052 + CachedFeedPage copyWith({String? accountDid, String? feedKey, String? payload, DateTime? fetchedAt}) => 2053 + CachedFeedPage( 2054 + accountDid: accountDid ?? this.accountDid, 2055 + feedKey: feedKey ?? this.feedKey, 2056 + payload: payload ?? this.payload, 2057 + fetchedAt: fetchedAt ?? this.fetchedAt, 2058 + ); 2428 2059 CachedFeedPage copyWithCompanion(CachedFeedPagesCompanion data) { 2429 2060 return CachedFeedPage( 2430 - accountDid: data.accountDid.present 2431 - ? data.accountDid.value 2432 - : this.accountDid, 2061 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 2433 2062 feedKey: data.feedKey.present ? data.feedKey.value : this.feedKey, 2434 2063 payload: data.payload.present ? data.payload.value : this.payload, 2435 2064 fetchedAt: data.fetchedAt.present ? data.fetchedAt.value : this.fetchedAt, ··· 2547 2176 } 2548 2177 } 2549 2178 2550 - class $CachedFeedPostsTable extends CachedFeedPosts 2551 - with TableInfo<$CachedFeedPostsTable, CachedFeedPost> { 2179 + class $CachedFeedPostsTable extends CachedFeedPosts with TableInfo<$CachedFeedPostsTable, CachedFeedPost> { 2552 2180 @override 2553 2181 final GeneratedDatabase attachedDatabase; 2554 2182 final String? _alias; 2555 2183 $CachedFeedPostsTable(this.attachedDatabase, [this._alias]); 2556 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 2557 - 'accountDid', 2558 - ); 2184 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 2559 2185 @override 2560 2186 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 2561 2187 'account_did', ··· 2564 2190 type: DriftSqlType.string, 2565 2191 requiredDuringInsert: true, 2566 2192 ); 2567 - static const VerificationMeta _feedKeyMeta = const VerificationMeta( 2568 - 'feedKey', 2569 - ); 2193 + static const VerificationMeta _feedKeyMeta = const VerificationMeta('feedKey'); 2570 2194 @override 2571 2195 late final GeneratedColumn<String> feedKey = GeneratedColumn<String>( 2572 2196 'feed_key', ··· 2575 2199 type: DriftSqlType.string, 2576 2200 requiredDuringInsert: true, 2577 2201 ); 2578 - static const VerificationMeta _postUriMeta = const VerificationMeta( 2579 - 'postUri', 2580 - ); 2202 + static const VerificationMeta _postUriMeta = const VerificationMeta('postUri'); 2581 2203 @override 2582 2204 late final GeneratedColumn<String> postUri = GeneratedColumn<String>( 2583 2205 'post_uri', ··· 2586 2208 type: DriftSqlType.string, 2587 2209 requiredDuringInsert: true, 2588 2210 ); 2589 - static const VerificationMeta _postJsonMeta = const VerificationMeta( 2590 - 'postJson', 2591 - ); 2211 + static const VerificationMeta _postJsonMeta = const VerificationMeta('postJson'); 2592 2212 @override 2593 2213 late final GeneratedColumn<String> postJson = GeneratedColumn<String>( 2594 2214 'post_json', ··· 2597 2217 type: DriftSqlType.string, 2598 2218 requiredDuringInsert: true, 2599 2219 ); 2600 - static const VerificationMeta _sortOrderMeta = const VerificationMeta( 2601 - 'sortOrder', 2602 - ); 2220 + static const VerificationMeta _sortOrderMeta = const VerificationMeta('sortOrder'); 2603 2221 @override 2604 2222 late final GeneratedColumn<int> sortOrder = GeneratedColumn<int>( 2605 2223 'sort_order', ··· 2608 2226 type: DriftSqlType.int, 2609 2227 requiredDuringInsert: true, 2610 2228 ); 2611 - static const VerificationMeta _fetchedAtMeta = const VerificationMeta( 2612 - 'fetchedAt', 2613 - ); 2229 + static const VerificationMeta _fetchedAtMeta = const VerificationMeta('fetchedAt'); 2614 2230 @override 2615 2231 late final GeneratedColumn<DateTime> fetchedAt = GeneratedColumn<DateTime>( 2616 2232 'fetched_at', ··· 2621 2237 defaultValue: currentDateAndTime, 2622 2238 ); 2623 2239 @override 2624 - List<GeneratedColumn> get $columns => [ 2625 - accountDid, 2626 - feedKey, 2627 - postUri, 2628 - postJson, 2629 - sortOrder, 2630 - fetchedAt, 2631 - ]; 2240 + List<GeneratedColumn> get $columns => [accountDid, feedKey, postUri, postJson, sortOrder, fetchedAt]; 2632 2241 @override 2633 2242 String get aliasedName => _alias ?? actualTableName; 2634 2243 @override 2635 2244 String get actualTableName => $name; 2636 2245 static const String $name = 'cached_feed_posts'; 2637 2246 @override 2638 - VerificationContext validateIntegrity( 2639 - Insertable<CachedFeedPost> instance, { 2640 - bool isInserting = false, 2641 - }) { 2247 + VerificationContext validateIntegrity(Insertable<CachedFeedPost> instance, {bool isInserting = false}) { 2642 2248 final context = VerificationContext(); 2643 2249 final data = instance.toColumns(true); 2644 2250 if (data.containsKey('account_did')) { 2645 - context.handle( 2646 - _accountDidMeta, 2647 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 2648 - ); 2251 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 2649 2252 } else if (isInserting) { 2650 2253 context.missing(_accountDidMeta); 2651 2254 } 2652 2255 if (data.containsKey('feed_key')) { 2653 - context.handle( 2654 - _feedKeyMeta, 2655 - feedKey.isAcceptableOrUnknown(data['feed_key']!, _feedKeyMeta), 2656 - ); 2256 + context.handle(_feedKeyMeta, feedKey.isAcceptableOrUnknown(data['feed_key']!, _feedKeyMeta)); 2657 2257 } else if (isInserting) { 2658 2258 context.missing(_feedKeyMeta); 2659 2259 } 2660 2260 if (data.containsKey('post_uri')) { 2661 - context.handle( 2662 - _postUriMeta, 2663 - postUri.isAcceptableOrUnknown(data['post_uri']!, _postUriMeta), 2664 - ); 2261 + context.handle(_postUriMeta, postUri.isAcceptableOrUnknown(data['post_uri']!, _postUriMeta)); 2665 2262 } else if (isInserting) { 2666 2263 context.missing(_postUriMeta); 2667 2264 } 2668 2265 if (data.containsKey('post_json')) { 2669 - context.handle( 2670 - _postJsonMeta, 2671 - postJson.isAcceptableOrUnknown(data['post_json']!, _postJsonMeta), 2672 - ); 2266 + context.handle(_postJsonMeta, postJson.isAcceptableOrUnknown(data['post_json']!, _postJsonMeta)); 2673 2267 } else if (isInserting) { 2674 2268 context.missing(_postJsonMeta); 2675 2269 } 2676 2270 if (data.containsKey('sort_order')) { 2677 - context.handle( 2678 - _sortOrderMeta, 2679 - sortOrder.isAcceptableOrUnknown(data['sort_order']!, _sortOrderMeta), 2680 - ); 2271 + context.handle(_sortOrderMeta, sortOrder.isAcceptableOrUnknown(data['sort_order']!, _sortOrderMeta)); 2681 2272 } else if (isInserting) { 2682 2273 context.missing(_sortOrderMeta); 2683 2274 } 2684 2275 if (data.containsKey('fetched_at')) { 2685 - context.handle( 2686 - _fetchedAtMeta, 2687 - fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta), 2688 - ); 2276 + context.handle(_fetchedAtMeta, fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta)); 2689 2277 } 2690 2278 return context; 2691 2279 } ··· 2696 2284 CachedFeedPost map(Map<String, dynamic> data, {String? tablePrefix}) { 2697 2285 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 2698 2286 return CachedFeedPost( 2699 - accountDid: attachedDatabase.typeMapping.read( 2700 - DriftSqlType.string, 2701 - data['${effectivePrefix}account_did'], 2702 - )!, 2703 - feedKey: attachedDatabase.typeMapping.read( 2704 - DriftSqlType.string, 2705 - data['${effectivePrefix}feed_key'], 2706 - )!, 2707 - postUri: attachedDatabase.typeMapping.read( 2708 - DriftSqlType.string, 2709 - data['${effectivePrefix}post_uri'], 2710 - )!, 2711 - postJson: attachedDatabase.typeMapping.read( 2712 - DriftSqlType.string, 2713 - data['${effectivePrefix}post_json'], 2714 - )!, 2715 - sortOrder: attachedDatabase.typeMapping.read( 2716 - DriftSqlType.int, 2717 - data['${effectivePrefix}sort_order'], 2718 - )!, 2719 - fetchedAt: attachedDatabase.typeMapping.read( 2720 - DriftSqlType.dateTime, 2721 - data['${effectivePrefix}fetched_at'], 2722 - )!, 2287 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 2288 + feedKey: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}feed_key'])!, 2289 + postUri: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}post_uri'])!, 2290 + postJson: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}post_json'])!, 2291 + sortOrder: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}sort_order'])!, 2292 + fetchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}fetched_at'])!, 2723 2293 ); 2724 2294 } 2725 2295 ··· 2767 2337 ); 2768 2338 } 2769 2339 2770 - factory CachedFeedPost.fromJson( 2771 - Map<String, dynamic> json, { 2772 - ValueSerializer? serializer, 2773 - }) { 2340 + factory CachedFeedPost.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 2774 2341 serializer ??= driftRuntimeOptions.defaultSerializer; 2775 2342 return CachedFeedPost( 2776 2343 accountDid: serializer.fromJson<String>(json['accountDid']), ··· 2811 2378 ); 2812 2379 CachedFeedPost copyWithCompanion(CachedFeedPostsCompanion data) { 2813 2380 return CachedFeedPost( 2814 - accountDid: data.accountDid.present 2815 - ? data.accountDid.value 2816 - : this.accountDid, 2381 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 2817 2382 feedKey: data.feedKey.present ? data.feedKey.value : this.feedKey, 2818 2383 postUri: data.postUri.present ? data.postUri.value : this.postUri, 2819 2384 postJson: data.postJson.present ? data.postJson.value : this.postJson, ··· 2836 2401 } 2837 2402 2838 2403 @override 2839 - int get hashCode => 2840 - Object.hash(accountDid, feedKey, postUri, postJson, sortOrder, fetchedAt); 2404 + int get hashCode => Object.hash(accountDid, feedKey, postUri, postJson, sortOrder, fetchedAt); 2841 2405 @override 2842 2406 bool operator ==(Object other) => 2843 2407 identical(this, other) || ··· 2962 2526 } 2963 2527 } 2964 2528 2965 - class $CachedThreadRootsTable extends CachedThreadRoots 2966 - with TableInfo<$CachedThreadRootsTable, CachedThreadRoot> { 2529 + class $CachedThreadRootsTable extends CachedThreadRoots with TableInfo<$CachedThreadRootsTable, CachedThreadRoot> { 2967 2530 @override 2968 2531 final GeneratedDatabase attachedDatabase; 2969 2532 final String? _alias; 2970 2533 $CachedThreadRootsTable(this.attachedDatabase, [this._alias]); 2971 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 2972 - 'accountDid', 2973 - ); 2534 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 2974 2535 @override 2975 2536 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 2976 2537 'account_did', ··· 2979 2540 type: DriftSqlType.string, 2980 2541 requiredDuringInsert: true, 2981 2542 ); 2982 - static const VerificationMeta _rootUriMeta = const VerificationMeta( 2983 - 'rootUri', 2984 - ); 2543 + static const VerificationMeta _rootUriMeta = const VerificationMeta('rootUri'); 2985 2544 @override 2986 2545 late final GeneratedColumn<String> rootUri = GeneratedColumn<String>( 2987 2546 'root_uri', ··· 2990 2549 type: DriftSqlType.string, 2991 2550 requiredDuringInsert: true, 2992 2551 ); 2993 - static const VerificationMeta _payloadMeta = const VerificationMeta( 2994 - 'payload', 2995 - ); 2552 + static const VerificationMeta _payloadMeta = const VerificationMeta('payload'); 2996 2553 @override 2997 2554 late final GeneratedColumn<String> payload = GeneratedColumn<String>( 2998 2555 'payload', ··· 3001 2558 type: DriftSqlType.string, 3002 2559 requiredDuringInsert: true, 3003 2560 ); 3004 - static const VerificationMeta _fetchedAtMeta = const VerificationMeta( 3005 - 'fetchedAt', 3006 - ); 2561 + static const VerificationMeta _fetchedAtMeta = const VerificationMeta('fetchedAt'); 3007 2562 @override 3008 2563 late final GeneratedColumn<DateTime> fetchedAt = GeneratedColumn<DateTime>( 3009 2564 'fetched_at', ··· 3014 2569 defaultValue: currentDateAndTime, 3015 2570 ); 3016 2571 @override 3017 - List<GeneratedColumn> get $columns => [ 3018 - accountDid, 3019 - rootUri, 3020 - payload, 3021 - fetchedAt, 3022 - ]; 2572 + List<GeneratedColumn> get $columns => [accountDid, rootUri, payload, fetchedAt]; 3023 2573 @override 3024 2574 String get aliasedName => _alias ?? actualTableName; 3025 2575 @override 3026 2576 String get actualTableName => $name; 3027 2577 static const String $name = 'cached_thread_roots'; 3028 2578 @override 3029 - VerificationContext validateIntegrity( 3030 - Insertable<CachedThreadRoot> instance, { 3031 - bool isInserting = false, 3032 - }) { 2579 + VerificationContext validateIntegrity(Insertable<CachedThreadRoot> instance, {bool isInserting = false}) { 3033 2580 final context = VerificationContext(); 3034 2581 final data = instance.toColumns(true); 3035 2582 if (data.containsKey('account_did')) { 3036 - context.handle( 3037 - _accountDidMeta, 3038 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 3039 - ); 2583 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 3040 2584 } else if (isInserting) { 3041 2585 context.missing(_accountDidMeta); 3042 2586 } 3043 2587 if (data.containsKey('root_uri')) { 3044 - context.handle( 3045 - _rootUriMeta, 3046 - rootUri.isAcceptableOrUnknown(data['root_uri']!, _rootUriMeta), 3047 - ); 2588 + context.handle(_rootUriMeta, rootUri.isAcceptableOrUnknown(data['root_uri']!, _rootUriMeta)); 3048 2589 } else if (isInserting) { 3049 2590 context.missing(_rootUriMeta); 3050 2591 } 3051 2592 if (data.containsKey('payload')) { 3052 - context.handle( 3053 - _payloadMeta, 3054 - payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta), 3055 - ); 2593 + context.handle(_payloadMeta, payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta)); 3056 2594 } else if (isInserting) { 3057 2595 context.missing(_payloadMeta); 3058 2596 } 3059 2597 if (data.containsKey('fetched_at')) { 3060 - context.handle( 3061 - _fetchedAtMeta, 3062 - fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta), 3063 - ); 2598 + context.handle(_fetchedAtMeta, fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta)); 3064 2599 } 3065 2600 return context; 3066 2601 } ··· 3071 2606 CachedThreadRoot map(Map<String, dynamic> data, {String? tablePrefix}) { 3072 2607 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 3073 2608 return CachedThreadRoot( 3074 - accountDid: attachedDatabase.typeMapping.read( 3075 - DriftSqlType.string, 3076 - data['${effectivePrefix}account_did'], 3077 - )!, 3078 - rootUri: attachedDatabase.typeMapping.read( 3079 - DriftSqlType.string, 3080 - data['${effectivePrefix}root_uri'], 3081 - )!, 3082 - payload: attachedDatabase.typeMapping.read( 3083 - DriftSqlType.string, 3084 - data['${effectivePrefix}payload'], 3085 - )!, 3086 - fetchedAt: attachedDatabase.typeMapping.read( 3087 - DriftSqlType.dateTime, 3088 - data['${effectivePrefix}fetched_at'], 3089 - )!, 2609 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 2610 + rootUri: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}root_uri'])!, 2611 + payload: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}payload'])!, 2612 + fetchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}fetched_at'])!, 3090 2613 ); 3091 2614 } 3092 2615 ··· 3096 2619 } 3097 2620 } 3098 2621 3099 - class CachedThreadRoot extends DataClass 3100 - implements Insertable<CachedThreadRoot> { 2622 + class CachedThreadRoot extends DataClass implements Insertable<CachedThreadRoot> { 3101 2623 final String accountDid; 3102 2624 final String rootUri; 3103 2625 final String payload; ··· 3127 2649 ); 3128 2650 } 3129 2651 3130 - factory CachedThreadRoot.fromJson( 3131 - Map<String, dynamic> json, { 3132 - ValueSerializer? serializer, 3133 - }) { 2652 + factory CachedThreadRoot.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 3134 2653 serializer ??= driftRuntimeOptions.defaultSerializer; 3135 2654 return CachedThreadRoot( 3136 2655 accountDid: serializer.fromJson<String>(json['accountDid']), ··· 3150 2669 }; 3151 2670 } 3152 2671 3153 - CachedThreadRoot copyWith({ 3154 - String? accountDid, 3155 - String? rootUri, 3156 - String? payload, 3157 - DateTime? fetchedAt, 3158 - }) => CachedThreadRoot( 3159 - accountDid: accountDid ?? this.accountDid, 3160 - rootUri: rootUri ?? this.rootUri, 3161 - payload: payload ?? this.payload, 3162 - fetchedAt: fetchedAt ?? this.fetchedAt, 3163 - ); 2672 + CachedThreadRoot copyWith({String? accountDid, String? rootUri, String? payload, DateTime? fetchedAt}) => 2673 + CachedThreadRoot( 2674 + accountDid: accountDid ?? this.accountDid, 2675 + rootUri: rootUri ?? this.rootUri, 2676 + payload: payload ?? this.payload, 2677 + fetchedAt: fetchedAt ?? this.fetchedAt, 2678 + ); 3164 2679 CachedThreadRoot copyWithCompanion(CachedThreadRootsCompanion data) { 3165 2680 return CachedThreadRoot( 3166 - accountDid: data.accountDid.present 3167 - ? data.accountDid.value 3168 - : this.accountDid, 2681 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 3169 2682 rootUri: data.rootUri.present ? data.rootUri.value : this.rootUri, 3170 2683 payload: data.payload.present ? data.payload.value : this.payload, 3171 2684 fetchedAt: data.fetchedAt.present ? data.fetchedAt.value : this.fetchedAt, ··· 3283 2796 } 3284 2797 } 3285 2798 3286 - class $SearchHistoryTable extends SearchHistory 3287 - with TableInfo<$SearchHistoryTable, SearchHistoryEntry> { 2799 + class $SearchHistoryTable extends SearchHistory with TableInfo<$SearchHistoryTable, SearchHistoryEntry> { 3288 2800 @override 3289 2801 final GeneratedDatabase attachedDatabase; 3290 2802 final String? _alias; ··· 3298 2810 hasAutoIncrement: true, 3299 2811 type: DriftSqlType.int, 3300 2812 requiredDuringInsert: false, 3301 - defaultConstraints: GeneratedColumn.constraintIsAlways( 3302 - 'PRIMARY KEY AUTOINCREMENT', 3303 - ), 2813 + defaultConstraints: GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'), 3304 2814 ); 3305 2815 static const VerificationMeta _queryMeta = const VerificationMeta('query'); 3306 2816 @override ··· 3320 2830 type: DriftSqlType.string, 3321 2831 requiredDuringInsert: true, 3322 2832 ); 3323 - static const VerificationMeta _searchedAtMeta = const VerificationMeta( 3324 - 'searchedAt', 3325 - ); 2833 + static const VerificationMeta _searchedAtMeta = const VerificationMeta('searchedAt'); 3326 2834 @override 3327 2835 late final GeneratedColumn<DateTime> searchedAt = GeneratedColumn<DateTime>( 3328 2836 'searched_at', ··· 3332 2840 requiredDuringInsert: false, 3333 2841 defaultValue: currentDateAndTime, 3334 2842 ); 3335 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 3336 - 'accountDid', 3337 - ); 2843 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 3338 2844 @override 3339 2845 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 3340 2846 'account_did', ··· 3344 2850 requiredDuringInsert: true, 3345 2851 ); 3346 2852 @override 3347 - List<GeneratedColumn> get $columns => [ 3348 - id, 3349 - query, 3350 - type, 3351 - searchedAt, 3352 - accountDid, 3353 - ]; 2853 + List<GeneratedColumn> get $columns => [id, query, type, searchedAt, accountDid]; 3354 2854 @override 3355 2855 String get aliasedName => _alias ?? actualTableName; 3356 2856 @override 3357 2857 String get actualTableName => $name; 3358 2858 static const String $name = 'search_history'; 3359 2859 @override 3360 - VerificationContext validateIntegrity( 3361 - Insertable<SearchHistoryEntry> instance, { 3362 - bool isInserting = false, 3363 - }) { 2860 + VerificationContext validateIntegrity(Insertable<SearchHistoryEntry> instance, {bool isInserting = false}) { 3364 2861 final context = VerificationContext(); 3365 2862 final data = instance.toColumns(true); 3366 2863 if (data.containsKey('id')) { 3367 2864 context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); 3368 2865 } 3369 2866 if (data.containsKey('query')) { 3370 - context.handle( 3371 - _queryMeta, 3372 - query.isAcceptableOrUnknown(data['query']!, _queryMeta), 3373 - ); 2867 + context.handle(_queryMeta, query.isAcceptableOrUnknown(data['query']!, _queryMeta)); 3374 2868 } else if (isInserting) { 3375 2869 context.missing(_queryMeta); 3376 2870 } 3377 2871 if (data.containsKey('type')) { 3378 - context.handle( 3379 - _typeMeta, 3380 - type.isAcceptableOrUnknown(data['type']!, _typeMeta), 3381 - ); 2872 + context.handle(_typeMeta, type.isAcceptableOrUnknown(data['type']!, _typeMeta)); 3382 2873 } else if (isInserting) { 3383 2874 context.missing(_typeMeta); 3384 2875 } 3385 2876 if (data.containsKey('searched_at')) { 3386 - context.handle( 3387 - _searchedAtMeta, 3388 - searchedAt.isAcceptableOrUnknown(data['searched_at']!, _searchedAtMeta), 3389 - ); 2877 + context.handle(_searchedAtMeta, searchedAt.isAcceptableOrUnknown(data['searched_at']!, _searchedAtMeta)); 3390 2878 } 3391 2879 if (data.containsKey('account_did')) { 3392 - context.handle( 3393 - _accountDidMeta, 3394 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 3395 - ); 2880 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 3396 2881 } else if (isInserting) { 3397 2882 context.missing(_accountDidMeta); 3398 2883 } ··· 3405 2890 SearchHistoryEntry map(Map<String, dynamic> data, {String? tablePrefix}) { 3406 2891 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 3407 2892 return SearchHistoryEntry( 3408 - id: attachedDatabase.typeMapping.read( 3409 - DriftSqlType.int, 3410 - data['${effectivePrefix}id'], 3411 - )!, 3412 - query: attachedDatabase.typeMapping.read( 3413 - DriftSqlType.string, 3414 - data['${effectivePrefix}query'], 3415 - )!, 3416 - type: attachedDatabase.typeMapping.read( 3417 - DriftSqlType.string, 3418 - data['${effectivePrefix}type'], 3419 - )!, 3420 - searchedAt: attachedDatabase.typeMapping.read( 3421 - DriftSqlType.dateTime, 3422 - data['${effectivePrefix}searched_at'], 3423 - )!, 3424 - accountDid: attachedDatabase.typeMapping.read( 3425 - DriftSqlType.string, 3426 - data['${effectivePrefix}account_did'], 3427 - )!, 2893 + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, 2894 + query: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}query'])!, 2895 + type: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}type'])!, 2896 + searchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}searched_at'])!, 2897 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 3428 2898 ); 3429 2899 } 3430 2900 ··· 3434 2904 } 3435 2905 } 3436 2906 3437 - class SearchHistoryEntry extends DataClass 3438 - implements Insertable<SearchHistoryEntry> { 2907 + class SearchHistoryEntry extends DataClass implements Insertable<SearchHistoryEntry> { 3439 2908 final int id; 3440 2909 final String query; 3441 2910 final String type; ··· 3469 2938 ); 3470 2939 } 3471 2940 3472 - factory SearchHistoryEntry.fromJson( 3473 - Map<String, dynamic> json, { 3474 - ValueSerializer? serializer, 3475 - }) { 2941 + factory SearchHistoryEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 3476 2942 serializer ??= driftRuntimeOptions.defaultSerializer; 3477 2943 return SearchHistoryEntry( 3478 2944 id: serializer.fromJson<int>(json['id']), ··· 3494 2960 }; 3495 2961 } 3496 2962 3497 - SearchHistoryEntry copyWith({ 3498 - int? id, 3499 - String? query, 3500 - String? type, 3501 - DateTime? searchedAt, 3502 - String? accountDid, 3503 - }) => SearchHistoryEntry( 3504 - id: id ?? this.id, 3505 - query: query ?? this.query, 3506 - type: type ?? this.type, 3507 - searchedAt: searchedAt ?? this.searchedAt, 3508 - accountDid: accountDid ?? this.accountDid, 3509 - ); 2963 + SearchHistoryEntry copyWith({int? id, String? query, String? type, DateTime? searchedAt, String? accountDid}) => 2964 + SearchHistoryEntry( 2965 + id: id ?? this.id, 2966 + query: query ?? this.query, 2967 + type: type ?? this.type, 2968 + searchedAt: searchedAt ?? this.searchedAt, 2969 + accountDid: accountDid ?? this.accountDid, 2970 + ); 3510 2971 SearchHistoryEntry copyWithCompanion(SearchHistoryCompanion data) { 3511 2972 return SearchHistoryEntry( 3512 2973 id: data.id.present ? data.id.value : this.id, 3513 2974 query: data.query.present ? data.query.value : this.query, 3514 2975 type: data.type.present ? data.type.value : this.type, 3515 - searchedAt: data.searchedAt.present 3516 - ? data.searchedAt.value 3517 - : this.searchedAt, 3518 - accountDid: data.accountDid.present 3519 - ? data.accountDid.value 3520 - : this.accountDid, 2976 + searchedAt: data.searchedAt.present ? data.searchedAt.value : this.searchedAt, 2977 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 3521 2978 ); 3522 2979 } 3523 2980 ··· 3648 3105 hasAutoIncrement: true, 3649 3106 type: DriftSqlType.int, 3650 3107 requiredDuringInsert: false, 3651 - defaultConstraints: GeneratedColumn.constraintIsAlways( 3652 - 'PRIMARY KEY AUTOINCREMENT', 3653 - ), 3654 - ); 3655 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 3656 - 'accountDid', 3108 + defaultConstraints: GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'), 3657 3109 ); 3110 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 3658 3111 @override 3659 3112 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 3660 3113 'account_did', ··· 3663 3116 type: DriftSqlType.string, 3664 3117 requiredDuringInsert: true, 3665 3118 ); 3666 - static const VerificationMeta _contentMeta = const VerificationMeta( 3667 - 'content', 3668 - ); 3119 + static const VerificationMeta _contentMeta = const VerificationMeta('content'); 3669 3120 @override 3670 3121 late final GeneratedColumn<String> content = GeneratedColumn<String>( 3671 3122 'content', ··· 3674 3125 type: DriftSqlType.string, 3675 3126 requiredDuringInsert: true, 3676 3127 ); 3677 - static const VerificationMeta _replyUriMeta = const VerificationMeta( 3678 - 'replyUri', 3679 - ); 3128 + static const VerificationMeta _replyUriMeta = const VerificationMeta('replyUri'); 3680 3129 @override 3681 3130 late final GeneratedColumn<String> replyUri = GeneratedColumn<String>( 3682 3131 'reply_uri', ··· 3685 3134 type: DriftSqlType.string, 3686 3135 requiredDuringInsert: false, 3687 3136 ); 3688 - static const VerificationMeta _replyCidMeta = const VerificationMeta( 3689 - 'replyCid', 3690 - ); 3137 + static const VerificationMeta _replyCidMeta = const VerificationMeta('replyCid'); 3691 3138 @override 3692 3139 late final GeneratedColumn<String> replyCid = GeneratedColumn<String>( 3693 3140 'reply_cid', ··· 3696 3143 type: DriftSqlType.string, 3697 3144 requiredDuringInsert: false, 3698 3145 ); 3699 - static const VerificationMeta _rootUriMeta = const VerificationMeta( 3700 - 'rootUri', 3701 - ); 3146 + static const VerificationMeta _rootUriMeta = const VerificationMeta('rootUri'); 3702 3147 @override 3703 3148 late final GeneratedColumn<String> rootUri = GeneratedColumn<String>( 3704 3149 'root_uri', ··· 3707 3152 type: DriftSqlType.string, 3708 3153 requiredDuringInsert: false, 3709 3154 ); 3710 - static const VerificationMeta _rootCidMeta = const VerificationMeta( 3711 - 'rootCid', 3712 - ); 3155 + static const VerificationMeta _rootCidMeta = const VerificationMeta('rootCid'); 3713 3156 @override 3714 3157 late final GeneratedColumn<String> rootCid = GeneratedColumn<String>( 3715 3158 'root_cid', ··· 3718 3161 type: DriftSqlType.string, 3719 3162 requiredDuringInsert: false, 3720 3163 ); 3721 - static const VerificationMeta _embedJsonMeta = const VerificationMeta( 3722 - 'embedJson', 3723 - ); 3164 + static const VerificationMeta _embedJsonMeta = const VerificationMeta('embedJson'); 3724 3165 @override 3725 3166 late final GeneratedColumn<String> embedJson = GeneratedColumn<String>( 3726 3167 'embed_json', ··· 3729 3170 type: DriftSqlType.string, 3730 3171 requiredDuringInsert: false, 3731 3172 ); 3732 - static const VerificationMeta _mediaPathsMeta = const VerificationMeta( 3733 - 'mediaPaths', 3734 - ); 3173 + static const VerificationMeta _mediaPathsMeta = const VerificationMeta('mediaPaths'); 3735 3174 @override 3736 3175 late final GeneratedColumn<String> mediaPaths = GeneratedColumn<String>( 3737 3176 'media_paths', ··· 3740 3179 type: DriftSqlType.string, 3741 3180 requiredDuringInsert: false, 3742 3181 ); 3743 - static const VerificationMeta _createdAtMeta = const VerificationMeta( 3744 - 'createdAt', 3745 - ); 3182 + static const VerificationMeta _createdAtMeta = const VerificationMeta('createdAt'); 3746 3183 @override 3747 3184 late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>( 3748 3185 'created_at', ··· 3752 3189 requiredDuringInsert: false, 3753 3190 defaultValue: currentDateAndTime, 3754 3191 ); 3755 - static const VerificationMeta _updatedAtMeta = const VerificationMeta( 3756 - 'updatedAt', 3757 - ); 3192 + static const VerificationMeta _updatedAtMeta = const VerificationMeta('updatedAt'); 3758 3193 @override 3759 3194 late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>( 3760 3195 'updated_at', ··· 3764 3199 requiredDuringInsert: false, 3765 3200 defaultValue: currentDateAndTime, 3766 3201 ); 3767 - static const VerificationMeta _scheduledAtMeta = const VerificationMeta( 3768 - 'scheduledAt', 3769 - ); 3202 + static const VerificationMeta _scheduledAtMeta = const VerificationMeta('scheduledAt'); 3770 3203 @override 3771 3204 late final GeneratedColumn<DateTime> scheduledAt = GeneratedColumn<DateTime>( 3772 3205 'scheduled_at', ··· 3796 3229 String get actualTableName => $name; 3797 3230 static const String $name = 'drafts'; 3798 3231 @override 3799 - VerificationContext validateIntegrity( 3800 - Insertable<DraftEntry> instance, { 3801 - bool isInserting = false, 3802 - }) { 3232 + VerificationContext validateIntegrity(Insertable<DraftEntry> instance, {bool isInserting = false}) { 3803 3233 final context = VerificationContext(); 3804 3234 final data = instance.toColumns(true); 3805 3235 if (data.containsKey('id')) { 3806 3236 context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); 3807 3237 } 3808 3238 if (data.containsKey('account_did')) { 3809 - context.handle( 3810 - _accountDidMeta, 3811 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 3812 - ); 3239 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 3813 3240 } else if (isInserting) { 3814 3241 context.missing(_accountDidMeta); 3815 3242 } 3816 3243 if (data.containsKey('content')) { 3817 - context.handle( 3818 - _contentMeta, 3819 - content.isAcceptableOrUnknown(data['content']!, _contentMeta), 3820 - ); 3244 + context.handle(_contentMeta, content.isAcceptableOrUnknown(data['content']!, _contentMeta)); 3821 3245 } else if (isInserting) { 3822 3246 context.missing(_contentMeta); 3823 3247 } 3824 3248 if (data.containsKey('reply_uri')) { 3825 - context.handle( 3826 - _replyUriMeta, 3827 - replyUri.isAcceptableOrUnknown(data['reply_uri']!, _replyUriMeta), 3828 - ); 3249 + context.handle(_replyUriMeta, replyUri.isAcceptableOrUnknown(data['reply_uri']!, _replyUriMeta)); 3829 3250 } 3830 3251 if (data.containsKey('reply_cid')) { 3831 - context.handle( 3832 - _replyCidMeta, 3833 - replyCid.isAcceptableOrUnknown(data['reply_cid']!, _replyCidMeta), 3834 - ); 3252 + context.handle(_replyCidMeta, replyCid.isAcceptableOrUnknown(data['reply_cid']!, _replyCidMeta)); 3835 3253 } 3836 3254 if (data.containsKey('root_uri')) { 3837 - context.handle( 3838 - _rootUriMeta, 3839 - rootUri.isAcceptableOrUnknown(data['root_uri']!, _rootUriMeta), 3840 - ); 3255 + context.handle(_rootUriMeta, rootUri.isAcceptableOrUnknown(data['root_uri']!, _rootUriMeta)); 3841 3256 } 3842 3257 if (data.containsKey('root_cid')) { 3843 - context.handle( 3844 - _rootCidMeta, 3845 - rootCid.isAcceptableOrUnknown(data['root_cid']!, _rootCidMeta), 3846 - ); 3258 + context.handle(_rootCidMeta, rootCid.isAcceptableOrUnknown(data['root_cid']!, _rootCidMeta)); 3847 3259 } 3848 3260 if (data.containsKey('embed_json')) { 3849 - context.handle( 3850 - _embedJsonMeta, 3851 - embedJson.isAcceptableOrUnknown(data['embed_json']!, _embedJsonMeta), 3852 - ); 3261 + context.handle(_embedJsonMeta, embedJson.isAcceptableOrUnknown(data['embed_json']!, _embedJsonMeta)); 3853 3262 } 3854 3263 if (data.containsKey('media_paths')) { 3855 - context.handle( 3856 - _mediaPathsMeta, 3857 - mediaPaths.isAcceptableOrUnknown(data['media_paths']!, _mediaPathsMeta), 3858 - ); 3264 + context.handle(_mediaPathsMeta, mediaPaths.isAcceptableOrUnknown(data['media_paths']!, _mediaPathsMeta)); 3859 3265 } 3860 3266 if (data.containsKey('created_at')) { 3861 - context.handle( 3862 - _createdAtMeta, 3863 - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), 3864 - ); 3267 + context.handle(_createdAtMeta, createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); 3865 3268 } 3866 3269 if (data.containsKey('updated_at')) { 3867 - context.handle( 3868 - _updatedAtMeta, 3869 - updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta), 3870 - ); 3270 + context.handle(_updatedAtMeta, updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta)); 3871 3271 } 3872 3272 if (data.containsKey('scheduled_at')) { 3873 - context.handle( 3874 - _scheduledAtMeta, 3875 - scheduledAt.isAcceptableOrUnknown( 3876 - data['scheduled_at']!, 3877 - _scheduledAtMeta, 3878 - ), 3879 - ); 3273 + context.handle(_scheduledAtMeta, scheduledAt.isAcceptableOrUnknown(data['scheduled_at']!, _scheduledAtMeta)); 3880 3274 } 3881 3275 return context; 3882 3276 } ··· 3887 3281 DraftEntry map(Map<String, dynamic> data, {String? tablePrefix}) { 3888 3282 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 3889 3283 return DraftEntry( 3890 - id: attachedDatabase.typeMapping.read( 3891 - DriftSqlType.int, 3892 - data['${effectivePrefix}id'], 3893 - )!, 3894 - accountDid: attachedDatabase.typeMapping.read( 3895 - DriftSqlType.string, 3896 - data['${effectivePrefix}account_did'], 3897 - )!, 3898 - content: attachedDatabase.typeMapping.read( 3899 - DriftSqlType.string, 3900 - data['${effectivePrefix}content'], 3901 - )!, 3902 - replyUri: attachedDatabase.typeMapping.read( 3903 - DriftSqlType.string, 3904 - data['${effectivePrefix}reply_uri'], 3905 - ), 3906 - replyCid: attachedDatabase.typeMapping.read( 3907 - DriftSqlType.string, 3908 - data['${effectivePrefix}reply_cid'], 3909 - ), 3910 - rootUri: attachedDatabase.typeMapping.read( 3911 - DriftSqlType.string, 3912 - data['${effectivePrefix}root_uri'], 3913 - ), 3914 - rootCid: attachedDatabase.typeMapping.read( 3915 - DriftSqlType.string, 3916 - data['${effectivePrefix}root_cid'], 3917 - ), 3918 - embedJson: attachedDatabase.typeMapping.read( 3919 - DriftSqlType.string, 3920 - data['${effectivePrefix}embed_json'], 3921 - ), 3922 - mediaPaths: attachedDatabase.typeMapping.read( 3923 - DriftSqlType.string, 3924 - data['${effectivePrefix}media_paths'], 3925 - ), 3926 - createdAt: attachedDatabase.typeMapping.read( 3927 - DriftSqlType.dateTime, 3928 - data['${effectivePrefix}created_at'], 3929 - )!, 3930 - updatedAt: attachedDatabase.typeMapping.read( 3931 - DriftSqlType.dateTime, 3932 - data['${effectivePrefix}updated_at'], 3933 - )!, 3934 - scheduledAt: attachedDatabase.typeMapping.read( 3935 - DriftSqlType.dateTime, 3936 - data['${effectivePrefix}scheduled_at'], 3937 - ), 3284 + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, 3285 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 3286 + content: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}content'])!, 3287 + replyUri: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}reply_uri']), 3288 + replyCid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}reply_cid']), 3289 + rootUri: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}root_uri']), 3290 + rootCid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}root_cid']), 3291 + embedJson: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}embed_json']), 3292 + mediaPaths: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}media_paths']), 3293 + createdAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, 3294 + updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, 3295 + scheduledAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}scheduled_at']), 3938 3296 ); 3939 3297 } 3940 3298 ··· 4008 3366 id: Value(id), 4009 3367 accountDid: Value(accountDid), 4010 3368 content: Value(content), 4011 - replyUri: replyUri == null && nullToAbsent 4012 - ? const Value.absent() 4013 - : Value(replyUri), 4014 - replyCid: replyCid == null && nullToAbsent 4015 - ? const Value.absent() 4016 - : Value(replyCid), 4017 - rootUri: rootUri == null && nullToAbsent 4018 - ? const Value.absent() 4019 - : Value(rootUri), 4020 - rootCid: rootCid == null && nullToAbsent 4021 - ? const Value.absent() 4022 - : Value(rootCid), 4023 - embedJson: embedJson == null && nullToAbsent 4024 - ? const Value.absent() 4025 - : Value(embedJson), 4026 - mediaPaths: mediaPaths == null && nullToAbsent 4027 - ? const Value.absent() 4028 - : Value(mediaPaths), 3369 + replyUri: replyUri == null && nullToAbsent ? const Value.absent() : Value(replyUri), 3370 + replyCid: replyCid == null && nullToAbsent ? const Value.absent() : Value(replyCid), 3371 + rootUri: rootUri == null && nullToAbsent ? const Value.absent() : Value(rootUri), 3372 + rootCid: rootCid == null && nullToAbsent ? const Value.absent() : Value(rootCid), 3373 + embedJson: embedJson == null && nullToAbsent ? const Value.absent() : Value(embedJson), 3374 + mediaPaths: mediaPaths == null && nullToAbsent ? const Value.absent() : Value(mediaPaths), 4029 3375 createdAt: Value(createdAt), 4030 3376 updatedAt: Value(updatedAt), 4031 - scheduledAt: scheduledAt == null && nullToAbsent 4032 - ? const Value.absent() 4033 - : Value(scheduledAt), 3377 + scheduledAt: scheduledAt == null && nullToAbsent ? const Value.absent() : Value(scheduledAt), 4034 3378 ); 4035 3379 } 4036 3380 4037 - factory DraftEntry.fromJson( 4038 - Map<String, dynamic> json, { 4039 - ValueSerializer? serializer, 4040 - }) { 3381 + factory DraftEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 4041 3382 serializer ??= driftRuntimeOptions.defaultSerializer; 4042 3383 return DraftEntry( 4043 3384 id: serializer.fromJson<int>(json['id']), ··· 4103 3444 DraftEntry copyWithCompanion(DraftsCompanion data) { 4104 3445 return DraftEntry( 4105 3446 id: data.id.present ? data.id.value : this.id, 4106 - accountDid: data.accountDid.present 4107 - ? data.accountDid.value 4108 - : this.accountDid, 3447 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 4109 3448 content: data.content.present ? data.content.value : this.content, 4110 3449 replyUri: data.replyUri.present ? data.replyUri.value : this.replyUri, 4111 3450 replyCid: data.replyCid.present ? data.replyCid.value : this.replyCid, 4112 3451 rootUri: data.rootUri.present ? data.rootUri.value : this.rootUri, 4113 3452 rootCid: data.rootCid.present ? data.rootCid.value : this.rootCid, 4114 3453 embedJson: data.embedJson.present ? data.embedJson.value : this.embedJson, 4115 - mediaPaths: data.mediaPaths.present 4116 - ? data.mediaPaths.value 4117 - : this.mediaPaths, 3454 + mediaPaths: data.mediaPaths.present ? data.mediaPaths.value : this.mediaPaths, 4118 3455 createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, 4119 3456 updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt, 4120 - scheduledAt: data.scheduledAt.present 4121 - ? data.scheduledAt.value 4122 - : this.scheduledAt, 3457 + scheduledAt: data.scheduledAt.present ? data.scheduledAt.value : this.scheduledAt, 4123 3458 ); 4124 3459 } 4125 3460 ··· 4339 3674 } 4340 3675 } 4341 3676 4342 - class $SavedPostsTable extends SavedPosts 4343 - with TableInfo<$SavedPostsTable, SavedPostEntry> { 3677 + class $SavedPostsTable extends SavedPosts with TableInfo<$SavedPostsTable, SavedPostEntry> { 4344 3678 @override 4345 3679 final GeneratedDatabase attachedDatabase; 4346 3680 final String? _alias; ··· 4354 3688 hasAutoIncrement: true, 4355 3689 type: DriftSqlType.int, 4356 3690 requiredDuringInsert: false, 4357 - defaultConstraints: GeneratedColumn.constraintIsAlways( 4358 - 'PRIMARY KEY AUTOINCREMENT', 4359 - ), 4360 - ); 4361 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 4362 - 'accountDid', 3691 + defaultConstraints: GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'), 4363 3692 ); 3693 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 4364 3694 @override 4365 3695 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 4366 3696 'account_did', ··· 4369 3699 type: DriftSqlType.string, 4370 3700 requiredDuringInsert: true, 4371 3701 ); 4372 - static const VerificationMeta _postUriMeta = const VerificationMeta( 4373 - 'postUri', 4374 - ); 3702 + static const VerificationMeta _postUriMeta = const VerificationMeta('postUri'); 4375 3703 @override 4376 3704 late final GeneratedColumn<String> postUri = GeneratedColumn<String>( 4377 3705 'post_uri', ··· 4380 3708 type: DriftSqlType.string, 4381 3709 requiredDuringInsert: true, 4382 3710 ); 4383 - static const VerificationMeta _postJsonMeta = const VerificationMeta( 4384 - 'postJson', 4385 - ); 3711 + static const VerificationMeta _postJsonMeta = const VerificationMeta('postJson'); 4386 3712 @override 4387 3713 late final GeneratedColumn<String> postJson = GeneratedColumn<String>( 4388 3714 'post_json', ··· 4391 3717 type: DriftSqlType.string, 4392 3718 requiredDuringInsert: true, 4393 3719 ); 4394 - static const VerificationMeta _saveTypeMeta = const VerificationMeta( 4395 - 'saveType', 4396 - ); 3720 + static const VerificationMeta _saveTypeMeta = const VerificationMeta('saveType'); 4397 3721 @override 4398 3722 late final GeneratedColumn<String> saveType = GeneratedColumn<String>( 4399 3723 'save_type', ··· 4403 3727 requiredDuringInsert: false, 4404 3728 defaultValue: const Constant('local'), 4405 3729 ); 4406 - static const VerificationMeta _savedAtMeta = const VerificationMeta( 4407 - 'savedAt', 4408 - ); 3730 + static const VerificationMeta _savedAtMeta = const VerificationMeta('savedAt'); 4409 3731 @override 4410 3732 late final GeneratedColumn<DateTime> savedAt = GeneratedColumn<DateTime>( 4411 3733 'saved_at', ··· 4416 3738 defaultValue: currentDateAndTime, 4417 3739 ); 4418 3740 @override 4419 - List<GeneratedColumn> get $columns => [ 4420 - id, 4421 - accountDid, 4422 - postUri, 4423 - postJson, 4424 - saveType, 4425 - savedAt, 4426 - ]; 3741 + List<GeneratedColumn> get $columns => [id, accountDid, postUri, postJson, saveType, savedAt]; 4427 3742 @override 4428 3743 String get aliasedName => _alias ?? actualTableName; 4429 3744 @override 4430 3745 String get actualTableName => $name; 4431 3746 static const String $name = 'saved_posts'; 4432 3747 @override 4433 - VerificationContext validateIntegrity( 4434 - Insertable<SavedPostEntry> instance, { 4435 - bool isInserting = false, 4436 - }) { 3748 + VerificationContext validateIntegrity(Insertable<SavedPostEntry> instance, {bool isInserting = false}) { 4437 3749 final context = VerificationContext(); 4438 3750 final data = instance.toColumns(true); 4439 3751 if (data.containsKey('id')) { 4440 3752 context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); 4441 3753 } 4442 3754 if (data.containsKey('account_did')) { 4443 - context.handle( 4444 - _accountDidMeta, 4445 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 4446 - ); 3755 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 4447 3756 } else if (isInserting) { 4448 3757 context.missing(_accountDidMeta); 4449 3758 } 4450 3759 if (data.containsKey('post_uri')) { 4451 - context.handle( 4452 - _postUriMeta, 4453 - postUri.isAcceptableOrUnknown(data['post_uri']!, _postUriMeta), 4454 - ); 3760 + context.handle(_postUriMeta, postUri.isAcceptableOrUnknown(data['post_uri']!, _postUriMeta)); 4455 3761 } else if (isInserting) { 4456 3762 context.missing(_postUriMeta); 4457 3763 } 4458 3764 if (data.containsKey('post_json')) { 4459 - context.handle( 4460 - _postJsonMeta, 4461 - postJson.isAcceptableOrUnknown(data['post_json']!, _postJsonMeta), 4462 - ); 3765 + context.handle(_postJsonMeta, postJson.isAcceptableOrUnknown(data['post_json']!, _postJsonMeta)); 4463 3766 } else if (isInserting) { 4464 3767 context.missing(_postJsonMeta); 4465 3768 } 4466 3769 if (data.containsKey('save_type')) { 4467 - context.handle( 4468 - _saveTypeMeta, 4469 - saveType.isAcceptableOrUnknown(data['save_type']!, _saveTypeMeta), 4470 - ); 3770 + context.handle(_saveTypeMeta, saveType.isAcceptableOrUnknown(data['save_type']!, _saveTypeMeta)); 4471 3771 } 4472 3772 if (data.containsKey('saved_at')) { 4473 - context.handle( 4474 - _savedAtMeta, 4475 - savedAt.isAcceptableOrUnknown(data['saved_at']!, _savedAtMeta), 4476 - ); 3773 + context.handle(_savedAtMeta, savedAt.isAcceptableOrUnknown(data['saved_at']!, _savedAtMeta)); 4477 3774 } 4478 3775 return context; 4479 3776 } ··· 4484 3781 SavedPostEntry map(Map<String, dynamic> data, {String? tablePrefix}) { 4485 3782 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 4486 3783 return SavedPostEntry( 4487 - id: attachedDatabase.typeMapping.read( 4488 - DriftSqlType.int, 4489 - data['${effectivePrefix}id'], 4490 - )!, 4491 - accountDid: attachedDatabase.typeMapping.read( 4492 - DriftSqlType.string, 4493 - data['${effectivePrefix}account_did'], 4494 - )!, 4495 - postUri: attachedDatabase.typeMapping.read( 4496 - DriftSqlType.string, 4497 - data['${effectivePrefix}post_uri'], 4498 - )!, 4499 - postJson: attachedDatabase.typeMapping.read( 4500 - DriftSqlType.string, 4501 - data['${effectivePrefix}post_json'], 4502 - )!, 4503 - saveType: attachedDatabase.typeMapping.read( 4504 - DriftSqlType.string, 4505 - data['${effectivePrefix}save_type'], 4506 - )!, 4507 - savedAt: attachedDatabase.typeMapping.read( 4508 - DriftSqlType.dateTime, 4509 - data['${effectivePrefix}saved_at'], 4510 - )!, 3784 + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, 3785 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 3786 + postUri: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}post_uri'])!, 3787 + postJson: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}post_json'])!, 3788 + saveType: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}save_type'])!, 3789 + savedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}saved_at'])!, 4511 3790 ); 4512 3791 } 4513 3792 ··· 4555 3834 ); 4556 3835 } 4557 3836 4558 - factory SavedPostEntry.fromJson( 4559 - Map<String, dynamic> json, { 4560 - ValueSerializer? serializer, 4561 - }) { 3837 + factory SavedPostEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 4562 3838 serializer ??= driftRuntimeOptions.defaultSerializer; 4563 3839 return SavedPostEntry( 4564 3840 id: serializer.fromJson<int>(json['id']), ··· 4600 3876 SavedPostEntry copyWithCompanion(SavedPostsCompanion data) { 4601 3877 return SavedPostEntry( 4602 3878 id: data.id.present ? data.id.value : this.id, 4603 - accountDid: data.accountDid.present 4604 - ? data.accountDid.value 4605 - : this.accountDid, 3879 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 4606 3880 postUri: data.postUri.present ? data.postUri.value : this.postUri, 4607 3881 postJson: data.postJson.present ? data.postJson.value : this.postJson, 4608 3882 saveType: data.saveType.present ? data.saveType.value : this.saveType, ··· 4624 3898 } 4625 3899 4626 3900 @override 4627 - int get hashCode => 4628 - Object.hash(id, accountDid, postUri, postJson, saveType, savedAt); 3901 + int get hashCode => Object.hash(id, accountDid, postUri, postJson, saveType, savedAt); 4629 3902 @override 4630 3903 bool operator ==(Object other) => 4631 3904 identical(this, other) || ··· 4737 4010 } 4738 4011 } 4739 4012 4740 - class $LabelerCacheTable extends LabelerCache 4741 - with TableInfo<$LabelerCacheTable, LabelerCacheEntry> { 4013 + class $LabelerCacheTable extends LabelerCache with TableInfo<$LabelerCacheTable, LabelerCacheEntry> { 4742 4014 @override 4743 4015 final GeneratedDatabase attachedDatabase; 4744 4016 final String? _alias; 4745 4017 $LabelerCacheTable(this.attachedDatabase, [this._alias]); 4746 - static const VerificationMeta _labelerDidMeta = const VerificationMeta( 4747 - 'labelerDid', 4748 - ); 4018 + static const VerificationMeta _labelerDidMeta = const VerificationMeta('labelerDid'); 4749 4019 @override 4750 4020 late final GeneratedColumn<String> labelerDid = GeneratedColumn<String>( 4751 4021 'labeler_did', ··· 4754 4024 type: DriftSqlType.string, 4755 4025 requiredDuringInsert: true, 4756 4026 ); 4757 - static const VerificationMeta _policiesJsonMeta = const VerificationMeta( 4758 - 'policiesJson', 4759 - ); 4027 + static const VerificationMeta _policiesJsonMeta = const VerificationMeta('policiesJson'); 4760 4028 @override 4761 4029 late final GeneratedColumn<String> policiesJson = GeneratedColumn<String>( 4762 4030 'policies_json', ··· 4765 4033 type: DriftSqlType.string, 4766 4034 requiredDuringInsert: true, 4767 4035 ); 4768 - static const VerificationMeta _fetchedAtMeta = const VerificationMeta( 4769 - 'fetchedAt', 4770 - ); 4036 + static const VerificationMeta _fetchedAtMeta = const VerificationMeta('fetchedAt'); 4771 4037 @override 4772 4038 late final GeneratedColumn<DateTime> fetchedAt = GeneratedColumn<DateTime>( 4773 4039 'fetched_at', ··· 4785 4051 String get actualTableName => $name; 4786 4052 static const String $name = 'labeler_cache'; 4787 4053 @override 4788 - VerificationContext validateIntegrity( 4789 - Insertable<LabelerCacheEntry> instance, { 4790 - bool isInserting = false, 4791 - }) { 4054 + VerificationContext validateIntegrity(Insertable<LabelerCacheEntry> instance, {bool isInserting = false}) { 4792 4055 final context = VerificationContext(); 4793 4056 final data = instance.toColumns(true); 4794 4057 if (data.containsKey('labeler_did')) { 4795 - context.handle( 4796 - _labelerDidMeta, 4797 - labelerDid.isAcceptableOrUnknown(data['labeler_did']!, _labelerDidMeta), 4798 - ); 4058 + context.handle(_labelerDidMeta, labelerDid.isAcceptableOrUnknown(data['labeler_did']!, _labelerDidMeta)); 4799 4059 } else if (isInserting) { 4800 4060 context.missing(_labelerDidMeta); 4801 4061 } 4802 4062 if (data.containsKey('policies_json')) { 4803 - context.handle( 4804 - _policiesJsonMeta, 4805 - policiesJson.isAcceptableOrUnknown( 4806 - data['policies_json']!, 4807 - _policiesJsonMeta, 4808 - ), 4809 - ); 4063 + context.handle(_policiesJsonMeta, policiesJson.isAcceptableOrUnknown(data['policies_json']!, _policiesJsonMeta)); 4810 4064 } else if (isInserting) { 4811 4065 context.missing(_policiesJsonMeta); 4812 4066 } 4813 4067 if (data.containsKey('fetched_at')) { 4814 - context.handle( 4815 - _fetchedAtMeta, 4816 - fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta), 4817 - ); 4068 + context.handle(_fetchedAtMeta, fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta)); 4818 4069 } 4819 4070 return context; 4820 4071 } ··· 4825 4076 LabelerCacheEntry map(Map<String, dynamic> data, {String? tablePrefix}) { 4826 4077 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 4827 4078 return LabelerCacheEntry( 4828 - labelerDid: attachedDatabase.typeMapping.read( 4829 - DriftSqlType.string, 4830 - data['${effectivePrefix}labeler_did'], 4831 - )!, 4832 - policiesJson: attachedDatabase.typeMapping.read( 4833 - DriftSqlType.string, 4834 - data['${effectivePrefix}policies_json'], 4835 - )!, 4836 - fetchedAt: attachedDatabase.typeMapping.read( 4837 - DriftSqlType.dateTime, 4838 - data['${effectivePrefix}fetched_at'], 4839 - )!, 4079 + labelerDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}labeler_did'])!, 4080 + policiesJson: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}policies_json'])!, 4081 + fetchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}fetched_at'])!, 4840 4082 ); 4841 4083 } 4842 4084 ··· 4846 4088 } 4847 4089 } 4848 4090 4849 - class LabelerCacheEntry extends DataClass 4850 - implements Insertable<LabelerCacheEntry> { 4091 + class LabelerCacheEntry extends DataClass implements Insertable<LabelerCacheEntry> { 4851 4092 final String labelerDid; 4852 4093 final String policiesJson; 4853 4094 final DateTime fetchedAt; 4854 - const LabelerCacheEntry({ 4855 - required this.labelerDid, 4856 - required this.policiesJson, 4857 - required this.fetchedAt, 4858 - }); 4095 + const LabelerCacheEntry({required this.labelerDid, required this.policiesJson, required this.fetchedAt}); 4859 4096 @override 4860 4097 Map<String, Expression> toColumns(bool nullToAbsent) { 4861 4098 final map = <String, Expression>{}; ··· 4873 4110 ); 4874 4111 } 4875 4112 4876 - factory LabelerCacheEntry.fromJson( 4877 - Map<String, dynamic> json, { 4878 - ValueSerializer? serializer, 4879 - }) { 4113 + factory LabelerCacheEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 4880 4114 serializer ??= driftRuntimeOptions.defaultSerializer; 4881 4115 return LabelerCacheEntry( 4882 4116 labelerDid: serializer.fromJson<String>(json['labelerDid']), ··· 4894 4128 }; 4895 4129 } 4896 4130 4897 - LabelerCacheEntry copyWith({ 4898 - String? labelerDid, 4899 - String? policiesJson, 4900 - DateTime? fetchedAt, 4901 - }) => LabelerCacheEntry( 4131 + LabelerCacheEntry copyWith({String? labelerDid, String? policiesJson, DateTime? fetchedAt}) => LabelerCacheEntry( 4902 4132 labelerDid: labelerDid ?? this.labelerDid, 4903 4133 policiesJson: policiesJson ?? this.policiesJson, 4904 4134 fetchedAt: fetchedAt ?? this.fetchedAt, 4905 4135 ); 4906 4136 LabelerCacheEntry copyWithCompanion(LabelerCacheCompanion data) { 4907 4137 return LabelerCacheEntry( 4908 - labelerDid: data.labelerDid.present 4909 - ? data.labelerDid.value 4910 - : this.labelerDid, 4911 - policiesJson: data.policiesJson.present 4912 - ? data.policiesJson.value 4913 - : this.policiesJson, 4138 + labelerDid: data.labelerDid.present ? data.labelerDid.value : this.labelerDid, 4139 + policiesJson: data.policiesJson.present ? data.policiesJson.value : this.policiesJson, 4914 4140 fetchedAt: data.fetchedAt.present ? data.fetchedAt.value : this.fetchedAt, 4915 4141 ); 4916 4142 } ··· 5027 4253 hasAutoIncrement: true, 5028 4254 type: DriftSqlType.int, 5029 4255 requiredDuringInsert: false, 5030 - defaultConstraints: GeneratedColumn.constraintIsAlways( 5031 - 'PRIMARY KEY AUTOINCREMENT', 5032 - ), 4256 + defaultConstraints: GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'), 5033 4257 ); 5034 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 5035 - 'accountDid', 5036 - ); 4258 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 5037 4259 @override 5038 4260 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 5039 4261 'account_did', ··· 5042 4264 type: DriftSqlType.string, 5043 4265 requiredDuringInsert: true, 5044 4266 ); 5045 - static const VerificationMeta _notificationUriMeta = const VerificationMeta( 5046 - 'notificationUri', 5047 - ); 4267 + static const VerificationMeta _notificationUriMeta = const VerificationMeta('notificationUri'); 5048 4268 @override 5049 4269 late final GeneratedColumn<String> notificationUri = GeneratedColumn<String>( 5050 4270 'notification_uri', ··· 5053 4273 type: DriftSqlType.string, 5054 4274 requiredDuringInsert: true, 5055 4275 ); 5056 - static const VerificationMeta _notificationCidMeta = const VerificationMeta( 5057 - 'notificationCid', 5058 - ); 4276 + static const VerificationMeta _notificationCidMeta = const VerificationMeta('notificationCid'); 5059 4277 @override 5060 4278 late final GeneratedColumn<String> notificationCid = GeneratedColumn<String>( 5061 4279 'notification_cid', ··· 5073 4291 type: DriftSqlType.string, 5074 4292 requiredDuringInsert: true, 5075 4293 ); 5076 - static const VerificationMeta _indexedAtMeta = const VerificationMeta( 5077 - 'indexedAt', 5078 - ); 4294 + static const VerificationMeta _indexedAtMeta = const VerificationMeta('indexedAt'); 5079 4295 @override 5080 4296 late final GeneratedColumn<DateTime> indexedAt = GeneratedColumn<DateTime>( 5081 4297 'indexed_at', ··· 5093 4309 type: DriftSqlType.string, 5094 4310 requiredDuringInsert: true, 5095 4311 ); 5096 - static const VerificationMeta _deliveredAtMeta = const VerificationMeta( 5097 - 'deliveredAt', 5098 - ); 4312 + static const VerificationMeta _deliveredAtMeta = const VerificationMeta('deliveredAt'); 5099 4313 @override 5100 4314 late final GeneratedColumn<DateTime> deliveredAt = GeneratedColumn<DateTime>( 5101 4315 'delivered_at', ··· 5105 4319 requiredDuringInsert: false, 5106 4320 defaultValue: currentDateAndTime, 5107 4321 ); 5108 - static const VerificationMeta _openedAtMeta = const VerificationMeta( 5109 - 'openedAt', 5110 - ); 4322 + static const VerificationMeta _openedAtMeta = const VerificationMeta('openedAt'); 5111 4323 @override 5112 4324 late final GeneratedColumn<DateTime> openedAt = GeneratedColumn<DateTime>( 5113 4325 'opened_at', ··· 5116 4328 type: DriftSqlType.dateTime, 5117 4329 requiredDuringInsert: false, 5118 4330 ); 5119 - static const VerificationMeta _dismissedAtMeta = const VerificationMeta( 5120 - 'dismissedAt', 5121 - ); 4331 + static const VerificationMeta _dismissedAtMeta = const VerificationMeta('dismissedAt'); 5122 4332 @override 5123 4333 late final GeneratedColumn<DateTime> dismissedAt = GeneratedColumn<DateTime>( 5124 4334 'dismissed_at', ··· 5146 4356 String get actualTableName => $name; 5147 4357 static const String $name = 'notification_deliveries'; 5148 4358 @override 5149 - VerificationContext validateIntegrity( 5150 - Insertable<NotificationDeliveryEntry> instance, { 5151 - bool isInserting = false, 5152 - }) { 4359 + VerificationContext validateIntegrity(Insertable<NotificationDeliveryEntry> instance, {bool isInserting = false}) { 5153 4360 final context = VerificationContext(); 5154 4361 final data = instance.toColumns(true); 5155 4362 if (data.containsKey('id')) { 5156 4363 context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); 5157 4364 } 5158 4365 if (data.containsKey('account_did')) { 5159 - context.handle( 5160 - _accountDidMeta, 5161 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 5162 - ); 4366 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 5163 4367 } else if (isInserting) { 5164 4368 context.missing(_accountDidMeta); 5165 4369 } 5166 4370 if (data.containsKey('notification_uri')) { 5167 4371 context.handle( 5168 4372 _notificationUriMeta, 5169 - notificationUri.isAcceptableOrUnknown( 5170 - data['notification_uri']!, 5171 - _notificationUriMeta, 5172 - ), 4373 + notificationUri.isAcceptableOrUnknown(data['notification_uri']!, _notificationUriMeta), 5173 4374 ); 5174 4375 } else if (isInserting) { 5175 4376 context.missing(_notificationUriMeta); ··· 5177 4378 if (data.containsKey('notification_cid')) { 5178 4379 context.handle( 5179 4380 _notificationCidMeta, 5180 - notificationCid.isAcceptableOrUnknown( 5181 - data['notification_cid']!, 5182 - _notificationCidMeta, 5183 - ), 4381 + notificationCid.isAcceptableOrUnknown(data['notification_cid']!, _notificationCidMeta), 5184 4382 ); 5185 4383 } 5186 4384 if (data.containsKey('reason')) { 5187 - context.handle( 5188 - _reasonMeta, 5189 - reason.isAcceptableOrUnknown(data['reason']!, _reasonMeta), 5190 - ); 4385 + context.handle(_reasonMeta, reason.isAcceptableOrUnknown(data['reason']!, _reasonMeta)); 5191 4386 } else if (isInserting) { 5192 4387 context.missing(_reasonMeta); 5193 4388 } 5194 4389 if (data.containsKey('indexed_at')) { 5195 - context.handle( 5196 - _indexedAtMeta, 5197 - indexedAt.isAcceptableOrUnknown(data['indexed_at']!, _indexedAtMeta), 5198 - ); 4390 + context.handle(_indexedAtMeta, indexedAt.isAcceptableOrUnknown(data['indexed_at']!, _indexedAtMeta)); 5199 4391 } else if (isInserting) { 5200 4392 context.missing(_indexedAtMeta); 5201 4393 } 5202 4394 if (data.containsKey('source')) { 5203 - context.handle( 5204 - _sourceMeta, 5205 - source.isAcceptableOrUnknown(data['source']!, _sourceMeta), 5206 - ); 4395 + context.handle(_sourceMeta, source.isAcceptableOrUnknown(data['source']!, _sourceMeta)); 5207 4396 } else if (isInserting) { 5208 4397 context.missing(_sourceMeta); 5209 4398 } 5210 4399 if (data.containsKey('delivered_at')) { 5211 - context.handle( 5212 - _deliveredAtMeta, 5213 - deliveredAt.isAcceptableOrUnknown( 5214 - data['delivered_at']!, 5215 - _deliveredAtMeta, 5216 - ), 5217 - ); 4400 + context.handle(_deliveredAtMeta, deliveredAt.isAcceptableOrUnknown(data['delivered_at']!, _deliveredAtMeta)); 5218 4401 } 5219 4402 if (data.containsKey('opened_at')) { 5220 - context.handle( 5221 - _openedAtMeta, 5222 - openedAt.isAcceptableOrUnknown(data['opened_at']!, _openedAtMeta), 5223 - ); 4403 + context.handle(_openedAtMeta, openedAt.isAcceptableOrUnknown(data['opened_at']!, _openedAtMeta)); 5224 4404 } 5225 4405 if (data.containsKey('dismissed_at')) { 5226 - context.handle( 5227 - _dismissedAtMeta, 5228 - dismissedAt.isAcceptableOrUnknown( 5229 - data['dismissed_at']!, 5230 - _dismissedAtMeta, 5231 - ), 5232 - ); 4406 + context.handle(_dismissedAtMeta, dismissedAt.isAcceptableOrUnknown(data['dismissed_at']!, _dismissedAtMeta)); 5233 4407 } 5234 4408 return context; 5235 4409 } ··· 5237 4411 @override 5238 4412 Set<GeneratedColumn> get $primaryKey => {id}; 5239 4413 @override 5240 - NotificationDeliveryEntry map( 5241 - Map<String, dynamic> data, { 5242 - String? tablePrefix, 5243 - }) { 4414 + NotificationDeliveryEntry map(Map<String, dynamic> data, {String? tablePrefix}) { 5244 4415 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 5245 4416 return NotificationDeliveryEntry( 5246 - id: attachedDatabase.typeMapping.read( 5247 - DriftSqlType.int, 5248 - data['${effectivePrefix}id'], 5249 - )!, 5250 - accountDid: attachedDatabase.typeMapping.read( 5251 - DriftSqlType.string, 5252 - data['${effectivePrefix}account_did'], 5253 - )!, 4417 + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, 4418 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 5254 4419 notificationUri: attachedDatabase.typeMapping.read( 5255 4420 DriftSqlType.string, 5256 4421 data['${effectivePrefix}notification_uri'], ··· 5259 4424 DriftSqlType.string, 5260 4425 data['${effectivePrefix}notification_cid'], 5261 4426 ), 5262 - reason: attachedDatabase.typeMapping.read( 5263 - DriftSqlType.string, 5264 - data['${effectivePrefix}reason'], 5265 - )!, 5266 - indexedAt: attachedDatabase.typeMapping.read( 5267 - DriftSqlType.dateTime, 5268 - data['${effectivePrefix}indexed_at'], 5269 - )!, 5270 - source: attachedDatabase.typeMapping.read( 5271 - DriftSqlType.string, 5272 - data['${effectivePrefix}source'], 5273 - )!, 5274 - deliveredAt: attachedDatabase.typeMapping.read( 5275 - DriftSqlType.dateTime, 5276 - data['${effectivePrefix}delivered_at'], 5277 - )!, 5278 - openedAt: attachedDatabase.typeMapping.read( 5279 - DriftSqlType.dateTime, 5280 - data['${effectivePrefix}opened_at'], 5281 - ), 5282 - dismissedAt: attachedDatabase.typeMapping.read( 5283 - DriftSqlType.dateTime, 5284 - data['${effectivePrefix}dismissed_at'], 5285 - ), 4427 + reason: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}reason'])!, 4428 + indexedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}indexed_at'])!, 4429 + source: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}source'])!, 4430 + deliveredAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}delivered_at'])!, 4431 + openedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}opened_at']), 4432 + dismissedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}dismissed_at']), 5286 4433 ); 5287 4434 } 5288 4435 ··· 5292 4439 } 5293 4440 } 5294 4441 5295 - class NotificationDeliveryEntry extends DataClass 5296 - implements Insertable<NotificationDeliveryEntry> { 4442 + class NotificationDeliveryEntry extends DataClass implements Insertable<NotificationDeliveryEntry> { 5297 4443 final int id; 5298 4444 final String accountDid; 5299 4445 final String notificationUri; ··· 5343 4489 id: Value(id), 5344 4490 accountDid: Value(accountDid), 5345 4491 notificationUri: Value(notificationUri), 5346 - notificationCid: notificationCid == null && nullToAbsent 5347 - ? const Value.absent() 5348 - : Value(notificationCid), 4492 + notificationCid: notificationCid == null && nullToAbsent ? const Value.absent() : Value(notificationCid), 5349 4493 reason: Value(reason), 5350 4494 indexedAt: Value(indexedAt), 5351 4495 source: Value(source), 5352 4496 deliveredAt: Value(deliveredAt), 5353 - openedAt: openedAt == null && nullToAbsent 5354 - ? const Value.absent() 5355 - : Value(openedAt), 5356 - dismissedAt: dismissedAt == null && nullToAbsent 5357 - ? const Value.absent() 5358 - : Value(dismissedAt), 4497 + openedAt: openedAt == null && nullToAbsent ? const Value.absent() : Value(openedAt), 4498 + dismissedAt: dismissedAt == null && nullToAbsent ? const Value.absent() : Value(dismissedAt), 5359 4499 ); 5360 4500 } 5361 4501 5362 - factory NotificationDeliveryEntry.fromJson( 5363 - Map<String, dynamic> json, { 5364 - ValueSerializer? serializer, 5365 - }) { 4502 + factory NotificationDeliveryEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 5366 4503 serializer ??= driftRuntimeOptions.defaultSerializer; 5367 4504 return NotificationDeliveryEntry( 5368 4505 id: serializer.fromJson<int>(json['id']), ··· 5409 4546 id: id ?? this.id, 5410 4547 accountDid: accountDid ?? this.accountDid, 5411 4548 notificationUri: notificationUri ?? this.notificationUri, 5412 - notificationCid: notificationCid.present 5413 - ? notificationCid.value 5414 - : this.notificationCid, 4549 + notificationCid: notificationCid.present ? notificationCid.value : this.notificationCid, 5415 4550 reason: reason ?? this.reason, 5416 4551 indexedAt: indexedAt ?? this.indexedAt, 5417 4552 source: source ?? this.source, ··· 5419 4554 openedAt: openedAt.present ? openedAt.value : this.openedAt, 5420 4555 dismissedAt: dismissedAt.present ? dismissedAt.value : this.dismissedAt, 5421 4556 ); 5422 - NotificationDeliveryEntry copyWithCompanion( 5423 - NotificationDeliveriesCompanion data, 5424 - ) { 4557 + NotificationDeliveryEntry copyWithCompanion(NotificationDeliveriesCompanion data) { 5425 4558 return NotificationDeliveryEntry( 5426 4559 id: data.id.present ? data.id.value : this.id, 5427 - accountDid: data.accountDid.present 5428 - ? data.accountDid.value 5429 - : this.accountDid, 5430 - notificationUri: data.notificationUri.present 5431 - ? data.notificationUri.value 5432 - : this.notificationUri, 5433 - notificationCid: data.notificationCid.present 5434 - ? data.notificationCid.value 5435 - : this.notificationCid, 4560 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 4561 + notificationUri: data.notificationUri.present ? data.notificationUri.value : this.notificationUri, 4562 + notificationCid: data.notificationCid.present ? data.notificationCid.value : this.notificationCid, 5436 4563 reason: data.reason.present ? data.reason.value : this.reason, 5437 4564 indexedAt: data.indexedAt.present ? data.indexedAt.value : this.indexedAt, 5438 4565 source: data.source.present ? data.source.value : this.source, 5439 - deliveredAt: data.deliveredAt.present 5440 - ? data.deliveredAt.value 5441 - : this.deliveredAt, 4566 + deliveredAt: data.deliveredAt.present ? data.deliveredAt.value : this.deliveredAt, 5442 4567 openedAt: data.openedAt.present ? data.openedAt.value : this.openedAt, 5443 - dismissedAt: data.dismissedAt.present 5444 - ? data.dismissedAt.value 5445 - : this.dismissedAt, 4568 + dismissedAt: data.dismissedAt.present ? data.dismissedAt.value : this.dismissedAt, 5446 4569 ); 5447 4570 } 5448 4571 ··· 5492 4615 other.dismissedAt == this.dismissedAt); 5493 4616 } 5494 4617 5495 - class NotificationDeliveriesCompanion 5496 - extends UpdateCompanion<NotificationDeliveryEntry> { 4618 + class NotificationDeliveriesCompanion extends UpdateCompanion<NotificationDeliveryEntry> { 5497 4619 final Value<int> id; 5498 4620 final Value<String> accountDid; 5499 4621 final Value<String> notificationUri; ··· 5638 4760 } 5639 4761 } 5640 4762 5641 - class $LikedPostsTable extends LikedPosts 5642 - with TableInfo<$LikedPostsTable, LikedPostEntry> { 4763 + class $LikedPostsTable extends LikedPosts with TableInfo<$LikedPostsTable, LikedPostEntry> { 5643 4764 @override 5644 4765 final GeneratedDatabase attachedDatabase; 5645 4766 final String? _alias; ··· 5653 4774 hasAutoIncrement: true, 5654 4775 type: DriftSqlType.int, 5655 4776 requiredDuringInsert: false, 5656 - defaultConstraints: GeneratedColumn.constraintIsAlways( 5657 - 'PRIMARY KEY AUTOINCREMENT', 5658 - ), 5659 - ); 5660 - static const VerificationMeta _accountDidMeta = const VerificationMeta( 5661 - 'accountDid', 4777 + defaultConstraints: GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'), 5662 4778 ); 4779 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 5663 4780 @override 5664 4781 late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 5665 4782 'account_did', ··· 5668 4785 type: DriftSqlType.string, 5669 4786 requiredDuringInsert: true, 5670 4787 ); 5671 - static const VerificationMeta _postUriMeta = const VerificationMeta( 5672 - 'postUri', 5673 - ); 4788 + static const VerificationMeta _postUriMeta = const VerificationMeta('postUri'); 5674 4789 @override 5675 4790 late final GeneratedColumn<String> postUri = GeneratedColumn<String>( 5676 4791 'post_uri', ··· 5679 4794 type: DriftSqlType.string, 5680 4795 requiredDuringInsert: true, 5681 4796 ); 5682 - static const VerificationMeta _postJsonMeta = const VerificationMeta( 5683 - 'postJson', 5684 - ); 4797 + static const VerificationMeta _postJsonMeta = const VerificationMeta('postJson'); 5685 4798 @override 5686 4799 late final GeneratedColumn<String> postJson = GeneratedColumn<String>( 5687 4800 'post_json', ··· 5690 4803 type: DriftSqlType.string, 5691 4804 requiredDuringInsert: true, 5692 4805 ); 5693 - static const VerificationMeta _likedAtMeta = const VerificationMeta( 5694 - 'likedAt', 5695 - ); 4806 + static const VerificationMeta _likedAtMeta = const VerificationMeta('likedAt'); 5696 4807 @override 5697 4808 late final GeneratedColumn<DateTime> likedAt = GeneratedColumn<DateTime>( 5698 4809 'liked_at', ··· 5703 4814 defaultValue: currentDateAndTime, 5704 4815 ); 5705 4816 @override 5706 - List<GeneratedColumn> get $columns => [ 5707 - id, 5708 - accountDid, 5709 - postUri, 5710 - postJson, 5711 - likedAt, 5712 - ]; 4817 + List<GeneratedColumn> get $columns => [id, accountDid, postUri, postJson, likedAt]; 5713 4818 @override 5714 4819 String get aliasedName => _alias ?? actualTableName; 5715 4820 @override 5716 4821 String get actualTableName => $name; 5717 4822 static const String $name = 'liked_posts'; 5718 4823 @override 5719 - VerificationContext validateIntegrity( 5720 - Insertable<LikedPostEntry> instance, { 5721 - bool isInserting = false, 5722 - }) { 4824 + VerificationContext validateIntegrity(Insertable<LikedPostEntry> instance, {bool isInserting = false}) { 5723 4825 final context = VerificationContext(); 5724 4826 final data = instance.toColumns(true); 5725 4827 if (data.containsKey('id')) { 5726 4828 context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); 5727 4829 } 5728 4830 if (data.containsKey('account_did')) { 5729 - context.handle( 5730 - _accountDidMeta, 5731 - accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta), 5732 - ); 4831 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 5733 4832 } else if (isInserting) { 5734 4833 context.missing(_accountDidMeta); 5735 4834 } 5736 4835 if (data.containsKey('post_uri')) { 5737 - context.handle( 5738 - _postUriMeta, 5739 - postUri.isAcceptableOrUnknown(data['post_uri']!, _postUriMeta), 5740 - ); 4836 + context.handle(_postUriMeta, postUri.isAcceptableOrUnknown(data['post_uri']!, _postUriMeta)); 5741 4837 } else if (isInserting) { 5742 4838 context.missing(_postUriMeta); 5743 4839 } 5744 4840 if (data.containsKey('post_json')) { 5745 - context.handle( 5746 - _postJsonMeta, 5747 - postJson.isAcceptableOrUnknown(data['post_json']!, _postJsonMeta), 5748 - ); 4841 + context.handle(_postJsonMeta, postJson.isAcceptableOrUnknown(data['post_json']!, _postJsonMeta)); 5749 4842 } else if (isInserting) { 5750 4843 context.missing(_postJsonMeta); 5751 4844 } 5752 4845 if (data.containsKey('liked_at')) { 5753 - context.handle( 5754 - _likedAtMeta, 5755 - likedAt.isAcceptableOrUnknown(data['liked_at']!, _likedAtMeta), 5756 - ); 4846 + context.handle(_likedAtMeta, likedAt.isAcceptableOrUnknown(data['liked_at']!, _likedAtMeta)); 5757 4847 } 5758 4848 return context; 5759 4849 } ··· 5764 4854 LikedPostEntry map(Map<String, dynamic> data, {String? tablePrefix}) { 5765 4855 final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 5766 4856 return LikedPostEntry( 5767 - id: attachedDatabase.typeMapping.read( 5768 - DriftSqlType.int, 5769 - data['${effectivePrefix}id'], 5770 - )!, 5771 - accountDid: attachedDatabase.typeMapping.read( 5772 - DriftSqlType.string, 5773 - data['${effectivePrefix}account_did'], 5774 - )!, 5775 - postUri: attachedDatabase.typeMapping.read( 5776 - DriftSqlType.string, 5777 - data['${effectivePrefix}post_uri'], 5778 - )!, 5779 - postJson: attachedDatabase.typeMapping.read( 5780 - DriftSqlType.string, 5781 - data['${effectivePrefix}post_json'], 5782 - )!, 5783 - likedAt: attachedDatabase.typeMapping.read( 5784 - DriftSqlType.dateTime, 5785 - data['${effectivePrefix}liked_at'], 5786 - )!, 4857 + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, 4858 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 4859 + postUri: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}post_uri'])!, 4860 + postJson: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}post_json'])!, 4861 + likedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}liked_at'])!, 5787 4862 ); 5788 4863 } 5789 4864 ··· 5827 4902 ); 5828 4903 } 5829 4904 5830 - factory LikedPostEntry.fromJson( 5831 - Map<String, dynamic> json, { 5832 - ValueSerializer? serializer, 5833 - }) { 4905 + factory LikedPostEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 5834 4906 serializer ??= driftRuntimeOptions.defaultSerializer; 5835 4907 return LikedPostEntry( 5836 4908 id: serializer.fromJson<int>(json['id']), ··· 5852 4924 }; 5853 4925 } 5854 4926 5855 - LikedPostEntry copyWith({ 5856 - int? id, 5857 - String? accountDid, 5858 - String? postUri, 5859 - String? postJson, 5860 - DateTime? likedAt, 5861 - }) => LikedPostEntry( 5862 - id: id ?? this.id, 5863 - accountDid: accountDid ?? this.accountDid, 5864 - postUri: postUri ?? this.postUri, 5865 - postJson: postJson ?? this.postJson, 5866 - likedAt: likedAt ?? this.likedAt, 5867 - ); 4927 + LikedPostEntry copyWith({int? id, String? accountDid, String? postUri, String? postJson, DateTime? likedAt}) => 4928 + LikedPostEntry( 4929 + id: id ?? this.id, 4930 + accountDid: accountDid ?? this.accountDid, 4931 + postUri: postUri ?? this.postUri, 4932 + postJson: postJson ?? this.postJson, 4933 + likedAt: likedAt ?? this.likedAt, 4934 + ); 5868 4935 LikedPostEntry copyWithCompanion(LikedPostsCompanion data) { 5869 4936 return LikedPostEntry( 5870 4937 id: data.id.present ? data.id.value : this.id, 5871 - accountDid: data.accountDid.present 5872 - ? data.accountDid.value 5873 - : this.accountDid, 4938 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 5874 4939 postUri: data.postUri.present ? data.postUri.value : this.postUri, 5875 4940 postJson: data.postJson.present ? data.postJson.value : this.postJson, 5876 4941 likedAt: data.likedAt.present ? data.likedAt.value : this.likedAt, ··· 5998 5063 late final $CachedPostsTable cachedPosts = $CachedPostsTable(this); 5999 5064 late final $SettingsTable settings = $SettingsTable(this); 6000 5065 late final $SavedFeedsTable savedFeeds = $SavedFeedsTable(this); 6001 - late final $CachedFeedPagesTable cachedFeedPages = $CachedFeedPagesTable( 6002 - this, 6003 - ); 6004 - late final $CachedFeedPostsTable cachedFeedPosts = $CachedFeedPostsTable( 6005 - this, 6006 - ); 6007 - late final $CachedThreadRootsTable cachedThreadRoots = 6008 - $CachedThreadRootsTable(this); 5066 + late final $CachedFeedPagesTable cachedFeedPages = $CachedFeedPagesTable(this); 5067 + late final $CachedFeedPostsTable cachedFeedPosts = $CachedFeedPostsTable(this); 5068 + late final $CachedThreadRootsTable cachedThreadRoots = $CachedThreadRootsTable(this); 6009 5069 late final $SearchHistoryTable searchHistory = $SearchHistoryTable(this); 6010 5070 late final $DraftsTable drafts = $DraftsTable(this); 6011 5071 late final $SavedPostsTable savedPosts = $SavedPostsTable(this); 6012 5072 late final $LabelerCacheTable labelerCache = $LabelerCacheTable(this); 6013 - late final $NotificationDeliveriesTable notificationDeliveries = 6014 - $NotificationDeliveriesTable(this); 5073 + late final $NotificationDeliveriesTable notificationDeliveries = $NotificationDeliveriesTable(this); 6015 5074 late final $LikedPostsTable likedPosts = $LikedPostsTable(this); 6016 5075 @override 6017 - Iterable<TableInfo<Table, Object?>> get allTables => 6018 - allSchemaEntities.whereType<TableInfo<Table, Object?>>(); 5076 + Iterable<TableInfo<Table, Object?>> get allTables => allSchemaEntities.whereType<TableInfo<Table, Object?>>(); 6019 5077 @override 6020 5078 List<DatabaseSchemaEntity> get allSchemaEntities => [ 6021 5079 accounts, ··· 6042 5100 Value<String?> displayName, 6043 5101 Value<String?> service, 6044 5102 Value<String?> oauthService, 5103 + Value<String?> oauthClientId, 6045 5104 required String accessToken, 6046 5105 Value<String?> refreshToken, 6047 5106 Value<String?> dpopPublicKey, ··· 6059 5118 Value<String?> displayName, 6060 5119 Value<String?> service, 6061 5120 Value<String?> oauthService, 5121 + Value<String?> oauthClientId, 6062 5122 Value<String> accessToken, 6063 5123 Value<String?> refreshToken, 6064 5124 Value<String?> dpopPublicKey, ··· 6070 5130 Value<int> rowid, 6071 5131 }); 6072 5132 6073 - class $$AccountsTableFilterComposer 6074 - extends Composer<_$AppDatabase, $AccountsTable> { 5133 + class $$AccountsTableFilterComposer extends Composer<_$AppDatabase, $AccountsTable> { 6075 5134 $$AccountsTableFilterComposer({ 6076 5135 required super.$db, 6077 5136 required super.$table, ··· 6079 5138 super.$addJoinBuilderToRootComposer, 6080 5139 super.$removeJoinBuilderFromRootComposer, 6081 5140 }); 6082 - ColumnFilters<String> get did => $composableBuilder( 6083 - column: $table.did, 6084 - builder: (column) => ColumnFilters(column), 6085 - ); 5141 + ColumnFilters<String> get did => $composableBuilder(column: $table.did, builder: (column) => ColumnFilters(column)); 6086 5142 6087 - ColumnFilters<String> get handle => $composableBuilder( 6088 - column: $table.handle, 6089 - builder: (column) => ColumnFilters(column), 6090 - ); 5143 + ColumnFilters<String> get handle => 5144 + $composableBuilder(column: $table.handle, builder: (column) => ColumnFilters(column)); 6091 5145 6092 - ColumnFilters<String> get displayName => $composableBuilder( 6093 - column: $table.displayName, 6094 - builder: (column) => ColumnFilters(column), 6095 - ); 5146 + ColumnFilters<String> get displayName => 5147 + $composableBuilder(column: $table.displayName, builder: (column) => ColumnFilters(column)); 6096 5148 6097 - ColumnFilters<String> get service => $composableBuilder( 6098 - column: $table.service, 6099 - builder: (column) => ColumnFilters(column), 6100 - ); 5149 + ColumnFilters<String> get service => 5150 + $composableBuilder(column: $table.service, builder: (column) => ColumnFilters(column)); 6101 5151 6102 - ColumnFilters<String> get oauthService => $composableBuilder( 6103 - column: $table.oauthService, 6104 - builder: (column) => ColumnFilters(column), 6105 - ); 5152 + ColumnFilters<String> get oauthService => 5153 + $composableBuilder(column: $table.oauthService, builder: (column) => ColumnFilters(column)); 6106 5154 6107 - ColumnFilters<String> get accessToken => $composableBuilder( 6108 - column: $table.accessToken, 6109 - builder: (column) => ColumnFilters(column), 6110 - ); 5155 + ColumnFilters<String> get oauthClientId => 5156 + $composableBuilder(column: $table.oauthClientId, builder: (column) => ColumnFilters(column)); 6111 5157 6112 - ColumnFilters<String> get refreshToken => $composableBuilder( 6113 - column: $table.refreshToken, 6114 - builder: (column) => ColumnFilters(column), 6115 - ); 5158 + ColumnFilters<String> get accessToken => 5159 + $composableBuilder(column: $table.accessToken, builder: (column) => ColumnFilters(column)); 6116 5160 6117 - ColumnFilters<String> get dpopPublicKey => $composableBuilder( 6118 - column: $table.dpopPublicKey, 6119 - builder: (column) => ColumnFilters(column), 6120 - ); 5161 + ColumnFilters<String> get refreshToken => 5162 + $composableBuilder(column: $table.refreshToken, builder: (column) => ColumnFilters(column)); 6121 5163 6122 - ColumnFilters<String> get dpopPrivateKey => $composableBuilder( 6123 - column: $table.dpopPrivateKey, 6124 - builder: (column) => ColumnFilters(column), 6125 - ); 5164 + ColumnFilters<String> get dpopPublicKey => 5165 + $composableBuilder(column: $table.dpopPublicKey, builder: (column) => ColumnFilters(column)); 6126 5166 6127 - ColumnFilters<String> get dpopNonce => $composableBuilder( 6128 - column: $table.dpopNonce, 6129 - builder: (column) => ColumnFilters(column), 6130 - ); 5167 + ColumnFilters<String> get dpopPrivateKey => 5168 + $composableBuilder(column: $table.dpopPrivateKey, builder: (column) => ColumnFilters(column)); 6131 5169 6132 - ColumnFilters<DateTime> get expiresAt => $composableBuilder( 6133 - column: $table.expiresAt, 6134 - builder: (column) => ColumnFilters(column), 6135 - ); 5170 + ColumnFilters<String> get dpopNonce => 5171 + $composableBuilder(column: $table.dpopNonce, builder: (column) => ColumnFilters(column)); 6136 5172 6137 - ColumnFilters<DateTime> get createdAt => $composableBuilder( 6138 - column: $table.createdAt, 6139 - builder: (column) => ColumnFilters(column), 6140 - ); 5173 + ColumnFilters<DateTime> get expiresAt => 5174 + $composableBuilder(column: $table.expiresAt, builder: (column) => ColumnFilters(column)); 6141 5175 6142 - ColumnFilters<DateTime> get updatedAt => $composableBuilder( 6143 - column: $table.updatedAt, 6144 - builder: (column) => ColumnFilters(column), 6145 - ); 5176 + ColumnFilters<DateTime> get createdAt => 5177 + $composableBuilder(column: $table.createdAt, builder: (column) => ColumnFilters(column)); 5178 + 5179 + ColumnFilters<DateTime> get updatedAt => 5180 + $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnFilters(column)); 6146 5181 } 6147 5182 6148 - class $$AccountsTableOrderingComposer 6149 - extends Composer<_$AppDatabase, $AccountsTable> { 5183 + class $$AccountsTableOrderingComposer extends Composer<_$AppDatabase, $AccountsTable> { 6150 5184 $$AccountsTableOrderingComposer({ 6151 5185 required super.$db, 6152 5186 required super.$table, ··· 6154 5188 super.$addJoinBuilderToRootComposer, 6155 5189 super.$removeJoinBuilderFromRootComposer, 6156 5190 }); 6157 - ColumnOrderings<String> get did => $composableBuilder( 6158 - column: $table.did, 6159 - builder: (column) => ColumnOrderings(column), 6160 - ); 5191 + ColumnOrderings<String> get did => 5192 + $composableBuilder(column: $table.did, builder: (column) => ColumnOrderings(column)); 5193 + 5194 + ColumnOrderings<String> get handle => 5195 + $composableBuilder(column: $table.handle, builder: (column) => ColumnOrderings(column)); 6161 5196 6162 - ColumnOrderings<String> get handle => $composableBuilder( 6163 - column: $table.handle, 6164 - builder: (column) => ColumnOrderings(column), 6165 - ); 5197 + ColumnOrderings<String> get displayName => 5198 + $composableBuilder(column: $table.displayName, builder: (column) => ColumnOrderings(column)); 6166 5199 6167 - ColumnOrderings<String> get displayName => $composableBuilder( 6168 - column: $table.displayName, 6169 - builder: (column) => ColumnOrderings(column), 6170 - ); 5200 + ColumnOrderings<String> get service => 5201 + $composableBuilder(column: $table.service, builder: (column) => ColumnOrderings(column)); 6171 5202 6172 - ColumnOrderings<String> get service => $composableBuilder( 6173 - column: $table.service, 6174 - builder: (column) => ColumnOrderings(column), 6175 - ); 5203 + ColumnOrderings<String> get oauthService => 5204 + $composableBuilder(column: $table.oauthService, builder: (column) => ColumnOrderings(column)); 6176 5205 6177 - ColumnOrderings<String> get oauthService => $composableBuilder( 6178 - column: $table.oauthService, 6179 - builder: (column) => ColumnOrderings(column), 6180 - ); 5206 + ColumnOrderings<String> get oauthClientId => 5207 + $composableBuilder(column: $table.oauthClientId, builder: (column) => ColumnOrderings(column)); 6181 5208 6182 - ColumnOrderings<String> get accessToken => $composableBuilder( 6183 - column: $table.accessToken, 6184 - builder: (column) => ColumnOrderings(column), 6185 - ); 5209 + ColumnOrderings<String> get accessToken => 5210 + $composableBuilder(column: $table.accessToken, builder: (column) => ColumnOrderings(column)); 6186 5211 6187 - ColumnOrderings<String> get refreshToken => $composableBuilder( 6188 - column: $table.refreshToken, 6189 - builder: (column) => ColumnOrderings(column), 6190 - ); 5212 + ColumnOrderings<String> get refreshToken => 5213 + $composableBuilder(column: $table.refreshToken, builder: (column) => ColumnOrderings(column)); 6191 5214 6192 - ColumnOrderings<String> get dpopPublicKey => $composableBuilder( 6193 - column: $table.dpopPublicKey, 6194 - builder: (column) => ColumnOrderings(column), 6195 - ); 5215 + ColumnOrderings<String> get dpopPublicKey => 5216 + $composableBuilder(column: $table.dpopPublicKey, builder: (column) => ColumnOrderings(column)); 6196 5217 6197 - ColumnOrderings<String> get dpopPrivateKey => $composableBuilder( 6198 - column: $table.dpopPrivateKey, 6199 - builder: (column) => ColumnOrderings(column), 6200 - ); 5218 + ColumnOrderings<String> get dpopPrivateKey => 5219 + $composableBuilder(column: $table.dpopPrivateKey, builder: (column) => ColumnOrderings(column)); 6201 5220 6202 - ColumnOrderings<String> get dpopNonce => $composableBuilder( 6203 - column: $table.dpopNonce, 6204 - builder: (column) => ColumnOrderings(column), 6205 - ); 5221 + ColumnOrderings<String> get dpopNonce => 5222 + $composableBuilder(column: $table.dpopNonce, builder: (column) => ColumnOrderings(column)); 6206 5223 6207 - ColumnOrderings<DateTime> get expiresAt => $composableBuilder( 6208 - column: $table.expiresAt, 6209 - builder: (column) => ColumnOrderings(column), 6210 - ); 5224 + ColumnOrderings<DateTime> get expiresAt => 5225 + $composableBuilder(column: $table.expiresAt, builder: (column) => ColumnOrderings(column)); 6211 5226 6212 - ColumnOrderings<DateTime> get createdAt => $composableBuilder( 6213 - column: $table.createdAt, 6214 - builder: (column) => ColumnOrderings(column), 6215 - ); 5227 + ColumnOrderings<DateTime> get createdAt => 5228 + $composableBuilder(column: $table.createdAt, builder: (column) => ColumnOrderings(column)); 6216 5229 6217 - ColumnOrderings<DateTime> get updatedAt => $composableBuilder( 6218 - column: $table.updatedAt, 6219 - builder: (column) => ColumnOrderings(column), 6220 - ); 5230 + ColumnOrderings<DateTime> get updatedAt => 5231 + $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); 6221 5232 } 6222 5233 6223 - class $$AccountsTableAnnotationComposer 6224 - extends Composer<_$AppDatabase, $AccountsTable> { 5234 + class $$AccountsTableAnnotationComposer extends Composer<_$AppDatabase, $AccountsTable> { 6225 5235 $$AccountsTableAnnotationComposer({ 6226 5236 required super.$db, 6227 5237 required super.$table, ··· 6229 5239 super.$addJoinBuilderToRootComposer, 6230 5240 super.$removeJoinBuilderFromRootComposer, 6231 5241 }); 6232 - GeneratedColumn<String> get did => 6233 - $composableBuilder(column: $table.did, builder: (column) => column); 5242 + GeneratedColumn<String> get did => $composableBuilder(column: $table.did, builder: (column) => column); 6234 5243 6235 - GeneratedColumn<String> get handle => 6236 - $composableBuilder(column: $table.handle, builder: (column) => column); 5244 + GeneratedColumn<String> get handle => $composableBuilder(column: $table.handle, builder: (column) => column); 6237 5245 6238 - GeneratedColumn<String> get displayName => $composableBuilder( 6239 - column: $table.displayName, 6240 - builder: (column) => column, 6241 - ); 5246 + GeneratedColumn<String> get displayName => 5247 + $composableBuilder(column: $table.displayName, builder: (column) => column); 6242 5248 6243 - GeneratedColumn<String> get service => 6244 - $composableBuilder(column: $table.service, builder: (column) => column); 5249 + GeneratedColumn<String> get service => $composableBuilder(column: $table.service, builder: (column) => column); 6245 5250 6246 - GeneratedColumn<String> get oauthService => $composableBuilder( 6247 - column: $table.oauthService, 6248 - builder: (column) => column, 6249 - ); 5251 + GeneratedColumn<String> get oauthService => 5252 + $composableBuilder(column: $table.oauthService, builder: (column) => column); 6250 5253 6251 - GeneratedColumn<String> get accessToken => $composableBuilder( 6252 - column: $table.accessToken, 6253 - builder: (column) => column, 6254 - ); 5254 + GeneratedColumn<String> get oauthClientId => 5255 + $composableBuilder(column: $table.oauthClientId, builder: (column) => column); 6255 5256 6256 - GeneratedColumn<String> get refreshToken => $composableBuilder( 6257 - column: $table.refreshToken, 6258 - builder: (column) => column, 6259 - ); 5257 + GeneratedColumn<String> get accessToken => 5258 + $composableBuilder(column: $table.accessToken, builder: (column) => column); 5259 + 5260 + GeneratedColumn<String> get refreshToken => 5261 + $composableBuilder(column: $table.refreshToken, builder: (column) => column); 6260 5262 6261 - GeneratedColumn<String> get dpopPublicKey => $composableBuilder( 6262 - column: $table.dpopPublicKey, 6263 - builder: (column) => column, 6264 - ); 5263 + GeneratedColumn<String> get dpopPublicKey => 5264 + $composableBuilder(column: $table.dpopPublicKey, builder: (column) => column); 6265 5265 6266 - GeneratedColumn<String> get dpopPrivateKey => $composableBuilder( 6267 - column: $table.dpopPrivateKey, 6268 - builder: (column) => column, 6269 - ); 5266 + GeneratedColumn<String> get dpopPrivateKey => 5267 + $composableBuilder(column: $table.dpopPrivateKey, builder: (column) => column); 6270 5268 6271 - GeneratedColumn<String> get dpopNonce => 6272 - $composableBuilder(column: $table.dpopNonce, builder: (column) => column); 5269 + GeneratedColumn<String> get dpopNonce => $composableBuilder(column: $table.dpopNonce, builder: (column) => column); 6273 5270 6274 - GeneratedColumn<DateTime> get expiresAt => 6275 - $composableBuilder(column: $table.expiresAt, builder: (column) => column); 5271 + GeneratedColumn<DateTime> get expiresAt => $composableBuilder(column: $table.expiresAt, builder: (column) => column); 6276 5272 6277 - GeneratedColumn<DateTime> get createdAt => 6278 - $composableBuilder(column: $table.createdAt, builder: (column) => column); 5273 + GeneratedColumn<DateTime> get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); 6279 5274 6280 - GeneratedColumn<DateTime> get updatedAt => 6281 - $composableBuilder(column: $table.updatedAt, builder: (column) => column); 5275 + GeneratedColumn<DateTime> get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); 6282 5276 } 6283 5277 6284 5278 class $$AccountsTableTableManager ··· 6301 5295 TableManagerState( 6302 5296 db: db, 6303 5297 table: table, 6304 - createFilteringComposer: () => 6305 - $$AccountsTableFilterComposer($db: db, $table: table), 6306 - createOrderingComposer: () => 6307 - $$AccountsTableOrderingComposer($db: db, $table: table), 6308 - createComputedFieldComposer: () => 6309 - $$AccountsTableAnnotationComposer($db: db, $table: table), 5298 + createFilteringComposer: () => $$AccountsTableFilterComposer($db: db, $table: table), 5299 + createOrderingComposer: () => $$AccountsTableOrderingComposer($db: db, $table: table), 5300 + createComputedFieldComposer: () => $$AccountsTableAnnotationComposer($db: db, $table: table), 6310 5301 updateCompanionCallback: 6311 5302 ({ 6312 5303 Value<String> did = const Value.absent(), ··· 6314 5305 Value<String?> displayName = const Value.absent(), 6315 5306 Value<String?> service = const Value.absent(), 6316 5307 Value<String?> oauthService = const Value.absent(), 5308 + Value<String?> oauthClientId = const Value.absent(), 6317 5309 Value<String> accessToken = const Value.absent(), 6318 5310 Value<String?> refreshToken = const Value.absent(), 6319 5311 Value<String?> dpopPublicKey = const Value.absent(), ··· 6329 5321 displayName: displayName, 6330 5322 service: service, 6331 5323 oauthService: oauthService, 5324 + oauthClientId: oauthClientId, 6332 5325 accessToken: accessToken, 6333 5326 refreshToken: refreshToken, 6334 5327 dpopPublicKey: dpopPublicKey, ··· 6346 5339 Value<String?> displayName = const Value.absent(), 6347 5340 Value<String?> service = const Value.absent(), 6348 5341 Value<String?> oauthService = const Value.absent(), 5342 + Value<String?> oauthClientId = const Value.absent(), 6349 5343 required String accessToken, 6350 5344 Value<String?> refreshToken = const Value.absent(), 6351 5345 Value<String?> dpopPublicKey = const Value.absent(), ··· 6361 5355 displayName: displayName, 6362 5356 service: service, 6363 5357 oauthService: oauthService, 5358 + oauthClientId: oauthClientId, 6364 5359 accessToken: accessToken, 6365 5360 refreshToken: refreshToken, 6366 5361 dpopPublicKey: dpopPublicKey, ··· 6371 5366 updatedAt: updatedAt, 6372 5367 rowid: rowid, 6373 5368 ), 6374 - withReferenceMapper: (p0) => p0 6375 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 6376 - .toList(), 5369 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 6377 5370 prefetchHooksCallback: null, 6378 5371 ), 6379 5372 ); ··· 6410 5403 Value<int> rowid, 6411 5404 }); 6412 5405 6413 - class $$CachedProfilesTableFilterComposer 6414 - extends Composer<_$AppDatabase, $CachedProfilesTable> { 5406 + class $$CachedProfilesTableFilterComposer extends Composer<_$AppDatabase, $CachedProfilesTable> { 6415 5407 $$CachedProfilesTableFilterComposer({ 6416 5408 required super.$db, 6417 5409 required super.$table, ··· 6419 5411 super.$addJoinBuilderToRootComposer, 6420 5412 super.$removeJoinBuilderFromRootComposer, 6421 5413 }); 6422 - ColumnFilters<String> get did => $composableBuilder( 6423 - column: $table.did, 6424 - builder: (column) => ColumnFilters(column), 6425 - ); 5414 + ColumnFilters<String> get did => $composableBuilder(column: $table.did, builder: (column) => ColumnFilters(column)); 6426 5415 6427 - ColumnFilters<String> get handle => $composableBuilder( 6428 - column: $table.handle, 6429 - builder: (column) => ColumnFilters(column), 6430 - ); 5416 + ColumnFilters<String> get handle => 5417 + $composableBuilder(column: $table.handle, builder: (column) => ColumnFilters(column)); 6431 5418 6432 - ColumnFilters<String> get payload => $composableBuilder( 6433 - column: $table.payload, 6434 - builder: (column) => ColumnFilters(column), 6435 - ); 5419 + ColumnFilters<String> get payload => 5420 + $composableBuilder(column: $table.payload, builder: (column) => ColumnFilters(column)); 6436 5421 6437 - ColumnFilters<DateTime> get fetchedAt => $composableBuilder( 6438 - column: $table.fetchedAt, 6439 - builder: (column) => ColumnFilters(column), 6440 - ); 5422 + ColumnFilters<DateTime> get fetchedAt => 5423 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnFilters(column)); 6441 5424 } 6442 5425 6443 - class $$CachedProfilesTableOrderingComposer 6444 - extends Composer<_$AppDatabase, $CachedProfilesTable> { 5426 + class $$CachedProfilesTableOrderingComposer extends Composer<_$AppDatabase, $CachedProfilesTable> { 6445 5427 $$CachedProfilesTableOrderingComposer({ 6446 5428 required super.$db, 6447 5429 required super.$table, ··· 6449 5431 super.$addJoinBuilderToRootComposer, 6450 5432 super.$removeJoinBuilderFromRootComposer, 6451 5433 }); 6452 - ColumnOrderings<String> get did => $composableBuilder( 6453 - column: $table.did, 6454 - builder: (column) => ColumnOrderings(column), 6455 - ); 5434 + ColumnOrderings<String> get did => 5435 + $composableBuilder(column: $table.did, builder: (column) => ColumnOrderings(column)); 6456 5436 6457 - ColumnOrderings<String> get handle => $composableBuilder( 6458 - column: $table.handle, 6459 - builder: (column) => ColumnOrderings(column), 6460 - ); 5437 + ColumnOrderings<String> get handle => 5438 + $composableBuilder(column: $table.handle, builder: (column) => ColumnOrderings(column)); 6461 5439 6462 - ColumnOrderings<String> get payload => $composableBuilder( 6463 - column: $table.payload, 6464 - builder: (column) => ColumnOrderings(column), 6465 - ); 5440 + ColumnOrderings<String> get payload => 5441 + $composableBuilder(column: $table.payload, builder: (column) => ColumnOrderings(column)); 6466 5442 6467 - ColumnOrderings<DateTime> get fetchedAt => $composableBuilder( 6468 - column: $table.fetchedAt, 6469 - builder: (column) => ColumnOrderings(column), 6470 - ); 5443 + ColumnOrderings<DateTime> get fetchedAt => 5444 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnOrderings(column)); 6471 5445 } 6472 5446 6473 - class $$CachedProfilesTableAnnotationComposer 6474 - extends Composer<_$AppDatabase, $CachedProfilesTable> { 5447 + class $$CachedProfilesTableAnnotationComposer extends Composer<_$AppDatabase, $CachedProfilesTable> { 6475 5448 $$CachedProfilesTableAnnotationComposer({ 6476 5449 required super.$db, 6477 5450 required super.$table, ··· 6479 5452 super.$addJoinBuilderToRootComposer, 6480 5453 super.$removeJoinBuilderFromRootComposer, 6481 5454 }); 6482 - GeneratedColumn<String> get did => 6483 - $composableBuilder(column: $table.did, builder: (column) => column); 5455 + GeneratedColumn<String> get did => $composableBuilder(column: $table.did, builder: (column) => column); 6484 5456 6485 - GeneratedColumn<String> get handle => 6486 - $composableBuilder(column: $table.handle, builder: (column) => column); 5457 + GeneratedColumn<String> get handle => $composableBuilder(column: $table.handle, builder: (column) => column); 6487 5458 6488 - GeneratedColumn<String> get payload => 6489 - $composableBuilder(column: $table.payload, builder: (column) => column); 5459 + GeneratedColumn<String> get payload => $composableBuilder(column: $table.payload, builder: (column) => column); 6490 5460 6491 - GeneratedColumn<DateTime> get fetchedAt => 6492 - $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 5461 + GeneratedColumn<DateTime> get fetchedAt => $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 6493 5462 } 6494 5463 6495 5464 class $$CachedProfilesTableTableManager ··· 6503 5472 $$CachedProfilesTableAnnotationComposer, 6504 5473 $$CachedProfilesTableCreateCompanionBuilder, 6505 5474 $$CachedProfilesTableUpdateCompanionBuilder, 6506 - ( 6507 - CachedProfile, 6508 - BaseReferences<_$AppDatabase, $CachedProfilesTable, CachedProfile>, 6509 - ), 5475 + (CachedProfile, BaseReferences<_$AppDatabase, $CachedProfilesTable, CachedProfile>), 6510 5476 CachedProfile, 6511 5477 PrefetchHooks Function() 6512 5478 > { 6513 - $$CachedProfilesTableTableManager( 6514 - _$AppDatabase db, 6515 - $CachedProfilesTable table, 6516 - ) : super( 5479 + $$CachedProfilesTableTableManager(_$AppDatabase db, $CachedProfilesTable table) 5480 + : super( 6517 5481 TableManagerState( 6518 5482 db: db, 6519 5483 table: table, 6520 - createFilteringComposer: () => 6521 - $$CachedProfilesTableFilterComposer($db: db, $table: table), 6522 - createOrderingComposer: () => 6523 - $$CachedProfilesTableOrderingComposer($db: db, $table: table), 6524 - createComputedFieldComposer: () => 6525 - $$CachedProfilesTableAnnotationComposer($db: db, $table: table), 5484 + createFilteringComposer: () => $$CachedProfilesTableFilterComposer($db: db, $table: table), 5485 + createOrderingComposer: () => $$CachedProfilesTableOrderingComposer($db: db, $table: table), 5486 + createComputedFieldComposer: () => $$CachedProfilesTableAnnotationComposer($db: db, $table: table), 6526 5487 updateCompanionCallback: 6527 5488 ({ 6528 5489 Value<String> did = const Value.absent(), ··· 6551 5512 fetchedAt: fetchedAt, 6552 5513 rowid: rowid, 6553 5514 ), 6554 - withReferenceMapper: (p0) => p0 6555 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 6556 - .toList(), 5515 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 6557 5516 prefetchHooksCallback: null, 6558 5517 ), 6559 5518 ); ··· 6569 5528 $$CachedProfilesTableAnnotationComposer, 6570 5529 $$CachedProfilesTableCreateCompanionBuilder, 6571 5530 $$CachedProfilesTableUpdateCompanionBuilder, 6572 - ( 6573 - CachedProfile, 6574 - BaseReferences<_$AppDatabase, $CachedProfilesTable, CachedProfile>, 6575 - ), 5531 + (CachedProfile, BaseReferences<_$AppDatabase, $CachedProfilesTable, CachedProfile>), 6576 5532 CachedProfile, 6577 5533 PrefetchHooks Function() 6578 5534 >; ··· 6597 5553 Value<int> rowid, 6598 5554 }); 6599 5555 6600 - class $$CachedPostsTableFilterComposer 6601 - extends Composer<_$AppDatabase, $CachedPostsTable> { 5556 + class $$CachedPostsTableFilterComposer extends Composer<_$AppDatabase, $CachedPostsTable> { 6602 5557 $$CachedPostsTableFilterComposer({ 6603 5558 required super.$db, 6604 5559 required super.$table, ··· 6606 5561 super.$addJoinBuilderToRootComposer, 6607 5562 super.$removeJoinBuilderFromRootComposer, 6608 5563 }); 6609 - ColumnFilters<String> get uri => $composableBuilder( 6610 - column: $table.uri, 6611 - builder: (column) => ColumnFilters(column), 6612 - ); 5564 + ColumnFilters<String> get uri => $composableBuilder(column: $table.uri, builder: (column) => ColumnFilters(column)); 6613 5565 6614 - ColumnFilters<String> get authorDid => $composableBuilder( 6615 - column: $table.authorDid, 6616 - builder: (column) => ColumnFilters(column), 6617 - ); 5566 + ColumnFilters<String> get authorDid => 5567 + $composableBuilder(column: $table.authorDid, builder: (column) => ColumnFilters(column)); 6618 5568 6619 - ColumnFilters<String> get accountDid => $composableBuilder( 6620 - column: $table.accountDid, 6621 - builder: (column) => ColumnFilters(column), 6622 - ); 5569 + ColumnFilters<String> get accountDid => 5570 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 6623 5571 6624 - ColumnFilters<String> get payload => $composableBuilder( 6625 - column: $table.payload, 6626 - builder: (column) => ColumnFilters(column), 6627 - ); 5572 + ColumnFilters<String> get payload => 5573 + $composableBuilder(column: $table.payload, builder: (column) => ColumnFilters(column)); 6628 5574 6629 - ColumnFilters<DateTime> get createdAt => $composableBuilder( 6630 - column: $table.createdAt, 6631 - builder: (column) => ColumnFilters(column), 6632 - ); 5575 + ColumnFilters<DateTime> get createdAt => 5576 + $composableBuilder(column: $table.createdAt, builder: (column) => ColumnFilters(column)); 6633 5577 6634 - ColumnFilters<DateTime> get fetchedAt => $composableBuilder( 6635 - column: $table.fetchedAt, 6636 - builder: (column) => ColumnFilters(column), 6637 - ); 5578 + ColumnFilters<DateTime> get fetchedAt => 5579 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnFilters(column)); 6638 5580 } 6639 5581 6640 - class $$CachedPostsTableOrderingComposer 6641 - extends Composer<_$AppDatabase, $CachedPostsTable> { 5582 + class $$CachedPostsTableOrderingComposer extends Composer<_$AppDatabase, $CachedPostsTable> { 6642 5583 $$CachedPostsTableOrderingComposer({ 6643 5584 required super.$db, 6644 5585 required super.$table, ··· 6646 5587 super.$addJoinBuilderToRootComposer, 6647 5588 super.$removeJoinBuilderFromRootComposer, 6648 5589 }); 6649 - ColumnOrderings<String> get uri => $composableBuilder( 6650 - column: $table.uri, 6651 - builder: (column) => ColumnOrderings(column), 6652 - ); 5590 + ColumnOrderings<String> get uri => 5591 + $composableBuilder(column: $table.uri, builder: (column) => ColumnOrderings(column)); 6653 5592 6654 - ColumnOrderings<String> get authorDid => $composableBuilder( 6655 - column: $table.authorDid, 6656 - builder: (column) => ColumnOrderings(column), 6657 - ); 5593 + ColumnOrderings<String> get authorDid => 5594 + $composableBuilder(column: $table.authorDid, builder: (column) => ColumnOrderings(column)); 6658 5595 6659 - ColumnOrderings<String> get accountDid => $composableBuilder( 6660 - column: $table.accountDid, 6661 - builder: (column) => ColumnOrderings(column), 6662 - ); 5596 + ColumnOrderings<String> get accountDid => 5597 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 6663 5598 6664 - ColumnOrderings<String> get payload => $composableBuilder( 6665 - column: $table.payload, 6666 - builder: (column) => ColumnOrderings(column), 6667 - ); 5599 + ColumnOrderings<String> get payload => 5600 + $composableBuilder(column: $table.payload, builder: (column) => ColumnOrderings(column)); 6668 5601 6669 - ColumnOrderings<DateTime> get createdAt => $composableBuilder( 6670 - column: $table.createdAt, 6671 - builder: (column) => ColumnOrderings(column), 6672 - ); 5602 + ColumnOrderings<DateTime> get createdAt => 5603 + $composableBuilder(column: $table.createdAt, builder: (column) => ColumnOrderings(column)); 6673 5604 6674 - ColumnOrderings<DateTime> get fetchedAt => $composableBuilder( 6675 - column: $table.fetchedAt, 6676 - builder: (column) => ColumnOrderings(column), 6677 - ); 5605 + ColumnOrderings<DateTime> get fetchedAt => 5606 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnOrderings(column)); 6678 5607 } 6679 5608 6680 - class $$CachedPostsTableAnnotationComposer 6681 - extends Composer<_$AppDatabase, $CachedPostsTable> { 5609 + class $$CachedPostsTableAnnotationComposer extends Composer<_$AppDatabase, $CachedPostsTable> { 6682 5610 $$CachedPostsTableAnnotationComposer({ 6683 5611 required super.$db, 6684 5612 required super.$table, ··· 6686 5614 super.$addJoinBuilderToRootComposer, 6687 5615 super.$removeJoinBuilderFromRootComposer, 6688 5616 }); 6689 - GeneratedColumn<String> get uri => 6690 - $composableBuilder(column: $table.uri, builder: (column) => column); 5617 + GeneratedColumn<String> get uri => $composableBuilder(column: $table.uri, builder: (column) => column); 6691 5618 6692 - GeneratedColumn<String> get authorDid => 6693 - $composableBuilder(column: $table.authorDid, builder: (column) => column); 5619 + GeneratedColumn<String> get authorDid => $composableBuilder(column: $table.authorDid, builder: (column) => column); 6694 5620 6695 - GeneratedColumn<String> get accountDid => $composableBuilder( 6696 - column: $table.accountDid, 6697 - builder: (column) => column, 6698 - ); 5621 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 6699 5622 6700 - GeneratedColumn<String> get payload => 6701 - $composableBuilder(column: $table.payload, builder: (column) => column); 5623 + GeneratedColumn<String> get payload => $composableBuilder(column: $table.payload, builder: (column) => column); 6702 5624 6703 - GeneratedColumn<DateTime> get createdAt => 6704 - $composableBuilder(column: $table.createdAt, builder: (column) => column); 5625 + GeneratedColumn<DateTime> get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); 6705 5626 6706 - GeneratedColumn<DateTime> get fetchedAt => 6707 - $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 5627 + GeneratedColumn<DateTime> get fetchedAt => $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 6708 5628 } 6709 5629 6710 5630 class $$CachedPostsTableTableManager ··· 6718 5638 $$CachedPostsTableAnnotationComposer, 6719 5639 $$CachedPostsTableCreateCompanionBuilder, 6720 5640 $$CachedPostsTableUpdateCompanionBuilder, 6721 - ( 6722 - CachedPost, 6723 - BaseReferences<_$AppDatabase, $CachedPostsTable, CachedPost>, 6724 - ), 5641 + (CachedPost, BaseReferences<_$AppDatabase, $CachedPostsTable, CachedPost>), 6725 5642 CachedPost, 6726 5643 PrefetchHooks Function() 6727 5644 > { ··· 6730 5647 TableManagerState( 6731 5648 db: db, 6732 5649 table: table, 6733 - createFilteringComposer: () => 6734 - $$CachedPostsTableFilterComposer($db: db, $table: table), 6735 - createOrderingComposer: () => 6736 - $$CachedPostsTableOrderingComposer($db: db, $table: table), 6737 - createComputedFieldComposer: () => 6738 - $$CachedPostsTableAnnotationComposer($db: db, $table: table), 5650 + createFilteringComposer: () => $$CachedPostsTableFilterComposer($db: db, $table: table), 5651 + createOrderingComposer: () => $$CachedPostsTableOrderingComposer($db: db, $table: table), 5652 + createComputedFieldComposer: () => $$CachedPostsTableAnnotationComposer($db: db, $table: table), 6739 5653 updateCompanionCallback: 6740 5654 ({ 6741 5655 Value<String> uri = const Value.absent(), ··· 6772 5686 fetchedAt: fetchedAt, 6773 5687 rowid: rowid, 6774 5688 ), 6775 - withReferenceMapper: (p0) => p0 6776 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 6777 - .toList(), 5689 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 6778 5690 prefetchHooksCallback: null, 6779 5691 ), 6780 5692 ); ··· 6790 5702 $$CachedPostsTableAnnotationComposer, 6791 5703 $$CachedPostsTableCreateCompanionBuilder, 6792 5704 $$CachedPostsTableUpdateCompanionBuilder, 6793 - ( 6794 - CachedPost, 6795 - BaseReferences<_$AppDatabase, $CachedPostsTable, CachedPost>, 6796 - ), 5705 + (CachedPost, BaseReferences<_$AppDatabase, $CachedPostsTable, CachedPost>), 6797 5706 CachedPost, 6798 5707 PrefetchHooks Function() 6799 5708 >; ··· 6805 5714 Value<int> rowid, 6806 5715 }); 6807 5716 typedef $$SettingsTableUpdateCompanionBuilder = 6808 - SettingsCompanion Function({ 6809 - Value<String> key, 6810 - Value<String> value, 6811 - Value<DateTime> updatedAt, 6812 - Value<int> rowid, 6813 - }); 5717 + SettingsCompanion Function({Value<String> key, Value<String> value, Value<DateTime> updatedAt, Value<int> rowid}); 6814 5718 6815 - class $$SettingsTableFilterComposer 6816 - extends Composer<_$AppDatabase, $SettingsTable> { 5719 + class $$SettingsTableFilterComposer extends Composer<_$AppDatabase, $SettingsTable> { 6817 5720 $$SettingsTableFilterComposer({ 6818 5721 required super.$db, 6819 5722 required super.$table, ··· 6821 5724 super.$addJoinBuilderToRootComposer, 6822 5725 super.$removeJoinBuilderFromRootComposer, 6823 5726 }); 6824 - ColumnFilters<String> get key => $composableBuilder( 6825 - column: $table.key, 6826 - builder: (column) => ColumnFilters(column), 6827 - ); 5727 + ColumnFilters<String> get key => $composableBuilder(column: $table.key, builder: (column) => ColumnFilters(column)); 6828 5728 6829 - ColumnFilters<String> get value => $composableBuilder( 6830 - column: $table.value, 6831 - builder: (column) => ColumnFilters(column), 6832 - ); 5729 + ColumnFilters<String> get value => 5730 + $composableBuilder(column: $table.value, builder: (column) => ColumnFilters(column)); 6833 5731 6834 - ColumnFilters<DateTime> get updatedAt => $composableBuilder( 6835 - column: $table.updatedAt, 6836 - builder: (column) => ColumnFilters(column), 6837 - ); 5732 + ColumnFilters<DateTime> get updatedAt => 5733 + $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnFilters(column)); 6838 5734 } 6839 5735 6840 - class $$SettingsTableOrderingComposer 6841 - extends Composer<_$AppDatabase, $SettingsTable> { 5736 + class $$SettingsTableOrderingComposer extends Composer<_$AppDatabase, $SettingsTable> { 6842 5737 $$SettingsTableOrderingComposer({ 6843 5738 required super.$db, 6844 5739 required super.$table, ··· 6846 5741 super.$addJoinBuilderToRootComposer, 6847 5742 super.$removeJoinBuilderFromRootComposer, 6848 5743 }); 6849 - ColumnOrderings<String> get key => $composableBuilder( 6850 - column: $table.key, 6851 - builder: (column) => ColumnOrderings(column), 6852 - ); 5744 + ColumnOrderings<String> get key => 5745 + $composableBuilder(column: $table.key, builder: (column) => ColumnOrderings(column)); 6853 5746 6854 - ColumnOrderings<String> get value => $composableBuilder( 6855 - column: $table.value, 6856 - builder: (column) => ColumnOrderings(column), 6857 - ); 5747 + ColumnOrderings<String> get value => 5748 + $composableBuilder(column: $table.value, builder: (column) => ColumnOrderings(column)); 6858 5749 6859 - ColumnOrderings<DateTime> get updatedAt => $composableBuilder( 6860 - column: $table.updatedAt, 6861 - builder: (column) => ColumnOrderings(column), 6862 - ); 5750 + ColumnOrderings<DateTime> get updatedAt => 5751 + $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); 6863 5752 } 6864 5753 6865 - class $$SettingsTableAnnotationComposer 6866 - extends Composer<_$AppDatabase, $SettingsTable> { 5754 + class $$SettingsTableAnnotationComposer extends Composer<_$AppDatabase, $SettingsTable> { 6867 5755 $$SettingsTableAnnotationComposer({ 6868 5756 required super.$db, 6869 5757 required super.$table, ··· 6871 5759 super.$addJoinBuilderToRootComposer, 6872 5760 super.$removeJoinBuilderFromRootComposer, 6873 5761 }); 6874 - GeneratedColumn<String> get key => 6875 - $composableBuilder(column: $table.key, builder: (column) => column); 5762 + GeneratedColumn<String> get key => $composableBuilder(column: $table.key, builder: (column) => column); 6876 5763 6877 - GeneratedColumn<String> get value => 6878 - $composableBuilder(column: $table.value, builder: (column) => column); 5764 + GeneratedColumn<String> get value => $composableBuilder(column: $table.value, builder: (column) => column); 6879 5765 6880 - GeneratedColumn<DateTime> get updatedAt => 6881 - $composableBuilder(column: $table.updatedAt, builder: (column) => column); 5766 + GeneratedColumn<DateTime> get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); 6882 5767 } 6883 5768 6884 5769 class $$SettingsTableTableManager ··· 6892 5777 $$SettingsTableAnnotationComposer, 6893 5778 $$SettingsTableCreateCompanionBuilder, 6894 5779 $$SettingsTableUpdateCompanionBuilder, 6895 - ( 6896 - SettingsEntry, 6897 - BaseReferences<_$AppDatabase, $SettingsTable, SettingsEntry>, 6898 - ), 5780 + (SettingsEntry, BaseReferences<_$AppDatabase, $SettingsTable, SettingsEntry>), 6899 5781 SettingsEntry, 6900 5782 PrefetchHooks Function() 6901 5783 > { ··· 6904 5786 TableManagerState( 6905 5787 db: db, 6906 5788 table: table, 6907 - createFilteringComposer: () => 6908 - $$SettingsTableFilterComposer($db: db, $table: table), 6909 - createOrderingComposer: () => 6910 - $$SettingsTableOrderingComposer($db: db, $table: table), 6911 - createComputedFieldComposer: () => 6912 - $$SettingsTableAnnotationComposer($db: db, $table: table), 5789 + createFilteringComposer: () => $$SettingsTableFilterComposer($db: db, $table: table), 5790 + createOrderingComposer: () => $$SettingsTableOrderingComposer($db: db, $table: table), 5791 + createComputedFieldComposer: () => $$SettingsTableAnnotationComposer($db: db, $table: table), 6913 5792 updateCompanionCallback: 6914 5793 ({ 6915 5794 Value<String> key = const Value.absent(), 6916 5795 Value<String> value = const Value.absent(), 6917 5796 Value<DateTime> updatedAt = const Value.absent(), 6918 5797 Value<int> rowid = const Value.absent(), 6919 - }) => SettingsCompanion( 6920 - key: key, 6921 - value: value, 6922 - updatedAt: updatedAt, 6923 - rowid: rowid, 6924 - ), 5798 + }) => SettingsCompanion(key: key, value: value, updatedAt: updatedAt, rowid: rowid), 6925 5799 createCompanionCallback: 6926 5800 ({ 6927 5801 required String key, 6928 5802 required String value, 6929 5803 Value<DateTime> updatedAt = const Value.absent(), 6930 5804 Value<int> rowid = const Value.absent(), 6931 - }) => SettingsCompanion.insert( 6932 - key: key, 6933 - value: value, 6934 - updatedAt: updatedAt, 6935 - rowid: rowid, 6936 - ), 6937 - withReferenceMapper: (p0) => p0 6938 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 6939 - .toList(), 5805 + }) => SettingsCompanion.insert(key: key, value: value, updatedAt: updatedAt, rowid: rowid), 5806 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 6940 5807 prefetchHooksCallback: null, 6941 5808 ), 6942 5809 ); ··· 6952 5819 $$SettingsTableAnnotationComposer, 6953 5820 $$SettingsTableCreateCompanionBuilder, 6954 5821 $$SettingsTableUpdateCompanionBuilder, 6955 - ( 6956 - SettingsEntry, 6957 - BaseReferences<_$AppDatabase, $SettingsTable, SettingsEntry>, 6958 - ), 5822 + (SettingsEntry, BaseReferences<_$AppDatabase, $SettingsTable, SettingsEntry>), 6959 5823 SettingsEntry, 6960 5824 PrefetchHooks Function() 6961 5825 >; ··· 6982 5846 Value<int> rowid, 6983 5847 }); 6984 5848 6985 - class $$SavedFeedsTableFilterComposer 6986 - extends Composer<_$AppDatabase, $SavedFeedsTable> { 5849 + class $$SavedFeedsTableFilterComposer extends Composer<_$AppDatabase, $SavedFeedsTable> { 6987 5850 $$SavedFeedsTableFilterComposer({ 6988 5851 required super.$db, 6989 5852 required super.$table, ··· 6991 5854 super.$addJoinBuilderToRootComposer, 6992 5855 super.$removeJoinBuilderFromRootComposer, 6993 5856 }); 6994 - ColumnFilters<String> get id => $composableBuilder( 6995 - column: $table.id, 6996 - builder: (column) => ColumnFilters(column), 6997 - ); 5857 + ColumnFilters<String> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); 6998 5858 6999 - ColumnFilters<String> get accountDid => $composableBuilder( 7000 - column: $table.accountDid, 7001 - builder: (column) => ColumnFilters(column), 7002 - ); 5859 + ColumnFilters<String> get accountDid => 5860 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 7003 5861 7004 - ColumnFilters<String> get type => $composableBuilder( 7005 - column: $table.type, 7006 - builder: (column) => ColumnFilters(column), 7007 - ); 5862 + ColumnFilters<String> get type => $composableBuilder(column: $table.type, builder: (column) => ColumnFilters(column)); 7008 5863 7009 - ColumnFilters<String> get value => $composableBuilder( 7010 - column: $table.value, 7011 - builder: (column) => ColumnFilters(column), 7012 - ); 5864 + ColumnFilters<String> get value => 5865 + $composableBuilder(column: $table.value, builder: (column) => ColumnFilters(column)); 7013 5866 7014 - ColumnFilters<bool> get pinned => $composableBuilder( 7015 - column: $table.pinned, 7016 - builder: (column) => ColumnFilters(column), 7017 - ); 5867 + ColumnFilters<bool> get pinned => 5868 + $composableBuilder(column: $table.pinned, builder: (column) => ColumnFilters(column)); 7018 5869 7019 - ColumnFilters<int> get sortOrder => $composableBuilder( 7020 - column: $table.sortOrder, 7021 - builder: (column) => ColumnFilters(column), 7022 - ); 5870 + ColumnFilters<int> get sortOrder => 5871 + $composableBuilder(column: $table.sortOrder, builder: (column) => ColumnFilters(column)); 7023 5872 7024 - ColumnFilters<DateTime> get updatedAt => $composableBuilder( 7025 - column: $table.updatedAt, 7026 - builder: (column) => ColumnFilters(column), 7027 - ); 5873 + ColumnFilters<DateTime> get updatedAt => 5874 + $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnFilters(column)); 7028 5875 } 7029 5876 7030 - class $$SavedFeedsTableOrderingComposer 7031 - extends Composer<_$AppDatabase, $SavedFeedsTable> { 5877 + class $$SavedFeedsTableOrderingComposer extends Composer<_$AppDatabase, $SavedFeedsTable> { 7032 5878 $$SavedFeedsTableOrderingComposer({ 7033 5879 required super.$db, 7034 5880 required super.$table, ··· 7036 5882 super.$addJoinBuilderToRootComposer, 7037 5883 super.$removeJoinBuilderFromRootComposer, 7038 5884 }); 7039 - ColumnOrderings<String> get id => $composableBuilder( 7040 - column: $table.id, 7041 - builder: (column) => ColumnOrderings(column), 7042 - ); 5885 + ColumnOrderings<String> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); 7043 5886 7044 - ColumnOrderings<String> get accountDid => $composableBuilder( 7045 - column: $table.accountDid, 7046 - builder: (column) => ColumnOrderings(column), 7047 - ); 5887 + ColumnOrderings<String> get accountDid => 5888 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 7048 5889 7049 - ColumnOrderings<String> get type => $composableBuilder( 7050 - column: $table.type, 7051 - builder: (column) => ColumnOrderings(column), 7052 - ); 5890 + ColumnOrderings<String> get type => 5891 + $composableBuilder(column: $table.type, builder: (column) => ColumnOrderings(column)); 7053 5892 7054 - ColumnOrderings<String> get value => $composableBuilder( 7055 - column: $table.value, 7056 - builder: (column) => ColumnOrderings(column), 7057 - ); 5893 + ColumnOrderings<String> get value => 5894 + $composableBuilder(column: $table.value, builder: (column) => ColumnOrderings(column)); 7058 5895 7059 - ColumnOrderings<bool> get pinned => $composableBuilder( 7060 - column: $table.pinned, 7061 - builder: (column) => ColumnOrderings(column), 7062 - ); 5896 + ColumnOrderings<bool> get pinned => 5897 + $composableBuilder(column: $table.pinned, builder: (column) => ColumnOrderings(column)); 7063 5898 7064 - ColumnOrderings<int> get sortOrder => $composableBuilder( 7065 - column: $table.sortOrder, 7066 - builder: (column) => ColumnOrderings(column), 7067 - ); 5899 + ColumnOrderings<int> get sortOrder => 5900 + $composableBuilder(column: $table.sortOrder, builder: (column) => ColumnOrderings(column)); 7068 5901 7069 - ColumnOrderings<DateTime> get updatedAt => $composableBuilder( 7070 - column: $table.updatedAt, 7071 - builder: (column) => ColumnOrderings(column), 7072 - ); 5902 + ColumnOrderings<DateTime> get updatedAt => 5903 + $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); 7073 5904 } 7074 5905 7075 - class $$SavedFeedsTableAnnotationComposer 7076 - extends Composer<_$AppDatabase, $SavedFeedsTable> { 5906 + class $$SavedFeedsTableAnnotationComposer extends Composer<_$AppDatabase, $SavedFeedsTable> { 7077 5907 $$SavedFeedsTableAnnotationComposer({ 7078 5908 required super.$db, 7079 5909 required super.$table, ··· 7081 5911 super.$addJoinBuilderToRootComposer, 7082 5912 super.$removeJoinBuilderFromRootComposer, 7083 5913 }); 7084 - GeneratedColumn<String> get id => 7085 - $composableBuilder(column: $table.id, builder: (column) => column); 5914 + GeneratedColumn<String> get id => $composableBuilder(column: $table.id, builder: (column) => column); 7086 5915 7087 - GeneratedColumn<String> get accountDid => $composableBuilder( 7088 - column: $table.accountDid, 7089 - builder: (column) => column, 7090 - ); 5916 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 7091 5917 7092 - GeneratedColumn<String> get type => 7093 - $composableBuilder(column: $table.type, builder: (column) => column); 5918 + GeneratedColumn<String> get type => $composableBuilder(column: $table.type, builder: (column) => column); 7094 5919 7095 - GeneratedColumn<String> get value => 7096 - $composableBuilder(column: $table.value, builder: (column) => column); 5920 + GeneratedColumn<String> get value => $composableBuilder(column: $table.value, builder: (column) => column); 7097 5921 7098 - GeneratedColumn<bool> get pinned => 7099 - $composableBuilder(column: $table.pinned, builder: (column) => column); 5922 + GeneratedColumn<bool> get pinned => $composableBuilder(column: $table.pinned, builder: (column) => column); 7100 5923 7101 - GeneratedColumn<int> get sortOrder => 7102 - $composableBuilder(column: $table.sortOrder, builder: (column) => column); 5924 + GeneratedColumn<int> get sortOrder => $composableBuilder(column: $table.sortOrder, builder: (column) => column); 7103 5925 7104 - GeneratedColumn<DateTime> get updatedAt => 7105 - $composableBuilder(column: $table.updatedAt, builder: (column) => column); 5926 + GeneratedColumn<DateTime> get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); 7106 5927 } 7107 5928 7108 5929 class $$SavedFeedsTableTableManager ··· 7116 5937 $$SavedFeedsTableAnnotationComposer, 7117 5938 $$SavedFeedsTableCreateCompanionBuilder, 7118 5939 $$SavedFeedsTableUpdateCompanionBuilder, 7119 - ( 7120 - SavedFeedEntry, 7121 - BaseReferences<_$AppDatabase, $SavedFeedsTable, SavedFeedEntry>, 7122 - ), 5940 + (SavedFeedEntry, BaseReferences<_$AppDatabase, $SavedFeedsTable, SavedFeedEntry>), 7123 5941 SavedFeedEntry, 7124 5942 PrefetchHooks Function() 7125 5943 > { ··· 7128 5946 TableManagerState( 7129 5947 db: db, 7130 5948 table: table, 7131 - createFilteringComposer: () => 7132 - $$SavedFeedsTableFilterComposer($db: db, $table: table), 7133 - createOrderingComposer: () => 7134 - $$SavedFeedsTableOrderingComposer($db: db, $table: table), 7135 - createComputedFieldComposer: () => 7136 - $$SavedFeedsTableAnnotationComposer($db: db, $table: table), 5949 + createFilteringComposer: () => $$SavedFeedsTableFilterComposer($db: db, $table: table), 5950 + createOrderingComposer: () => $$SavedFeedsTableOrderingComposer($db: db, $table: table), 5951 + createComputedFieldComposer: () => $$SavedFeedsTableAnnotationComposer($db: db, $table: table), 7137 5952 updateCompanionCallback: 7138 5953 ({ 7139 5954 Value<String> id = const Value.absent(), ··· 7174 5989 updatedAt: updatedAt, 7175 5990 rowid: rowid, 7176 5991 ), 7177 - withReferenceMapper: (p0) => p0 7178 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 7179 - .toList(), 5992 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 7180 5993 prefetchHooksCallback: null, 7181 5994 ), 7182 5995 ); ··· 7192 6005 $$SavedFeedsTableAnnotationComposer, 7193 6006 $$SavedFeedsTableCreateCompanionBuilder, 7194 6007 $$SavedFeedsTableUpdateCompanionBuilder, 7195 - ( 7196 - SavedFeedEntry, 7197 - BaseReferences<_$AppDatabase, $SavedFeedsTable, SavedFeedEntry>, 7198 - ), 6008 + (SavedFeedEntry, BaseReferences<_$AppDatabase, $SavedFeedsTable, SavedFeedEntry>), 7199 6009 SavedFeedEntry, 7200 6010 PrefetchHooks Function() 7201 6011 >; ··· 7216 6026 Value<int> rowid, 7217 6027 }); 7218 6028 7219 - class $$CachedFeedPagesTableFilterComposer 7220 - extends Composer<_$AppDatabase, $CachedFeedPagesTable> { 6029 + class $$CachedFeedPagesTableFilterComposer extends Composer<_$AppDatabase, $CachedFeedPagesTable> { 7221 6030 $$CachedFeedPagesTableFilterComposer({ 7222 6031 required super.$db, 7223 6032 required super.$table, ··· 7225 6034 super.$addJoinBuilderToRootComposer, 7226 6035 super.$removeJoinBuilderFromRootComposer, 7227 6036 }); 7228 - ColumnFilters<String> get accountDid => $composableBuilder( 7229 - column: $table.accountDid, 7230 - builder: (column) => ColumnFilters(column), 7231 - ); 6037 + ColumnFilters<String> get accountDid => 6038 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 7232 6039 7233 - ColumnFilters<String> get feedKey => $composableBuilder( 7234 - column: $table.feedKey, 7235 - builder: (column) => ColumnFilters(column), 7236 - ); 6040 + ColumnFilters<String> get feedKey => 6041 + $composableBuilder(column: $table.feedKey, builder: (column) => ColumnFilters(column)); 7237 6042 7238 - ColumnFilters<String> get payload => $composableBuilder( 7239 - column: $table.payload, 7240 - builder: (column) => ColumnFilters(column), 7241 - ); 6043 + ColumnFilters<String> get payload => 6044 + $composableBuilder(column: $table.payload, builder: (column) => ColumnFilters(column)); 7242 6045 7243 - ColumnFilters<DateTime> get fetchedAt => $composableBuilder( 7244 - column: $table.fetchedAt, 7245 - builder: (column) => ColumnFilters(column), 7246 - ); 6046 + ColumnFilters<DateTime> get fetchedAt => 6047 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnFilters(column)); 7247 6048 } 7248 6049 7249 - class $$CachedFeedPagesTableOrderingComposer 7250 - extends Composer<_$AppDatabase, $CachedFeedPagesTable> { 6050 + class $$CachedFeedPagesTableOrderingComposer extends Composer<_$AppDatabase, $CachedFeedPagesTable> { 7251 6051 $$CachedFeedPagesTableOrderingComposer({ 7252 6052 required super.$db, 7253 6053 required super.$table, ··· 7255 6055 super.$addJoinBuilderToRootComposer, 7256 6056 super.$removeJoinBuilderFromRootComposer, 7257 6057 }); 7258 - ColumnOrderings<String> get accountDid => $composableBuilder( 7259 - column: $table.accountDid, 7260 - builder: (column) => ColumnOrderings(column), 7261 - ); 6058 + ColumnOrderings<String> get accountDid => 6059 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 7262 6060 7263 - ColumnOrderings<String> get feedKey => $composableBuilder( 7264 - column: $table.feedKey, 7265 - builder: (column) => ColumnOrderings(column), 7266 - ); 6061 + ColumnOrderings<String> get feedKey => 6062 + $composableBuilder(column: $table.feedKey, builder: (column) => ColumnOrderings(column)); 7267 6063 7268 - ColumnOrderings<String> get payload => $composableBuilder( 7269 - column: $table.payload, 7270 - builder: (column) => ColumnOrderings(column), 7271 - ); 6064 + ColumnOrderings<String> get payload => 6065 + $composableBuilder(column: $table.payload, builder: (column) => ColumnOrderings(column)); 7272 6066 7273 - ColumnOrderings<DateTime> get fetchedAt => $composableBuilder( 7274 - column: $table.fetchedAt, 7275 - builder: (column) => ColumnOrderings(column), 7276 - ); 6067 + ColumnOrderings<DateTime> get fetchedAt => 6068 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnOrderings(column)); 7277 6069 } 7278 6070 7279 - class $$CachedFeedPagesTableAnnotationComposer 7280 - extends Composer<_$AppDatabase, $CachedFeedPagesTable> { 6071 + class $$CachedFeedPagesTableAnnotationComposer extends Composer<_$AppDatabase, $CachedFeedPagesTable> { 7281 6072 $$CachedFeedPagesTableAnnotationComposer({ 7282 6073 required super.$db, 7283 6074 required super.$table, ··· 7285 6076 super.$addJoinBuilderToRootComposer, 7286 6077 super.$removeJoinBuilderFromRootComposer, 7287 6078 }); 7288 - GeneratedColumn<String> get accountDid => $composableBuilder( 7289 - column: $table.accountDid, 7290 - builder: (column) => column, 7291 - ); 6079 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 7292 6080 7293 - GeneratedColumn<String> get feedKey => 7294 - $composableBuilder(column: $table.feedKey, builder: (column) => column); 6081 + GeneratedColumn<String> get feedKey => $composableBuilder(column: $table.feedKey, builder: (column) => column); 7295 6082 7296 - GeneratedColumn<String> get payload => 7297 - $composableBuilder(column: $table.payload, builder: (column) => column); 6083 + GeneratedColumn<String> get payload => $composableBuilder(column: $table.payload, builder: (column) => column); 7298 6084 7299 - GeneratedColumn<DateTime> get fetchedAt => 7300 - $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 6085 + GeneratedColumn<DateTime> get fetchedAt => $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 7301 6086 } 7302 6087 7303 6088 class $$CachedFeedPagesTableTableManager ··· 7311 6096 $$CachedFeedPagesTableAnnotationComposer, 7312 6097 $$CachedFeedPagesTableCreateCompanionBuilder, 7313 6098 $$CachedFeedPagesTableUpdateCompanionBuilder, 7314 - ( 7315 - CachedFeedPage, 7316 - BaseReferences< 7317 - _$AppDatabase, 7318 - $CachedFeedPagesTable, 7319 - CachedFeedPage 7320 - >, 7321 - ), 6099 + (CachedFeedPage, BaseReferences<_$AppDatabase, $CachedFeedPagesTable, CachedFeedPage>), 7322 6100 CachedFeedPage, 7323 6101 PrefetchHooks Function() 7324 6102 > { 7325 - $$CachedFeedPagesTableTableManager( 7326 - _$AppDatabase db, 7327 - $CachedFeedPagesTable table, 7328 - ) : super( 6103 + $$CachedFeedPagesTableTableManager(_$AppDatabase db, $CachedFeedPagesTable table) 6104 + : super( 7329 6105 TableManagerState( 7330 6106 db: db, 7331 6107 table: table, 7332 - createFilteringComposer: () => 7333 - $$CachedFeedPagesTableFilterComposer($db: db, $table: table), 7334 - createOrderingComposer: () => 7335 - $$CachedFeedPagesTableOrderingComposer($db: db, $table: table), 7336 - createComputedFieldComposer: () => 7337 - $$CachedFeedPagesTableAnnotationComposer($db: db, $table: table), 6108 + createFilteringComposer: () => $$CachedFeedPagesTableFilterComposer($db: db, $table: table), 6109 + createOrderingComposer: () => $$CachedFeedPagesTableOrderingComposer($db: db, $table: table), 6110 + createComputedFieldComposer: () => $$CachedFeedPagesTableAnnotationComposer($db: db, $table: table), 7338 6111 updateCompanionCallback: 7339 6112 ({ 7340 6113 Value<String> accountDid = const Value.absent(), ··· 7363 6136 fetchedAt: fetchedAt, 7364 6137 rowid: rowid, 7365 6138 ), 7366 - withReferenceMapper: (p0) => p0 7367 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 7368 - .toList(), 6139 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 7369 6140 prefetchHooksCallback: null, 7370 6141 ), 7371 6142 ); ··· 7381 6152 $$CachedFeedPagesTableAnnotationComposer, 7382 6153 $$CachedFeedPagesTableCreateCompanionBuilder, 7383 6154 $$CachedFeedPagesTableUpdateCompanionBuilder, 7384 - ( 7385 - CachedFeedPage, 7386 - BaseReferences<_$AppDatabase, $CachedFeedPagesTable, CachedFeedPage>, 7387 - ), 6155 + (CachedFeedPage, BaseReferences<_$AppDatabase, $CachedFeedPagesTable, CachedFeedPage>), 7388 6156 CachedFeedPage, 7389 6157 PrefetchHooks Function() 7390 6158 >; ··· 7409 6177 Value<int> rowid, 7410 6178 }); 7411 6179 7412 - class $$CachedFeedPostsTableFilterComposer 7413 - extends Composer<_$AppDatabase, $CachedFeedPostsTable> { 6180 + class $$CachedFeedPostsTableFilterComposer extends Composer<_$AppDatabase, $CachedFeedPostsTable> { 7414 6181 $$CachedFeedPostsTableFilterComposer({ 7415 6182 required super.$db, 7416 6183 required super.$table, ··· 7418 6185 super.$addJoinBuilderToRootComposer, 7419 6186 super.$removeJoinBuilderFromRootComposer, 7420 6187 }); 7421 - ColumnFilters<String> get accountDid => $composableBuilder( 7422 - column: $table.accountDid, 7423 - builder: (column) => ColumnFilters(column), 7424 - ); 6188 + ColumnFilters<String> get accountDid => 6189 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 7425 6190 7426 - ColumnFilters<String> get feedKey => $composableBuilder( 7427 - column: $table.feedKey, 7428 - builder: (column) => ColumnFilters(column), 7429 - ); 6191 + ColumnFilters<String> get feedKey => 6192 + $composableBuilder(column: $table.feedKey, builder: (column) => ColumnFilters(column)); 7430 6193 7431 - ColumnFilters<String> get postUri => $composableBuilder( 7432 - column: $table.postUri, 7433 - builder: (column) => ColumnFilters(column), 7434 - ); 6194 + ColumnFilters<String> get postUri => 6195 + $composableBuilder(column: $table.postUri, builder: (column) => ColumnFilters(column)); 7435 6196 7436 - ColumnFilters<String> get postJson => $composableBuilder( 7437 - column: $table.postJson, 7438 - builder: (column) => ColumnFilters(column), 7439 - ); 6197 + ColumnFilters<String> get postJson => 6198 + $composableBuilder(column: $table.postJson, builder: (column) => ColumnFilters(column)); 7440 6199 7441 - ColumnFilters<int> get sortOrder => $composableBuilder( 7442 - column: $table.sortOrder, 7443 - builder: (column) => ColumnFilters(column), 7444 - ); 6200 + ColumnFilters<int> get sortOrder => 6201 + $composableBuilder(column: $table.sortOrder, builder: (column) => ColumnFilters(column)); 7445 6202 7446 - ColumnFilters<DateTime> get fetchedAt => $composableBuilder( 7447 - column: $table.fetchedAt, 7448 - builder: (column) => ColumnFilters(column), 7449 - ); 6203 + ColumnFilters<DateTime> get fetchedAt => 6204 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnFilters(column)); 7450 6205 } 7451 6206 7452 - class $$CachedFeedPostsTableOrderingComposer 7453 - extends Composer<_$AppDatabase, $CachedFeedPostsTable> { 6207 + class $$CachedFeedPostsTableOrderingComposer extends Composer<_$AppDatabase, $CachedFeedPostsTable> { 7454 6208 $$CachedFeedPostsTableOrderingComposer({ 7455 6209 required super.$db, 7456 6210 required super.$table, ··· 7458 6212 super.$addJoinBuilderToRootComposer, 7459 6213 super.$removeJoinBuilderFromRootComposer, 7460 6214 }); 7461 - ColumnOrderings<String> get accountDid => $composableBuilder( 7462 - column: $table.accountDid, 7463 - builder: (column) => ColumnOrderings(column), 7464 - ); 6215 + ColumnOrderings<String> get accountDid => 6216 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 7465 6217 7466 - ColumnOrderings<String> get feedKey => $composableBuilder( 7467 - column: $table.feedKey, 7468 - builder: (column) => ColumnOrderings(column), 7469 - ); 6218 + ColumnOrderings<String> get feedKey => 6219 + $composableBuilder(column: $table.feedKey, builder: (column) => ColumnOrderings(column)); 7470 6220 7471 - ColumnOrderings<String> get postUri => $composableBuilder( 7472 - column: $table.postUri, 7473 - builder: (column) => ColumnOrderings(column), 7474 - ); 6221 + ColumnOrderings<String> get postUri => 6222 + $composableBuilder(column: $table.postUri, builder: (column) => ColumnOrderings(column)); 7475 6223 7476 - ColumnOrderings<String> get postJson => $composableBuilder( 7477 - column: $table.postJson, 7478 - builder: (column) => ColumnOrderings(column), 7479 - ); 6224 + ColumnOrderings<String> get postJson => 6225 + $composableBuilder(column: $table.postJson, builder: (column) => ColumnOrderings(column)); 7480 6226 7481 - ColumnOrderings<int> get sortOrder => $composableBuilder( 7482 - column: $table.sortOrder, 7483 - builder: (column) => ColumnOrderings(column), 7484 - ); 6227 + ColumnOrderings<int> get sortOrder => 6228 + $composableBuilder(column: $table.sortOrder, builder: (column) => ColumnOrderings(column)); 7485 6229 7486 - ColumnOrderings<DateTime> get fetchedAt => $composableBuilder( 7487 - column: $table.fetchedAt, 7488 - builder: (column) => ColumnOrderings(column), 7489 - ); 6230 + ColumnOrderings<DateTime> get fetchedAt => 6231 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnOrderings(column)); 7490 6232 } 7491 6233 7492 - class $$CachedFeedPostsTableAnnotationComposer 7493 - extends Composer<_$AppDatabase, $CachedFeedPostsTable> { 6234 + class $$CachedFeedPostsTableAnnotationComposer extends Composer<_$AppDatabase, $CachedFeedPostsTable> { 7494 6235 $$CachedFeedPostsTableAnnotationComposer({ 7495 6236 required super.$db, 7496 6237 required super.$table, ··· 7498 6239 super.$addJoinBuilderToRootComposer, 7499 6240 super.$removeJoinBuilderFromRootComposer, 7500 6241 }); 7501 - GeneratedColumn<String> get accountDid => $composableBuilder( 7502 - column: $table.accountDid, 7503 - builder: (column) => column, 7504 - ); 6242 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 7505 6243 7506 - GeneratedColumn<String> get feedKey => 7507 - $composableBuilder(column: $table.feedKey, builder: (column) => column); 6244 + GeneratedColumn<String> get feedKey => $composableBuilder(column: $table.feedKey, builder: (column) => column); 7508 6245 7509 - GeneratedColumn<String> get postUri => 7510 - $composableBuilder(column: $table.postUri, builder: (column) => column); 6246 + GeneratedColumn<String> get postUri => $composableBuilder(column: $table.postUri, builder: (column) => column); 7511 6247 7512 - GeneratedColumn<String> get postJson => 7513 - $composableBuilder(column: $table.postJson, builder: (column) => column); 6248 + GeneratedColumn<String> get postJson => $composableBuilder(column: $table.postJson, builder: (column) => column); 7514 6249 7515 - GeneratedColumn<int> get sortOrder => 7516 - $composableBuilder(column: $table.sortOrder, builder: (column) => column); 6250 + GeneratedColumn<int> get sortOrder => $composableBuilder(column: $table.sortOrder, builder: (column) => column); 7517 6251 7518 - GeneratedColumn<DateTime> get fetchedAt => 7519 - $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 6252 + GeneratedColumn<DateTime> get fetchedAt => $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 7520 6253 } 7521 6254 7522 6255 class $$CachedFeedPostsTableTableManager ··· 7530 6263 $$CachedFeedPostsTableAnnotationComposer, 7531 6264 $$CachedFeedPostsTableCreateCompanionBuilder, 7532 6265 $$CachedFeedPostsTableUpdateCompanionBuilder, 7533 - ( 7534 - CachedFeedPost, 7535 - BaseReferences< 7536 - _$AppDatabase, 7537 - $CachedFeedPostsTable, 7538 - CachedFeedPost 7539 - >, 7540 - ), 6266 + (CachedFeedPost, BaseReferences<_$AppDatabase, $CachedFeedPostsTable, CachedFeedPost>), 7541 6267 CachedFeedPost, 7542 6268 PrefetchHooks Function() 7543 6269 > { 7544 - $$CachedFeedPostsTableTableManager( 7545 - _$AppDatabase db, 7546 - $CachedFeedPostsTable table, 7547 - ) : super( 6270 + $$CachedFeedPostsTableTableManager(_$AppDatabase db, $CachedFeedPostsTable table) 6271 + : super( 7548 6272 TableManagerState( 7549 6273 db: db, 7550 6274 table: table, 7551 - createFilteringComposer: () => 7552 - $$CachedFeedPostsTableFilterComposer($db: db, $table: table), 7553 - createOrderingComposer: () => 7554 - $$CachedFeedPostsTableOrderingComposer($db: db, $table: table), 7555 - createComputedFieldComposer: () => 7556 - $$CachedFeedPostsTableAnnotationComposer($db: db, $table: table), 6275 + createFilteringComposer: () => $$CachedFeedPostsTableFilterComposer($db: db, $table: table), 6276 + createOrderingComposer: () => $$CachedFeedPostsTableOrderingComposer($db: db, $table: table), 6277 + createComputedFieldComposer: () => $$CachedFeedPostsTableAnnotationComposer($db: db, $table: table), 7557 6278 updateCompanionCallback: 7558 6279 ({ 7559 6280 Value<String> accountDid = const Value.absent(), ··· 7590 6311 fetchedAt: fetchedAt, 7591 6312 rowid: rowid, 7592 6313 ), 7593 - withReferenceMapper: (p0) => p0 7594 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 7595 - .toList(), 6314 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 7596 6315 prefetchHooksCallback: null, 7597 6316 ), 7598 6317 ); ··· 7608 6327 $$CachedFeedPostsTableAnnotationComposer, 7609 6328 $$CachedFeedPostsTableCreateCompanionBuilder, 7610 6329 $$CachedFeedPostsTableUpdateCompanionBuilder, 7611 - ( 7612 - CachedFeedPost, 7613 - BaseReferences<_$AppDatabase, $CachedFeedPostsTable, CachedFeedPost>, 7614 - ), 6330 + (CachedFeedPost, BaseReferences<_$AppDatabase, $CachedFeedPostsTable, CachedFeedPost>), 7615 6331 CachedFeedPost, 7616 6332 PrefetchHooks Function() 7617 6333 >; ··· 7632 6348 Value<int> rowid, 7633 6349 }); 7634 6350 7635 - class $$CachedThreadRootsTableFilterComposer 7636 - extends Composer<_$AppDatabase, $CachedThreadRootsTable> { 6351 + class $$CachedThreadRootsTableFilterComposer extends Composer<_$AppDatabase, $CachedThreadRootsTable> { 7637 6352 $$CachedThreadRootsTableFilterComposer({ 7638 6353 required super.$db, 7639 6354 required super.$table, ··· 7641 6356 super.$addJoinBuilderToRootComposer, 7642 6357 super.$removeJoinBuilderFromRootComposer, 7643 6358 }); 7644 - ColumnFilters<String> get accountDid => $composableBuilder( 7645 - column: $table.accountDid, 7646 - builder: (column) => ColumnFilters(column), 7647 - ); 6359 + ColumnFilters<String> get accountDid => 6360 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 7648 6361 7649 - ColumnFilters<String> get rootUri => $composableBuilder( 7650 - column: $table.rootUri, 7651 - builder: (column) => ColumnFilters(column), 7652 - ); 6362 + ColumnFilters<String> get rootUri => 6363 + $composableBuilder(column: $table.rootUri, builder: (column) => ColumnFilters(column)); 7653 6364 7654 - ColumnFilters<String> get payload => $composableBuilder( 7655 - column: $table.payload, 7656 - builder: (column) => ColumnFilters(column), 7657 - ); 6365 + ColumnFilters<String> get payload => 6366 + $composableBuilder(column: $table.payload, builder: (column) => ColumnFilters(column)); 7658 6367 7659 - ColumnFilters<DateTime> get fetchedAt => $composableBuilder( 7660 - column: $table.fetchedAt, 7661 - builder: (column) => ColumnFilters(column), 7662 - ); 6368 + ColumnFilters<DateTime> get fetchedAt => 6369 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnFilters(column)); 7663 6370 } 7664 6371 7665 - class $$CachedThreadRootsTableOrderingComposer 7666 - extends Composer<_$AppDatabase, $CachedThreadRootsTable> { 6372 + class $$CachedThreadRootsTableOrderingComposer extends Composer<_$AppDatabase, $CachedThreadRootsTable> { 7667 6373 $$CachedThreadRootsTableOrderingComposer({ 7668 6374 required super.$db, 7669 6375 required super.$table, ··· 7671 6377 super.$addJoinBuilderToRootComposer, 7672 6378 super.$removeJoinBuilderFromRootComposer, 7673 6379 }); 7674 - ColumnOrderings<String> get accountDid => $composableBuilder( 7675 - column: $table.accountDid, 7676 - builder: (column) => ColumnOrderings(column), 7677 - ); 6380 + ColumnOrderings<String> get accountDid => 6381 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 7678 6382 7679 - ColumnOrderings<String> get rootUri => $composableBuilder( 7680 - column: $table.rootUri, 7681 - builder: (column) => ColumnOrderings(column), 7682 - ); 6383 + ColumnOrderings<String> get rootUri => 6384 + $composableBuilder(column: $table.rootUri, builder: (column) => ColumnOrderings(column)); 7683 6385 7684 - ColumnOrderings<String> get payload => $composableBuilder( 7685 - column: $table.payload, 7686 - builder: (column) => ColumnOrderings(column), 7687 - ); 6386 + ColumnOrderings<String> get payload => 6387 + $composableBuilder(column: $table.payload, builder: (column) => ColumnOrderings(column)); 7688 6388 7689 - ColumnOrderings<DateTime> get fetchedAt => $composableBuilder( 7690 - column: $table.fetchedAt, 7691 - builder: (column) => ColumnOrderings(column), 7692 - ); 6389 + ColumnOrderings<DateTime> get fetchedAt => 6390 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnOrderings(column)); 7693 6391 } 7694 6392 7695 - class $$CachedThreadRootsTableAnnotationComposer 7696 - extends Composer<_$AppDatabase, $CachedThreadRootsTable> { 6393 + class $$CachedThreadRootsTableAnnotationComposer extends Composer<_$AppDatabase, $CachedThreadRootsTable> { 7697 6394 $$CachedThreadRootsTableAnnotationComposer({ 7698 6395 required super.$db, 7699 6396 required super.$table, ··· 7701 6398 super.$addJoinBuilderToRootComposer, 7702 6399 super.$removeJoinBuilderFromRootComposer, 7703 6400 }); 7704 - GeneratedColumn<String> get accountDid => $composableBuilder( 7705 - column: $table.accountDid, 7706 - builder: (column) => column, 7707 - ); 6401 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 7708 6402 7709 - GeneratedColumn<String> get rootUri => 7710 - $composableBuilder(column: $table.rootUri, builder: (column) => column); 6403 + GeneratedColumn<String> get rootUri => $composableBuilder(column: $table.rootUri, builder: (column) => column); 7711 6404 7712 - GeneratedColumn<String> get payload => 7713 - $composableBuilder(column: $table.payload, builder: (column) => column); 6405 + GeneratedColumn<String> get payload => $composableBuilder(column: $table.payload, builder: (column) => column); 7714 6406 7715 - GeneratedColumn<DateTime> get fetchedAt => 7716 - $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 6407 + GeneratedColumn<DateTime> get fetchedAt => $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 7717 6408 } 7718 6409 7719 6410 class $$CachedThreadRootsTableTableManager ··· 7727 6418 $$CachedThreadRootsTableAnnotationComposer, 7728 6419 $$CachedThreadRootsTableCreateCompanionBuilder, 7729 6420 $$CachedThreadRootsTableUpdateCompanionBuilder, 7730 - ( 7731 - CachedThreadRoot, 7732 - BaseReferences< 7733 - _$AppDatabase, 7734 - $CachedThreadRootsTable, 7735 - CachedThreadRoot 7736 - >, 7737 - ), 6421 + (CachedThreadRoot, BaseReferences<_$AppDatabase, $CachedThreadRootsTable, CachedThreadRoot>), 7738 6422 CachedThreadRoot, 7739 6423 PrefetchHooks Function() 7740 6424 > { 7741 - $$CachedThreadRootsTableTableManager( 7742 - _$AppDatabase db, 7743 - $CachedThreadRootsTable table, 7744 - ) : super( 6425 + $$CachedThreadRootsTableTableManager(_$AppDatabase db, $CachedThreadRootsTable table) 6426 + : super( 7745 6427 TableManagerState( 7746 6428 db: db, 7747 6429 table: table, 7748 - createFilteringComposer: () => 7749 - $$CachedThreadRootsTableFilterComposer($db: db, $table: table), 7750 - createOrderingComposer: () => 7751 - $$CachedThreadRootsTableOrderingComposer($db: db, $table: table), 7752 - createComputedFieldComposer: () => 7753 - $$CachedThreadRootsTableAnnotationComposer( 7754 - $db: db, 7755 - $table: table, 7756 - ), 6430 + createFilteringComposer: () => $$CachedThreadRootsTableFilterComposer($db: db, $table: table), 6431 + createOrderingComposer: () => $$CachedThreadRootsTableOrderingComposer($db: db, $table: table), 6432 + createComputedFieldComposer: () => $$CachedThreadRootsTableAnnotationComposer($db: db, $table: table), 7757 6433 updateCompanionCallback: 7758 6434 ({ 7759 6435 Value<String> accountDid = const Value.absent(), ··· 7782 6458 fetchedAt: fetchedAt, 7783 6459 rowid: rowid, 7784 6460 ), 7785 - withReferenceMapper: (p0) => p0 7786 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 7787 - .toList(), 6461 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 7788 6462 prefetchHooksCallback: null, 7789 6463 ), 7790 6464 ); ··· 7800 6474 $$CachedThreadRootsTableAnnotationComposer, 7801 6475 $$CachedThreadRootsTableCreateCompanionBuilder, 7802 6476 $$CachedThreadRootsTableUpdateCompanionBuilder, 7803 - ( 7804 - CachedThreadRoot, 7805 - BaseReferences< 7806 - _$AppDatabase, 7807 - $CachedThreadRootsTable, 7808 - CachedThreadRoot 7809 - >, 7810 - ), 6477 + (CachedThreadRoot, BaseReferences<_$AppDatabase, $CachedThreadRootsTable, CachedThreadRoot>), 7811 6478 CachedThreadRoot, 7812 6479 PrefetchHooks Function() 7813 6480 >; ··· 7828 6495 Value<String> accountDid, 7829 6496 }); 7830 6497 7831 - class $$SearchHistoryTableFilterComposer 7832 - extends Composer<_$AppDatabase, $SearchHistoryTable> { 6498 + class $$SearchHistoryTableFilterComposer extends Composer<_$AppDatabase, $SearchHistoryTable> { 7833 6499 $$SearchHistoryTableFilterComposer({ 7834 6500 required super.$db, 7835 6501 required super.$table, ··· 7837 6503 super.$addJoinBuilderToRootComposer, 7838 6504 super.$removeJoinBuilderFromRootComposer, 7839 6505 }); 7840 - ColumnFilters<int> get id => $composableBuilder( 7841 - column: $table.id, 7842 - builder: (column) => ColumnFilters(column), 7843 - ); 6506 + ColumnFilters<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); 7844 6507 7845 - ColumnFilters<String> get query => $composableBuilder( 7846 - column: $table.query, 7847 - builder: (column) => ColumnFilters(column), 7848 - ); 6508 + ColumnFilters<String> get query => 6509 + $composableBuilder(column: $table.query, builder: (column) => ColumnFilters(column)); 7849 6510 7850 - ColumnFilters<String> get type => $composableBuilder( 7851 - column: $table.type, 7852 - builder: (column) => ColumnFilters(column), 7853 - ); 6511 + ColumnFilters<String> get type => $composableBuilder(column: $table.type, builder: (column) => ColumnFilters(column)); 7854 6512 7855 - ColumnFilters<DateTime> get searchedAt => $composableBuilder( 7856 - column: $table.searchedAt, 7857 - builder: (column) => ColumnFilters(column), 7858 - ); 6513 + ColumnFilters<DateTime> get searchedAt => 6514 + $composableBuilder(column: $table.searchedAt, builder: (column) => ColumnFilters(column)); 7859 6515 7860 - ColumnFilters<String> get accountDid => $composableBuilder( 7861 - column: $table.accountDid, 7862 - builder: (column) => ColumnFilters(column), 7863 - ); 6516 + ColumnFilters<String> get accountDid => 6517 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 7864 6518 } 7865 6519 7866 - class $$SearchHistoryTableOrderingComposer 7867 - extends Composer<_$AppDatabase, $SearchHistoryTable> { 6520 + class $$SearchHistoryTableOrderingComposer extends Composer<_$AppDatabase, $SearchHistoryTable> { 7868 6521 $$SearchHistoryTableOrderingComposer({ 7869 6522 required super.$db, 7870 6523 required super.$table, ··· 7872 6525 super.$addJoinBuilderToRootComposer, 7873 6526 super.$removeJoinBuilderFromRootComposer, 7874 6527 }); 7875 - ColumnOrderings<int> get id => $composableBuilder( 7876 - column: $table.id, 7877 - builder: (column) => ColumnOrderings(column), 7878 - ); 6528 + ColumnOrderings<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); 7879 6529 7880 - ColumnOrderings<String> get query => $composableBuilder( 7881 - column: $table.query, 7882 - builder: (column) => ColumnOrderings(column), 7883 - ); 6530 + ColumnOrderings<String> get query => 6531 + $composableBuilder(column: $table.query, builder: (column) => ColumnOrderings(column)); 7884 6532 7885 - ColumnOrderings<String> get type => $composableBuilder( 7886 - column: $table.type, 7887 - builder: (column) => ColumnOrderings(column), 7888 - ); 6533 + ColumnOrderings<String> get type => 6534 + $composableBuilder(column: $table.type, builder: (column) => ColumnOrderings(column)); 7889 6535 7890 - ColumnOrderings<DateTime> get searchedAt => $composableBuilder( 7891 - column: $table.searchedAt, 7892 - builder: (column) => ColumnOrderings(column), 7893 - ); 6536 + ColumnOrderings<DateTime> get searchedAt => 6537 + $composableBuilder(column: $table.searchedAt, builder: (column) => ColumnOrderings(column)); 7894 6538 7895 - ColumnOrderings<String> get accountDid => $composableBuilder( 7896 - column: $table.accountDid, 7897 - builder: (column) => ColumnOrderings(column), 7898 - ); 6539 + ColumnOrderings<String> get accountDid => 6540 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 7899 6541 } 7900 6542 7901 - class $$SearchHistoryTableAnnotationComposer 7902 - extends Composer<_$AppDatabase, $SearchHistoryTable> { 6543 + class $$SearchHistoryTableAnnotationComposer extends Composer<_$AppDatabase, $SearchHistoryTable> { 7903 6544 $$SearchHistoryTableAnnotationComposer({ 7904 6545 required super.$db, 7905 6546 required super.$table, ··· 7907 6548 super.$addJoinBuilderToRootComposer, 7908 6549 super.$removeJoinBuilderFromRootComposer, 7909 6550 }); 7910 - GeneratedColumn<int> get id => 7911 - $composableBuilder(column: $table.id, builder: (column) => column); 6551 + GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column); 7912 6552 7913 - GeneratedColumn<String> get query => 7914 - $composableBuilder(column: $table.query, builder: (column) => column); 6553 + GeneratedColumn<String> get query => $composableBuilder(column: $table.query, builder: (column) => column); 7915 6554 7916 - GeneratedColumn<String> get type => 7917 - $composableBuilder(column: $table.type, builder: (column) => column); 6555 + GeneratedColumn<String> get type => $composableBuilder(column: $table.type, builder: (column) => column); 7918 6556 7919 - GeneratedColumn<DateTime> get searchedAt => $composableBuilder( 7920 - column: $table.searchedAt, 7921 - builder: (column) => column, 7922 - ); 6557 + GeneratedColumn<DateTime> get searchedAt => 6558 + $composableBuilder(column: $table.searchedAt, builder: (column) => column); 7923 6559 7924 - GeneratedColumn<String> get accountDid => $composableBuilder( 7925 - column: $table.accountDid, 7926 - builder: (column) => column, 7927 - ); 6560 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 7928 6561 } 7929 6562 7930 6563 class $$SearchHistoryTableTableManager ··· 7938 6571 $$SearchHistoryTableAnnotationComposer, 7939 6572 $$SearchHistoryTableCreateCompanionBuilder, 7940 6573 $$SearchHistoryTableUpdateCompanionBuilder, 7941 - ( 7942 - SearchHistoryEntry, 7943 - BaseReferences< 7944 - _$AppDatabase, 7945 - $SearchHistoryTable, 7946 - SearchHistoryEntry 7947 - >, 7948 - ), 6574 + (SearchHistoryEntry, BaseReferences<_$AppDatabase, $SearchHistoryTable, SearchHistoryEntry>), 7949 6575 SearchHistoryEntry, 7950 6576 PrefetchHooks Function() 7951 6577 > { ··· 7954 6580 TableManagerState( 7955 6581 db: db, 7956 6582 table: table, 7957 - createFilteringComposer: () => 7958 - $$SearchHistoryTableFilterComposer($db: db, $table: table), 7959 - createOrderingComposer: () => 7960 - $$SearchHistoryTableOrderingComposer($db: db, $table: table), 7961 - createComputedFieldComposer: () => 7962 - $$SearchHistoryTableAnnotationComposer($db: db, $table: table), 6583 + createFilteringComposer: () => $$SearchHistoryTableFilterComposer($db: db, $table: table), 6584 + createOrderingComposer: () => $$SearchHistoryTableOrderingComposer($db: db, $table: table), 6585 + createComputedFieldComposer: () => $$SearchHistoryTableAnnotationComposer($db: db, $table: table), 7963 6586 updateCompanionCallback: 7964 6587 ({ 7965 6588 Value<int> id = const Value.absent(), ··· 7988 6611 searchedAt: searchedAt, 7989 6612 accountDid: accountDid, 7990 6613 ), 7991 - withReferenceMapper: (p0) => p0 7992 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 7993 - .toList(), 6614 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 7994 6615 prefetchHooksCallback: null, 7995 6616 ), 7996 6617 ); ··· 8006 6627 $$SearchHistoryTableAnnotationComposer, 8007 6628 $$SearchHistoryTableCreateCompanionBuilder, 8008 6629 $$SearchHistoryTableUpdateCompanionBuilder, 8009 - ( 8010 - SearchHistoryEntry, 8011 - BaseReferences<_$AppDatabase, $SearchHistoryTable, SearchHistoryEntry>, 8012 - ), 6630 + (SearchHistoryEntry, BaseReferences<_$AppDatabase, $SearchHistoryTable, SearchHistoryEntry>), 8013 6631 SearchHistoryEntry, 8014 6632 PrefetchHooks Function() 8015 6633 >; ··· 8044 6662 Value<DateTime?> scheduledAt, 8045 6663 }); 8046 6664 8047 - class $$DraftsTableFilterComposer 8048 - extends Composer<_$AppDatabase, $DraftsTable> { 6665 + class $$DraftsTableFilterComposer extends Composer<_$AppDatabase, $DraftsTable> { 8049 6666 $$DraftsTableFilterComposer({ 8050 6667 required super.$db, 8051 6668 required super.$table, ··· 8053 6670 super.$addJoinBuilderToRootComposer, 8054 6671 super.$removeJoinBuilderFromRootComposer, 8055 6672 }); 8056 - ColumnFilters<int> get id => $composableBuilder( 8057 - column: $table.id, 8058 - builder: (column) => ColumnFilters(column), 8059 - ); 6673 + ColumnFilters<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); 8060 6674 8061 - ColumnFilters<String> get accountDid => $composableBuilder( 8062 - column: $table.accountDid, 8063 - builder: (column) => ColumnFilters(column), 8064 - ); 6675 + ColumnFilters<String> get accountDid => 6676 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 8065 6677 8066 - ColumnFilters<String> get content => $composableBuilder( 8067 - column: $table.content, 8068 - builder: (column) => ColumnFilters(column), 8069 - ); 6678 + ColumnFilters<String> get content => 6679 + $composableBuilder(column: $table.content, builder: (column) => ColumnFilters(column)); 8070 6680 8071 - ColumnFilters<String> get replyUri => $composableBuilder( 8072 - column: $table.replyUri, 8073 - builder: (column) => ColumnFilters(column), 8074 - ); 6681 + ColumnFilters<String> get replyUri => 6682 + $composableBuilder(column: $table.replyUri, builder: (column) => ColumnFilters(column)); 8075 6683 8076 - ColumnFilters<String> get replyCid => $composableBuilder( 8077 - column: $table.replyCid, 8078 - builder: (column) => ColumnFilters(column), 8079 - ); 6684 + ColumnFilters<String> get replyCid => 6685 + $composableBuilder(column: $table.replyCid, builder: (column) => ColumnFilters(column)); 8080 6686 8081 - ColumnFilters<String> get rootUri => $composableBuilder( 8082 - column: $table.rootUri, 8083 - builder: (column) => ColumnFilters(column), 8084 - ); 6687 + ColumnFilters<String> get rootUri => 6688 + $composableBuilder(column: $table.rootUri, builder: (column) => ColumnFilters(column)); 8085 6689 8086 - ColumnFilters<String> get rootCid => $composableBuilder( 8087 - column: $table.rootCid, 8088 - builder: (column) => ColumnFilters(column), 8089 - ); 6690 + ColumnFilters<String> get rootCid => 6691 + $composableBuilder(column: $table.rootCid, builder: (column) => ColumnFilters(column)); 8090 6692 8091 - ColumnFilters<String> get embedJson => $composableBuilder( 8092 - column: $table.embedJson, 8093 - builder: (column) => ColumnFilters(column), 8094 - ); 6693 + ColumnFilters<String> get embedJson => 6694 + $composableBuilder(column: $table.embedJson, builder: (column) => ColumnFilters(column)); 8095 6695 8096 - ColumnFilters<String> get mediaPaths => $composableBuilder( 8097 - column: $table.mediaPaths, 8098 - builder: (column) => ColumnFilters(column), 8099 - ); 6696 + ColumnFilters<String> get mediaPaths => 6697 + $composableBuilder(column: $table.mediaPaths, builder: (column) => ColumnFilters(column)); 8100 6698 8101 - ColumnFilters<DateTime> get createdAt => $composableBuilder( 8102 - column: $table.createdAt, 8103 - builder: (column) => ColumnFilters(column), 8104 - ); 6699 + ColumnFilters<DateTime> get createdAt => 6700 + $composableBuilder(column: $table.createdAt, builder: (column) => ColumnFilters(column)); 8105 6701 8106 - ColumnFilters<DateTime> get updatedAt => $composableBuilder( 8107 - column: $table.updatedAt, 8108 - builder: (column) => ColumnFilters(column), 8109 - ); 6702 + ColumnFilters<DateTime> get updatedAt => 6703 + $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnFilters(column)); 8110 6704 8111 - ColumnFilters<DateTime> get scheduledAt => $composableBuilder( 8112 - column: $table.scheduledAt, 8113 - builder: (column) => ColumnFilters(column), 8114 - ); 6705 + ColumnFilters<DateTime> get scheduledAt => 6706 + $composableBuilder(column: $table.scheduledAt, builder: (column) => ColumnFilters(column)); 8115 6707 } 8116 6708 8117 - class $$DraftsTableOrderingComposer 8118 - extends Composer<_$AppDatabase, $DraftsTable> { 6709 + class $$DraftsTableOrderingComposer extends Composer<_$AppDatabase, $DraftsTable> { 8119 6710 $$DraftsTableOrderingComposer({ 8120 6711 required super.$db, 8121 6712 required super.$table, ··· 8123 6714 super.$addJoinBuilderToRootComposer, 8124 6715 super.$removeJoinBuilderFromRootComposer, 8125 6716 }); 8126 - ColumnOrderings<int> get id => $composableBuilder( 8127 - column: $table.id, 8128 - builder: (column) => ColumnOrderings(column), 8129 - ); 6717 + ColumnOrderings<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); 8130 6718 8131 - ColumnOrderings<String> get accountDid => $composableBuilder( 8132 - column: $table.accountDid, 8133 - builder: (column) => ColumnOrderings(column), 8134 - ); 6719 + ColumnOrderings<String> get accountDid => 6720 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 8135 6721 8136 - ColumnOrderings<String> get content => $composableBuilder( 8137 - column: $table.content, 8138 - builder: (column) => ColumnOrderings(column), 8139 - ); 6722 + ColumnOrderings<String> get content => 6723 + $composableBuilder(column: $table.content, builder: (column) => ColumnOrderings(column)); 8140 6724 8141 - ColumnOrderings<String> get replyUri => $composableBuilder( 8142 - column: $table.replyUri, 8143 - builder: (column) => ColumnOrderings(column), 8144 - ); 6725 + ColumnOrderings<String> get replyUri => 6726 + $composableBuilder(column: $table.replyUri, builder: (column) => ColumnOrderings(column)); 8145 6727 8146 - ColumnOrderings<String> get replyCid => $composableBuilder( 8147 - column: $table.replyCid, 8148 - builder: (column) => ColumnOrderings(column), 8149 - ); 6728 + ColumnOrderings<String> get replyCid => 6729 + $composableBuilder(column: $table.replyCid, builder: (column) => ColumnOrderings(column)); 8150 6730 8151 - ColumnOrderings<String> get rootUri => $composableBuilder( 8152 - column: $table.rootUri, 8153 - builder: (column) => ColumnOrderings(column), 8154 - ); 6731 + ColumnOrderings<String> get rootUri => 6732 + $composableBuilder(column: $table.rootUri, builder: (column) => ColumnOrderings(column)); 8155 6733 8156 - ColumnOrderings<String> get rootCid => $composableBuilder( 8157 - column: $table.rootCid, 8158 - builder: (column) => ColumnOrderings(column), 8159 - ); 6734 + ColumnOrderings<String> get rootCid => 6735 + $composableBuilder(column: $table.rootCid, builder: (column) => ColumnOrderings(column)); 8160 6736 8161 - ColumnOrderings<String> get embedJson => $composableBuilder( 8162 - column: $table.embedJson, 8163 - builder: (column) => ColumnOrderings(column), 8164 - ); 6737 + ColumnOrderings<String> get embedJson => 6738 + $composableBuilder(column: $table.embedJson, builder: (column) => ColumnOrderings(column)); 8165 6739 8166 - ColumnOrderings<String> get mediaPaths => $composableBuilder( 8167 - column: $table.mediaPaths, 8168 - builder: (column) => ColumnOrderings(column), 8169 - ); 6740 + ColumnOrderings<String> get mediaPaths => 6741 + $composableBuilder(column: $table.mediaPaths, builder: (column) => ColumnOrderings(column)); 8170 6742 8171 - ColumnOrderings<DateTime> get createdAt => $composableBuilder( 8172 - column: $table.createdAt, 8173 - builder: (column) => ColumnOrderings(column), 8174 - ); 6743 + ColumnOrderings<DateTime> get createdAt => 6744 + $composableBuilder(column: $table.createdAt, builder: (column) => ColumnOrderings(column)); 8175 6745 8176 - ColumnOrderings<DateTime> get updatedAt => $composableBuilder( 8177 - column: $table.updatedAt, 8178 - builder: (column) => ColumnOrderings(column), 8179 - ); 6746 + ColumnOrderings<DateTime> get updatedAt => 6747 + $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnOrderings(column)); 8180 6748 8181 - ColumnOrderings<DateTime> get scheduledAt => $composableBuilder( 8182 - column: $table.scheduledAt, 8183 - builder: (column) => ColumnOrderings(column), 8184 - ); 6749 + ColumnOrderings<DateTime> get scheduledAt => 6750 + $composableBuilder(column: $table.scheduledAt, builder: (column) => ColumnOrderings(column)); 8185 6751 } 8186 6752 8187 - class $$DraftsTableAnnotationComposer 8188 - extends Composer<_$AppDatabase, $DraftsTable> { 6753 + class $$DraftsTableAnnotationComposer extends Composer<_$AppDatabase, $DraftsTable> { 8189 6754 $$DraftsTableAnnotationComposer({ 8190 6755 required super.$db, 8191 6756 required super.$table, ··· 8193 6758 super.$addJoinBuilderToRootComposer, 8194 6759 super.$removeJoinBuilderFromRootComposer, 8195 6760 }); 8196 - GeneratedColumn<int> get id => 8197 - $composableBuilder(column: $table.id, builder: (column) => column); 6761 + GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column); 8198 6762 8199 - GeneratedColumn<String> get accountDid => $composableBuilder( 8200 - column: $table.accountDid, 8201 - builder: (column) => column, 8202 - ); 6763 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 8203 6764 8204 - GeneratedColumn<String> get content => 8205 - $composableBuilder(column: $table.content, builder: (column) => column); 6765 + GeneratedColumn<String> get content => $composableBuilder(column: $table.content, builder: (column) => column); 8206 6766 8207 - GeneratedColumn<String> get replyUri => 8208 - $composableBuilder(column: $table.replyUri, builder: (column) => column); 6767 + GeneratedColumn<String> get replyUri => $composableBuilder(column: $table.replyUri, builder: (column) => column); 8209 6768 8210 - GeneratedColumn<String> get replyCid => 8211 - $composableBuilder(column: $table.replyCid, builder: (column) => column); 6769 + GeneratedColumn<String> get replyCid => $composableBuilder(column: $table.replyCid, builder: (column) => column); 8212 6770 8213 - GeneratedColumn<String> get rootUri => 8214 - $composableBuilder(column: $table.rootUri, builder: (column) => column); 6771 + GeneratedColumn<String> get rootUri => $composableBuilder(column: $table.rootUri, builder: (column) => column); 8215 6772 8216 - GeneratedColumn<String> get rootCid => 8217 - $composableBuilder(column: $table.rootCid, builder: (column) => column); 6773 + GeneratedColumn<String> get rootCid => $composableBuilder(column: $table.rootCid, builder: (column) => column); 8218 6774 8219 - GeneratedColumn<String> get embedJson => 8220 - $composableBuilder(column: $table.embedJson, builder: (column) => column); 6775 + GeneratedColumn<String> get embedJson => $composableBuilder(column: $table.embedJson, builder: (column) => column); 8221 6776 8222 - GeneratedColumn<String> get mediaPaths => $composableBuilder( 8223 - column: $table.mediaPaths, 8224 - builder: (column) => column, 8225 - ); 6777 + GeneratedColumn<String> get mediaPaths => $composableBuilder(column: $table.mediaPaths, builder: (column) => column); 8226 6778 8227 - GeneratedColumn<DateTime> get createdAt => 8228 - $composableBuilder(column: $table.createdAt, builder: (column) => column); 6779 + GeneratedColumn<DateTime> get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); 8229 6780 8230 - GeneratedColumn<DateTime> get updatedAt => 8231 - $composableBuilder(column: $table.updatedAt, builder: (column) => column); 6781 + GeneratedColumn<DateTime> get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); 8232 6782 8233 - GeneratedColumn<DateTime> get scheduledAt => $composableBuilder( 8234 - column: $table.scheduledAt, 8235 - builder: (column) => column, 8236 - ); 6783 + GeneratedColumn<DateTime> get scheduledAt => 6784 + $composableBuilder(column: $table.scheduledAt, builder: (column) => column); 8237 6785 } 8238 6786 8239 6787 class $$DraftsTableTableManager ··· 8256 6804 TableManagerState( 8257 6805 db: db, 8258 6806 table: table, 8259 - createFilteringComposer: () => 8260 - $$DraftsTableFilterComposer($db: db, $table: table), 8261 - createOrderingComposer: () => 8262 - $$DraftsTableOrderingComposer($db: db, $table: table), 8263 - createComputedFieldComposer: () => 8264 - $$DraftsTableAnnotationComposer($db: db, $table: table), 6807 + createFilteringComposer: () => $$DraftsTableFilterComposer($db: db, $table: table), 6808 + createOrderingComposer: () => $$DraftsTableOrderingComposer($db: db, $table: table), 6809 + createComputedFieldComposer: () => $$DraftsTableAnnotationComposer($db: db, $table: table), 8265 6810 updateCompanionCallback: 8266 6811 ({ 8267 6812 Value<int> id = const Value.absent(), ··· 8318 6863 updatedAt: updatedAt, 8319 6864 scheduledAt: scheduledAt, 8320 6865 ), 8321 - withReferenceMapper: (p0) => p0 8322 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 8323 - .toList(), 6866 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 8324 6867 prefetchHooksCallback: null, 8325 6868 ), 8326 6869 ); ··· 8359 6902 Value<DateTime> savedAt, 8360 6903 }); 8361 6904 8362 - class $$SavedPostsTableFilterComposer 8363 - extends Composer<_$AppDatabase, $SavedPostsTable> { 6905 + class $$SavedPostsTableFilterComposer extends Composer<_$AppDatabase, $SavedPostsTable> { 8364 6906 $$SavedPostsTableFilterComposer({ 8365 6907 required super.$db, 8366 6908 required super.$table, ··· 8368 6910 super.$addJoinBuilderToRootComposer, 8369 6911 super.$removeJoinBuilderFromRootComposer, 8370 6912 }); 8371 - ColumnFilters<int> get id => $composableBuilder( 8372 - column: $table.id, 8373 - builder: (column) => ColumnFilters(column), 8374 - ); 6913 + ColumnFilters<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); 8375 6914 8376 - ColumnFilters<String> get accountDid => $composableBuilder( 8377 - column: $table.accountDid, 8378 - builder: (column) => ColumnFilters(column), 8379 - ); 6915 + ColumnFilters<String> get accountDid => 6916 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 8380 6917 8381 - ColumnFilters<String> get postUri => $composableBuilder( 8382 - column: $table.postUri, 8383 - builder: (column) => ColumnFilters(column), 8384 - ); 6918 + ColumnFilters<String> get postUri => 6919 + $composableBuilder(column: $table.postUri, builder: (column) => ColumnFilters(column)); 8385 6920 8386 - ColumnFilters<String> get postJson => $composableBuilder( 8387 - column: $table.postJson, 8388 - builder: (column) => ColumnFilters(column), 8389 - ); 6921 + ColumnFilters<String> get postJson => 6922 + $composableBuilder(column: $table.postJson, builder: (column) => ColumnFilters(column)); 8390 6923 8391 - ColumnFilters<String> get saveType => $composableBuilder( 8392 - column: $table.saveType, 8393 - builder: (column) => ColumnFilters(column), 8394 - ); 6924 + ColumnFilters<String> get saveType => 6925 + $composableBuilder(column: $table.saveType, builder: (column) => ColumnFilters(column)); 8395 6926 8396 - ColumnFilters<DateTime> get savedAt => $composableBuilder( 8397 - column: $table.savedAt, 8398 - builder: (column) => ColumnFilters(column), 8399 - ); 6927 + ColumnFilters<DateTime> get savedAt => 6928 + $composableBuilder(column: $table.savedAt, builder: (column) => ColumnFilters(column)); 8400 6929 } 8401 6930 8402 - class $$SavedPostsTableOrderingComposer 8403 - extends Composer<_$AppDatabase, $SavedPostsTable> { 6931 + class $$SavedPostsTableOrderingComposer extends Composer<_$AppDatabase, $SavedPostsTable> { 8404 6932 $$SavedPostsTableOrderingComposer({ 8405 6933 required super.$db, 8406 6934 required super.$table, ··· 8408 6936 super.$addJoinBuilderToRootComposer, 8409 6937 super.$removeJoinBuilderFromRootComposer, 8410 6938 }); 8411 - ColumnOrderings<int> get id => $composableBuilder( 8412 - column: $table.id, 8413 - builder: (column) => ColumnOrderings(column), 8414 - ); 6939 + ColumnOrderings<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); 8415 6940 8416 - ColumnOrderings<String> get accountDid => $composableBuilder( 8417 - column: $table.accountDid, 8418 - builder: (column) => ColumnOrderings(column), 8419 - ); 6941 + ColumnOrderings<String> get accountDid => 6942 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 8420 6943 8421 - ColumnOrderings<String> get postUri => $composableBuilder( 8422 - column: $table.postUri, 8423 - builder: (column) => ColumnOrderings(column), 8424 - ); 6944 + ColumnOrderings<String> get postUri => 6945 + $composableBuilder(column: $table.postUri, builder: (column) => ColumnOrderings(column)); 8425 6946 8426 - ColumnOrderings<String> get postJson => $composableBuilder( 8427 - column: $table.postJson, 8428 - builder: (column) => ColumnOrderings(column), 8429 - ); 6947 + ColumnOrderings<String> get postJson => 6948 + $composableBuilder(column: $table.postJson, builder: (column) => ColumnOrderings(column)); 8430 6949 8431 - ColumnOrderings<String> get saveType => $composableBuilder( 8432 - column: $table.saveType, 8433 - builder: (column) => ColumnOrderings(column), 8434 - ); 6950 + ColumnOrderings<String> get saveType => 6951 + $composableBuilder(column: $table.saveType, builder: (column) => ColumnOrderings(column)); 8435 6952 8436 - ColumnOrderings<DateTime> get savedAt => $composableBuilder( 8437 - column: $table.savedAt, 8438 - builder: (column) => ColumnOrderings(column), 8439 - ); 6953 + ColumnOrderings<DateTime> get savedAt => 6954 + $composableBuilder(column: $table.savedAt, builder: (column) => ColumnOrderings(column)); 8440 6955 } 8441 6956 8442 - class $$SavedPostsTableAnnotationComposer 8443 - extends Composer<_$AppDatabase, $SavedPostsTable> { 6957 + class $$SavedPostsTableAnnotationComposer extends Composer<_$AppDatabase, $SavedPostsTable> { 8444 6958 $$SavedPostsTableAnnotationComposer({ 8445 6959 required super.$db, 8446 6960 required super.$table, ··· 8448 6962 super.$addJoinBuilderToRootComposer, 8449 6963 super.$removeJoinBuilderFromRootComposer, 8450 6964 }); 8451 - GeneratedColumn<int> get id => 8452 - $composableBuilder(column: $table.id, builder: (column) => column); 6965 + GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column); 8453 6966 8454 - GeneratedColumn<String> get accountDid => $composableBuilder( 8455 - column: $table.accountDid, 8456 - builder: (column) => column, 8457 - ); 6967 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 8458 6968 8459 - GeneratedColumn<String> get postUri => 8460 - $composableBuilder(column: $table.postUri, builder: (column) => column); 6969 + GeneratedColumn<String> get postUri => $composableBuilder(column: $table.postUri, builder: (column) => column); 8461 6970 8462 - GeneratedColumn<String> get postJson => 8463 - $composableBuilder(column: $table.postJson, builder: (column) => column); 6971 + GeneratedColumn<String> get postJson => $composableBuilder(column: $table.postJson, builder: (column) => column); 8464 6972 8465 - GeneratedColumn<String> get saveType => 8466 - $composableBuilder(column: $table.saveType, builder: (column) => column); 6973 + GeneratedColumn<String> get saveType => $composableBuilder(column: $table.saveType, builder: (column) => column); 8467 6974 8468 - GeneratedColumn<DateTime> get savedAt => 8469 - $composableBuilder(column: $table.savedAt, builder: (column) => column); 6975 + GeneratedColumn<DateTime> get savedAt => $composableBuilder(column: $table.savedAt, builder: (column) => column); 8470 6976 } 8471 6977 8472 6978 class $$SavedPostsTableTableManager ··· 8480 6986 $$SavedPostsTableAnnotationComposer, 8481 6987 $$SavedPostsTableCreateCompanionBuilder, 8482 6988 $$SavedPostsTableUpdateCompanionBuilder, 8483 - ( 8484 - SavedPostEntry, 8485 - BaseReferences<_$AppDatabase, $SavedPostsTable, SavedPostEntry>, 8486 - ), 6989 + (SavedPostEntry, BaseReferences<_$AppDatabase, $SavedPostsTable, SavedPostEntry>), 8487 6990 SavedPostEntry, 8488 6991 PrefetchHooks Function() 8489 6992 > { ··· 8492 6995 TableManagerState( 8493 6996 db: db, 8494 6997 table: table, 8495 - createFilteringComposer: () => 8496 - $$SavedPostsTableFilterComposer($db: db, $table: table), 8497 - createOrderingComposer: () => 8498 - $$SavedPostsTableOrderingComposer($db: db, $table: table), 8499 - createComputedFieldComposer: () => 8500 - $$SavedPostsTableAnnotationComposer($db: db, $table: table), 6998 + createFilteringComposer: () => $$SavedPostsTableFilterComposer($db: db, $table: table), 6999 + createOrderingComposer: () => $$SavedPostsTableOrderingComposer($db: db, $table: table), 7000 + createComputedFieldComposer: () => $$SavedPostsTableAnnotationComposer($db: db, $table: table), 8501 7001 updateCompanionCallback: 8502 7002 ({ 8503 7003 Value<int> id = const Value.absent(), ··· 8530 7030 saveType: saveType, 8531 7031 savedAt: savedAt, 8532 7032 ), 8533 - withReferenceMapper: (p0) => p0 8534 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 8535 - .toList(), 7033 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 8536 7034 prefetchHooksCallback: null, 8537 7035 ), 8538 7036 ); ··· 8548 7046 $$SavedPostsTableAnnotationComposer, 8549 7047 $$SavedPostsTableCreateCompanionBuilder, 8550 7048 $$SavedPostsTableUpdateCompanionBuilder, 8551 - ( 8552 - SavedPostEntry, 8553 - BaseReferences<_$AppDatabase, $SavedPostsTable, SavedPostEntry>, 8554 - ), 7049 + (SavedPostEntry, BaseReferences<_$AppDatabase, $SavedPostsTable, SavedPostEntry>), 8555 7050 SavedPostEntry, 8556 7051 PrefetchHooks Function() 8557 7052 >; ··· 8570 7065 Value<int> rowid, 8571 7066 }); 8572 7067 8573 - class $$LabelerCacheTableFilterComposer 8574 - extends Composer<_$AppDatabase, $LabelerCacheTable> { 7068 + class $$LabelerCacheTableFilterComposer extends Composer<_$AppDatabase, $LabelerCacheTable> { 8575 7069 $$LabelerCacheTableFilterComposer({ 8576 7070 required super.$db, 8577 7071 required super.$table, ··· 8579 7073 super.$addJoinBuilderToRootComposer, 8580 7074 super.$removeJoinBuilderFromRootComposer, 8581 7075 }); 8582 - ColumnFilters<String> get labelerDid => $composableBuilder( 8583 - column: $table.labelerDid, 8584 - builder: (column) => ColumnFilters(column), 8585 - ); 7076 + ColumnFilters<String> get labelerDid => 7077 + $composableBuilder(column: $table.labelerDid, builder: (column) => ColumnFilters(column)); 8586 7078 8587 - ColumnFilters<String> get policiesJson => $composableBuilder( 8588 - column: $table.policiesJson, 8589 - builder: (column) => ColumnFilters(column), 8590 - ); 7079 + ColumnFilters<String> get policiesJson => 7080 + $composableBuilder(column: $table.policiesJson, builder: (column) => ColumnFilters(column)); 8591 7081 8592 - ColumnFilters<DateTime> get fetchedAt => $composableBuilder( 8593 - column: $table.fetchedAt, 8594 - builder: (column) => ColumnFilters(column), 8595 - ); 7082 + ColumnFilters<DateTime> get fetchedAt => 7083 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnFilters(column)); 8596 7084 } 8597 7085 8598 - class $$LabelerCacheTableOrderingComposer 8599 - extends Composer<_$AppDatabase, $LabelerCacheTable> { 7086 + class $$LabelerCacheTableOrderingComposer extends Composer<_$AppDatabase, $LabelerCacheTable> { 8600 7087 $$LabelerCacheTableOrderingComposer({ 8601 7088 required super.$db, 8602 7089 required super.$table, ··· 8604 7091 super.$addJoinBuilderToRootComposer, 8605 7092 super.$removeJoinBuilderFromRootComposer, 8606 7093 }); 8607 - ColumnOrderings<String> get labelerDid => $composableBuilder( 8608 - column: $table.labelerDid, 8609 - builder: (column) => ColumnOrderings(column), 8610 - ); 7094 + ColumnOrderings<String> get labelerDid => 7095 + $composableBuilder(column: $table.labelerDid, builder: (column) => ColumnOrderings(column)); 8611 7096 8612 - ColumnOrderings<String> get policiesJson => $composableBuilder( 8613 - column: $table.policiesJson, 8614 - builder: (column) => ColumnOrderings(column), 8615 - ); 7097 + ColumnOrderings<String> get policiesJson => 7098 + $composableBuilder(column: $table.policiesJson, builder: (column) => ColumnOrderings(column)); 8616 7099 8617 - ColumnOrderings<DateTime> get fetchedAt => $composableBuilder( 8618 - column: $table.fetchedAt, 8619 - builder: (column) => ColumnOrderings(column), 8620 - ); 7100 + ColumnOrderings<DateTime> get fetchedAt => 7101 + $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnOrderings(column)); 8621 7102 } 8622 7103 8623 - class $$LabelerCacheTableAnnotationComposer 8624 - extends Composer<_$AppDatabase, $LabelerCacheTable> { 7104 + class $$LabelerCacheTableAnnotationComposer extends Composer<_$AppDatabase, $LabelerCacheTable> { 8625 7105 $$LabelerCacheTableAnnotationComposer({ 8626 7106 required super.$db, 8627 7107 required super.$table, ··· 8629 7109 super.$addJoinBuilderToRootComposer, 8630 7110 super.$removeJoinBuilderFromRootComposer, 8631 7111 }); 8632 - GeneratedColumn<String> get labelerDid => $composableBuilder( 8633 - column: $table.labelerDid, 8634 - builder: (column) => column, 8635 - ); 7112 + GeneratedColumn<String> get labelerDid => $composableBuilder(column: $table.labelerDid, builder: (column) => column); 8636 7113 8637 - GeneratedColumn<String> get policiesJson => $composableBuilder( 8638 - column: $table.policiesJson, 8639 - builder: (column) => column, 8640 - ); 7114 + GeneratedColumn<String> get policiesJson => 7115 + $composableBuilder(column: $table.policiesJson, builder: (column) => column); 8641 7116 8642 - GeneratedColumn<DateTime> get fetchedAt => 8643 - $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 7117 + GeneratedColumn<DateTime> get fetchedAt => $composableBuilder(column: $table.fetchedAt, builder: (column) => column); 8644 7118 } 8645 7119 8646 7120 class $$LabelerCacheTableTableManager ··· 8654 7128 $$LabelerCacheTableAnnotationComposer, 8655 7129 $$LabelerCacheTableCreateCompanionBuilder, 8656 7130 $$LabelerCacheTableUpdateCompanionBuilder, 8657 - ( 8658 - LabelerCacheEntry, 8659 - BaseReferences< 8660 - _$AppDatabase, 8661 - $LabelerCacheTable, 8662 - LabelerCacheEntry 8663 - >, 8664 - ), 7131 + (LabelerCacheEntry, BaseReferences<_$AppDatabase, $LabelerCacheTable, LabelerCacheEntry>), 8665 7132 LabelerCacheEntry, 8666 7133 PrefetchHooks Function() 8667 7134 > { ··· 8670 7137 TableManagerState( 8671 7138 db: db, 8672 7139 table: table, 8673 - createFilteringComposer: () => 8674 - $$LabelerCacheTableFilterComposer($db: db, $table: table), 8675 - createOrderingComposer: () => 8676 - $$LabelerCacheTableOrderingComposer($db: db, $table: table), 8677 - createComputedFieldComposer: () => 8678 - $$LabelerCacheTableAnnotationComposer($db: db, $table: table), 7140 + createFilteringComposer: () => $$LabelerCacheTableFilterComposer($db: db, $table: table), 7141 + createOrderingComposer: () => $$LabelerCacheTableOrderingComposer($db: db, $table: table), 7142 + createComputedFieldComposer: () => $$LabelerCacheTableAnnotationComposer($db: db, $table: table), 8679 7143 updateCompanionCallback: 8680 7144 ({ 8681 7145 Value<String> labelerDid = const Value.absent(), ··· 8700 7164 fetchedAt: fetchedAt, 8701 7165 rowid: rowid, 8702 7166 ), 8703 - withReferenceMapper: (p0) => p0 8704 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 8705 - .toList(), 7167 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 8706 7168 prefetchHooksCallback: null, 8707 7169 ), 8708 7170 ); ··· 8718 7180 $$LabelerCacheTableAnnotationComposer, 8719 7181 $$LabelerCacheTableCreateCompanionBuilder, 8720 7182 $$LabelerCacheTableUpdateCompanionBuilder, 8721 - ( 8722 - LabelerCacheEntry, 8723 - BaseReferences<_$AppDatabase, $LabelerCacheTable, LabelerCacheEntry>, 8724 - ), 7183 + (LabelerCacheEntry, BaseReferences<_$AppDatabase, $LabelerCacheTable, LabelerCacheEntry>), 8725 7184 LabelerCacheEntry, 8726 7185 PrefetchHooks Function() 8727 7186 >; ··· 8752 7211 Value<DateTime?> dismissedAt, 8753 7212 }); 8754 7213 8755 - class $$NotificationDeliveriesTableFilterComposer 8756 - extends Composer<_$AppDatabase, $NotificationDeliveriesTable> { 7214 + class $$NotificationDeliveriesTableFilterComposer extends Composer<_$AppDatabase, $NotificationDeliveriesTable> { 8757 7215 $$NotificationDeliveriesTableFilterComposer({ 8758 7216 required super.$db, 8759 7217 required super.$table, ··· 8761 7219 super.$addJoinBuilderToRootComposer, 8762 7220 super.$removeJoinBuilderFromRootComposer, 8763 7221 }); 8764 - ColumnFilters<int> get id => $composableBuilder( 8765 - column: $table.id, 8766 - builder: (column) => ColumnFilters(column), 8767 - ); 7222 + ColumnFilters<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); 8768 7223 8769 - ColumnFilters<String> get accountDid => $composableBuilder( 8770 - column: $table.accountDid, 8771 - builder: (column) => ColumnFilters(column), 8772 - ); 7224 + ColumnFilters<String> get accountDid => 7225 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 8773 7226 8774 - ColumnFilters<String> get notificationUri => $composableBuilder( 8775 - column: $table.notificationUri, 8776 - builder: (column) => ColumnFilters(column), 8777 - ); 7227 + ColumnFilters<String> get notificationUri => 7228 + $composableBuilder(column: $table.notificationUri, builder: (column) => ColumnFilters(column)); 8778 7229 8779 - ColumnFilters<String> get notificationCid => $composableBuilder( 8780 - column: $table.notificationCid, 8781 - builder: (column) => ColumnFilters(column), 8782 - ); 7230 + ColumnFilters<String> get notificationCid => 7231 + $composableBuilder(column: $table.notificationCid, builder: (column) => ColumnFilters(column)); 8783 7232 8784 - ColumnFilters<String> get reason => $composableBuilder( 8785 - column: $table.reason, 8786 - builder: (column) => ColumnFilters(column), 8787 - ); 7233 + ColumnFilters<String> get reason => 7234 + $composableBuilder(column: $table.reason, builder: (column) => ColumnFilters(column)); 8788 7235 8789 - ColumnFilters<DateTime> get indexedAt => $composableBuilder( 8790 - column: $table.indexedAt, 8791 - builder: (column) => ColumnFilters(column), 8792 - ); 7236 + ColumnFilters<DateTime> get indexedAt => 7237 + $composableBuilder(column: $table.indexedAt, builder: (column) => ColumnFilters(column)); 8793 7238 8794 - ColumnFilters<String> get source => $composableBuilder( 8795 - column: $table.source, 8796 - builder: (column) => ColumnFilters(column), 8797 - ); 7239 + ColumnFilters<String> get source => 7240 + $composableBuilder(column: $table.source, builder: (column) => ColumnFilters(column)); 8798 7241 8799 - ColumnFilters<DateTime> get deliveredAt => $composableBuilder( 8800 - column: $table.deliveredAt, 8801 - builder: (column) => ColumnFilters(column), 8802 - ); 7242 + ColumnFilters<DateTime> get deliveredAt => 7243 + $composableBuilder(column: $table.deliveredAt, builder: (column) => ColumnFilters(column)); 8803 7244 8804 - ColumnFilters<DateTime> get openedAt => $composableBuilder( 8805 - column: $table.openedAt, 8806 - builder: (column) => ColumnFilters(column), 8807 - ); 7245 + ColumnFilters<DateTime> get openedAt => 7246 + $composableBuilder(column: $table.openedAt, builder: (column) => ColumnFilters(column)); 8808 7247 8809 - ColumnFilters<DateTime> get dismissedAt => $composableBuilder( 8810 - column: $table.dismissedAt, 8811 - builder: (column) => ColumnFilters(column), 8812 - ); 7248 + ColumnFilters<DateTime> get dismissedAt => 7249 + $composableBuilder(column: $table.dismissedAt, builder: (column) => ColumnFilters(column)); 8813 7250 } 8814 7251 8815 - class $$NotificationDeliveriesTableOrderingComposer 8816 - extends Composer<_$AppDatabase, $NotificationDeliveriesTable> { 7252 + class $$NotificationDeliveriesTableOrderingComposer extends Composer<_$AppDatabase, $NotificationDeliveriesTable> { 8817 7253 $$NotificationDeliveriesTableOrderingComposer({ 8818 7254 required super.$db, 8819 7255 required super.$table, ··· 8821 7257 super.$addJoinBuilderToRootComposer, 8822 7258 super.$removeJoinBuilderFromRootComposer, 8823 7259 }); 8824 - ColumnOrderings<int> get id => $composableBuilder( 8825 - column: $table.id, 8826 - builder: (column) => ColumnOrderings(column), 8827 - ); 7260 + ColumnOrderings<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); 8828 7261 8829 - ColumnOrderings<String> get accountDid => $composableBuilder( 8830 - column: $table.accountDid, 8831 - builder: (column) => ColumnOrderings(column), 8832 - ); 7262 + ColumnOrderings<String> get accountDid => 7263 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 8833 7264 8834 - ColumnOrderings<String> get notificationUri => $composableBuilder( 8835 - column: $table.notificationUri, 8836 - builder: (column) => ColumnOrderings(column), 8837 - ); 7265 + ColumnOrderings<String> get notificationUri => 7266 + $composableBuilder(column: $table.notificationUri, builder: (column) => ColumnOrderings(column)); 8838 7267 8839 - ColumnOrderings<String> get notificationCid => $composableBuilder( 8840 - column: $table.notificationCid, 8841 - builder: (column) => ColumnOrderings(column), 8842 - ); 7268 + ColumnOrderings<String> get notificationCid => 7269 + $composableBuilder(column: $table.notificationCid, builder: (column) => ColumnOrderings(column)); 8843 7270 8844 - ColumnOrderings<String> get reason => $composableBuilder( 8845 - column: $table.reason, 8846 - builder: (column) => ColumnOrderings(column), 8847 - ); 7271 + ColumnOrderings<String> get reason => 7272 + $composableBuilder(column: $table.reason, builder: (column) => ColumnOrderings(column)); 8848 7273 8849 - ColumnOrderings<DateTime> get indexedAt => $composableBuilder( 8850 - column: $table.indexedAt, 8851 - builder: (column) => ColumnOrderings(column), 8852 - ); 7274 + ColumnOrderings<DateTime> get indexedAt => 7275 + $composableBuilder(column: $table.indexedAt, builder: (column) => ColumnOrderings(column)); 8853 7276 8854 - ColumnOrderings<String> get source => $composableBuilder( 8855 - column: $table.source, 8856 - builder: (column) => ColumnOrderings(column), 8857 - ); 7277 + ColumnOrderings<String> get source => 7278 + $composableBuilder(column: $table.source, builder: (column) => ColumnOrderings(column)); 8858 7279 8859 - ColumnOrderings<DateTime> get deliveredAt => $composableBuilder( 8860 - column: $table.deliveredAt, 8861 - builder: (column) => ColumnOrderings(column), 8862 - ); 7280 + ColumnOrderings<DateTime> get deliveredAt => 7281 + $composableBuilder(column: $table.deliveredAt, builder: (column) => ColumnOrderings(column)); 8863 7282 8864 - ColumnOrderings<DateTime> get openedAt => $composableBuilder( 8865 - column: $table.openedAt, 8866 - builder: (column) => ColumnOrderings(column), 8867 - ); 7283 + ColumnOrderings<DateTime> get openedAt => 7284 + $composableBuilder(column: $table.openedAt, builder: (column) => ColumnOrderings(column)); 8868 7285 8869 - ColumnOrderings<DateTime> get dismissedAt => $composableBuilder( 8870 - column: $table.dismissedAt, 8871 - builder: (column) => ColumnOrderings(column), 8872 - ); 7286 + ColumnOrderings<DateTime> get dismissedAt => 7287 + $composableBuilder(column: $table.dismissedAt, builder: (column) => ColumnOrderings(column)); 8873 7288 } 8874 7289 8875 - class $$NotificationDeliveriesTableAnnotationComposer 8876 - extends Composer<_$AppDatabase, $NotificationDeliveriesTable> { 7290 + class $$NotificationDeliveriesTableAnnotationComposer extends Composer<_$AppDatabase, $NotificationDeliveriesTable> { 8877 7291 $$NotificationDeliveriesTableAnnotationComposer({ 8878 7292 required super.$db, 8879 7293 required super.$table, ··· 8881 7295 super.$addJoinBuilderToRootComposer, 8882 7296 super.$removeJoinBuilderFromRootComposer, 8883 7297 }); 8884 - GeneratedColumn<int> get id => 8885 - $composableBuilder(column: $table.id, builder: (column) => column); 7298 + GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column); 8886 7299 8887 - GeneratedColumn<String> get accountDid => $composableBuilder( 8888 - column: $table.accountDid, 8889 - builder: (column) => column, 8890 - ); 7300 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 8891 7301 8892 - GeneratedColumn<String> get notificationUri => $composableBuilder( 8893 - column: $table.notificationUri, 8894 - builder: (column) => column, 8895 - ); 7302 + GeneratedColumn<String> get notificationUri => 7303 + $composableBuilder(column: $table.notificationUri, builder: (column) => column); 8896 7304 8897 - GeneratedColumn<String> get notificationCid => $composableBuilder( 8898 - column: $table.notificationCid, 8899 - builder: (column) => column, 8900 - ); 7305 + GeneratedColumn<String> get notificationCid => 7306 + $composableBuilder(column: $table.notificationCid, builder: (column) => column); 8901 7307 8902 - GeneratedColumn<String> get reason => 8903 - $composableBuilder(column: $table.reason, builder: (column) => column); 7308 + GeneratedColumn<String> get reason => $composableBuilder(column: $table.reason, builder: (column) => column); 8904 7309 8905 - GeneratedColumn<DateTime> get indexedAt => 8906 - $composableBuilder(column: $table.indexedAt, builder: (column) => column); 7310 + GeneratedColumn<DateTime> get indexedAt => $composableBuilder(column: $table.indexedAt, builder: (column) => column); 8907 7311 8908 - GeneratedColumn<String> get source => 8909 - $composableBuilder(column: $table.source, builder: (column) => column); 7312 + GeneratedColumn<String> get source => $composableBuilder(column: $table.source, builder: (column) => column); 8910 7313 8911 - GeneratedColumn<DateTime> get deliveredAt => $composableBuilder( 8912 - column: $table.deliveredAt, 8913 - builder: (column) => column, 8914 - ); 7314 + GeneratedColumn<DateTime> get deliveredAt => 7315 + $composableBuilder(column: $table.deliveredAt, builder: (column) => column); 8915 7316 8916 - GeneratedColumn<DateTime> get openedAt => 8917 - $composableBuilder(column: $table.openedAt, builder: (column) => column); 7317 + GeneratedColumn<DateTime> get openedAt => $composableBuilder(column: $table.openedAt, builder: (column) => column); 8918 7318 8919 - GeneratedColumn<DateTime> get dismissedAt => $composableBuilder( 8920 - column: $table.dismissedAt, 8921 - builder: (column) => column, 8922 - ); 7319 + GeneratedColumn<DateTime> get dismissedAt => 7320 + $composableBuilder(column: $table.dismissedAt, builder: (column) => column); 8923 7321 } 8924 7322 8925 7323 class $$NotificationDeliveriesTableTableManager ··· 8935 7333 $$NotificationDeliveriesTableUpdateCompanionBuilder, 8936 7334 ( 8937 7335 NotificationDeliveryEntry, 8938 - BaseReferences< 8939 - _$AppDatabase, 8940 - $NotificationDeliveriesTable, 8941 - NotificationDeliveryEntry 8942 - >, 7336 + BaseReferences<_$AppDatabase, $NotificationDeliveriesTable, NotificationDeliveryEntry>, 8943 7337 ), 8944 7338 NotificationDeliveryEntry, 8945 7339 PrefetchHooks Function() 8946 7340 > { 8947 - $$NotificationDeliveriesTableTableManager( 8948 - _$AppDatabase db, 8949 - $NotificationDeliveriesTable table, 8950 - ) : super( 7341 + $$NotificationDeliveriesTableTableManager(_$AppDatabase db, $NotificationDeliveriesTable table) 7342 + : super( 8951 7343 TableManagerState( 8952 7344 db: db, 8953 7345 table: table, 8954 - createFilteringComposer: () => 8955 - $$NotificationDeliveriesTableFilterComposer( 8956 - $db: db, 8957 - $table: table, 8958 - ), 8959 - createOrderingComposer: () => 8960 - $$NotificationDeliveriesTableOrderingComposer( 8961 - $db: db, 8962 - $table: table, 8963 - ), 8964 - createComputedFieldComposer: () => 8965 - $$NotificationDeliveriesTableAnnotationComposer( 8966 - $db: db, 8967 - $table: table, 8968 - ), 7346 + createFilteringComposer: () => $$NotificationDeliveriesTableFilterComposer($db: db, $table: table), 7347 + createOrderingComposer: () => $$NotificationDeliveriesTableOrderingComposer($db: db, $table: table), 7348 + createComputedFieldComposer: () => $$NotificationDeliveriesTableAnnotationComposer($db: db, $table: table), 8969 7349 updateCompanionCallback: 8970 7350 ({ 8971 7351 Value<int> id = const Value.absent(), ··· 9014 7394 openedAt: openedAt, 9015 7395 dismissedAt: dismissedAt, 9016 7396 ), 9017 - withReferenceMapper: (p0) => p0 9018 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 9019 - .toList(), 7397 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 9020 7398 prefetchHooksCallback: null, 9021 7399 ), 9022 7400 ); ··· 9034 7412 $$NotificationDeliveriesTableUpdateCompanionBuilder, 9035 7413 ( 9036 7414 NotificationDeliveryEntry, 9037 - BaseReferences< 9038 - _$AppDatabase, 9039 - $NotificationDeliveriesTable, 9040 - NotificationDeliveryEntry 9041 - >, 7415 + BaseReferences<_$AppDatabase, $NotificationDeliveriesTable, NotificationDeliveryEntry>, 9042 7416 ), 9043 7417 NotificationDeliveryEntry, 9044 7418 PrefetchHooks Function() ··· 9060 7434 Value<DateTime> likedAt, 9061 7435 }); 9062 7436 9063 - class $$LikedPostsTableFilterComposer 9064 - extends Composer<_$AppDatabase, $LikedPostsTable> { 7437 + class $$LikedPostsTableFilterComposer extends Composer<_$AppDatabase, $LikedPostsTable> { 9065 7438 $$LikedPostsTableFilterComposer({ 9066 7439 required super.$db, 9067 7440 required super.$table, ··· 9069 7442 super.$addJoinBuilderToRootComposer, 9070 7443 super.$removeJoinBuilderFromRootComposer, 9071 7444 }); 9072 - ColumnFilters<int> get id => $composableBuilder( 9073 - column: $table.id, 9074 - builder: (column) => ColumnFilters(column), 9075 - ); 7445 + ColumnFilters<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); 9076 7446 9077 - ColumnFilters<String> get accountDid => $composableBuilder( 9078 - column: $table.accountDid, 9079 - builder: (column) => ColumnFilters(column), 9080 - ); 7447 + ColumnFilters<String> get accountDid => 7448 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 9081 7449 9082 - ColumnFilters<String> get postUri => $composableBuilder( 9083 - column: $table.postUri, 9084 - builder: (column) => ColumnFilters(column), 9085 - ); 7450 + ColumnFilters<String> get postUri => 7451 + $composableBuilder(column: $table.postUri, builder: (column) => ColumnFilters(column)); 9086 7452 9087 - ColumnFilters<String> get postJson => $composableBuilder( 9088 - column: $table.postJson, 9089 - builder: (column) => ColumnFilters(column), 9090 - ); 7453 + ColumnFilters<String> get postJson => 7454 + $composableBuilder(column: $table.postJson, builder: (column) => ColumnFilters(column)); 9091 7455 9092 - ColumnFilters<DateTime> get likedAt => $composableBuilder( 9093 - column: $table.likedAt, 9094 - builder: (column) => ColumnFilters(column), 9095 - ); 7456 + ColumnFilters<DateTime> get likedAt => 7457 + $composableBuilder(column: $table.likedAt, builder: (column) => ColumnFilters(column)); 9096 7458 } 9097 7459 9098 - class $$LikedPostsTableOrderingComposer 9099 - extends Composer<_$AppDatabase, $LikedPostsTable> { 7460 + class $$LikedPostsTableOrderingComposer extends Composer<_$AppDatabase, $LikedPostsTable> { 9100 7461 $$LikedPostsTableOrderingComposer({ 9101 7462 required super.$db, 9102 7463 required super.$table, ··· 9104 7465 super.$addJoinBuilderToRootComposer, 9105 7466 super.$removeJoinBuilderFromRootComposer, 9106 7467 }); 9107 - ColumnOrderings<int> get id => $composableBuilder( 9108 - column: $table.id, 9109 - builder: (column) => ColumnOrderings(column), 9110 - ); 7468 + ColumnOrderings<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); 9111 7469 9112 - ColumnOrderings<String> get accountDid => $composableBuilder( 9113 - column: $table.accountDid, 9114 - builder: (column) => ColumnOrderings(column), 9115 - ); 7470 + ColumnOrderings<String> get accountDid => 7471 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 9116 7472 9117 - ColumnOrderings<String> get postUri => $composableBuilder( 9118 - column: $table.postUri, 9119 - builder: (column) => ColumnOrderings(column), 9120 - ); 7473 + ColumnOrderings<String> get postUri => 7474 + $composableBuilder(column: $table.postUri, builder: (column) => ColumnOrderings(column)); 9121 7475 9122 - ColumnOrderings<String> get postJson => $composableBuilder( 9123 - column: $table.postJson, 9124 - builder: (column) => ColumnOrderings(column), 9125 - ); 7476 + ColumnOrderings<String> get postJson => 7477 + $composableBuilder(column: $table.postJson, builder: (column) => ColumnOrderings(column)); 9126 7478 9127 - ColumnOrderings<DateTime> get likedAt => $composableBuilder( 9128 - column: $table.likedAt, 9129 - builder: (column) => ColumnOrderings(column), 9130 - ); 7479 + ColumnOrderings<DateTime> get likedAt => 7480 + $composableBuilder(column: $table.likedAt, builder: (column) => ColumnOrderings(column)); 9131 7481 } 9132 7482 9133 - class $$LikedPostsTableAnnotationComposer 9134 - extends Composer<_$AppDatabase, $LikedPostsTable> { 7483 + class $$LikedPostsTableAnnotationComposer extends Composer<_$AppDatabase, $LikedPostsTable> { 9135 7484 $$LikedPostsTableAnnotationComposer({ 9136 7485 required super.$db, 9137 7486 required super.$table, ··· 9139 7488 super.$addJoinBuilderToRootComposer, 9140 7489 super.$removeJoinBuilderFromRootComposer, 9141 7490 }); 9142 - GeneratedColumn<int> get id => 9143 - $composableBuilder(column: $table.id, builder: (column) => column); 7491 + GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column); 9144 7492 9145 - GeneratedColumn<String> get accountDid => $composableBuilder( 9146 - column: $table.accountDid, 9147 - builder: (column) => column, 9148 - ); 7493 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 9149 7494 9150 - GeneratedColumn<String> get postUri => 9151 - $composableBuilder(column: $table.postUri, builder: (column) => column); 7495 + GeneratedColumn<String> get postUri => $composableBuilder(column: $table.postUri, builder: (column) => column); 9152 7496 9153 - GeneratedColumn<String> get postJson => 9154 - $composableBuilder(column: $table.postJson, builder: (column) => column); 7497 + GeneratedColumn<String> get postJson => $composableBuilder(column: $table.postJson, builder: (column) => column); 9155 7498 9156 - GeneratedColumn<DateTime> get likedAt => 9157 - $composableBuilder(column: $table.likedAt, builder: (column) => column); 7499 + GeneratedColumn<DateTime> get likedAt => $composableBuilder(column: $table.likedAt, builder: (column) => column); 9158 7500 } 9159 7501 9160 7502 class $$LikedPostsTableTableManager ··· 9168 7510 $$LikedPostsTableAnnotationComposer, 9169 7511 $$LikedPostsTableCreateCompanionBuilder, 9170 7512 $$LikedPostsTableUpdateCompanionBuilder, 9171 - ( 9172 - LikedPostEntry, 9173 - BaseReferences<_$AppDatabase, $LikedPostsTable, LikedPostEntry>, 9174 - ), 7513 + (LikedPostEntry, BaseReferences<_$AppDatabase, $LikedPostsTable, LikedPostEntry>), 9175 7514 LikedPostEntry, 9176 7515 PrefetchHooks Function() 9177 7516 > { ··· 9180 7519 TableManagerState( 9181 7520 db: db, 9182 7521 table: table, 9183 - createFilteringComposer: () => 9184 - $$LikedPostsTableFilterComposer($db: db, $table: table), 9185 - createOrderingComposer: () => 9186 - $$LikedPostsTableOrderingComposer($db: db, $table: table), 9187 - createComputedFieldComposer: () => 9188 - $$LikedPostsTableAnnotationComposer($db: db, $table: table), 7522 + createFilteringComposer: () => $$LikedPostsTableFilterComposer($db: db, $table: table), 7523 + createOrderingComposer: () => $$LikedPostsTableOrderingComposer($db: db, $table: table), 7524 + createComputedFieldComposer: () => $$LikedPostsTableAnnotationComposer($db: db, $table: table), 9189 7525 updateCompanionCallback: 9190 7526 ({ 9191 7527 Value<int> id = const Value.absent(), ··· 9214 7550 postJson: postJson, 9215 7551 likedAt: likedAt, 9216 7552 ), 9217 - withReferenceMapper: (p0) => p0 9218 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) 9219 - .toList(), 7553 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 9220 7554 prefetchHooksCallback: null, 9221 7555 ), 9222 7556 ); ··· 9232 7566 $$LikedPostsTableAnnotationComposer, 9233 7567 $$LikedPostsTableCreateCompanionBuilder, 9234 7568 $$LikedPostsTableUpdateCompanionBuilder, 9235 - ( 9236 - LikedPostEntry, 9237 - BaseReferences<_$AppDatabase, $LikedPostsTable, LikedPostEntry>, 9238 - ), 7569 + (LikedPostEntry, BaseReferences<_$AppDatabase, $LikedPostsTable, LikedPostEntry>), 9239 7570 LikedPostEntry, 9240 7571 PrefetchHooks Function() 9241 7572 >; ··· 9243 7574 class $AppDatabaseManager { 9244 7575 final _$AppDatabase _db; 9245 7576 $AppDatabaseManager(this._db); 9246 - $$AccountsTableTableManager get accounts => 9247 - $$AccountsTableTableManager(_db, _db.accounts); 9248 - $$CachedProfilesTableTableManager get cachedProfiles => 9249 - $$CachedProfilesTableTableManager(_db, _db.cachedProfiles); 9250 - $$CachedPostsTableTableManager get cachedPosts => 9251 - $$CachedPostsTableTableManager(_db, _db.cachedPosts); 9252 - $$SettingsTableTableManager get settings => 9253 - $$SettingsTableTableManager(_db, _db.settings); 9254 - $$SavedFeedsTableTableManager get savedFeeds => 9255 - $$SavedFeedsTableTableManager(_db, _db.savedFeeds); 7577 + $$AccountsTableTableManager get accounts => $$AccountsTableTableManager(_db, _db.accounts); 7578 + $$CachedProfilesTableTableManager get cachedProfiles => $$CachedProfilesTableTableManager(_db, _db.cachedProfiles); 7579 + $$CachedPostsTableTableManager get cachedPosts => $$CachedPostsTableTableManager(_db, _db.cachedPosts); 7580 + $$SettingsTableTableManager get settings => $$SettingsTableTableManager(_db, _db.settings); 7581 + $$SavedFeedsTableTableManager get savedFeeds => $$SavedFeedsTableTableManager(_db, _db.savedFeeds); 9256 7582 $$CachedFeedPagesTableTableManager get cachedFeedPages => 9257 7583 $$CachedFeedPagesTableTableManager(_db, _db.cachedFeedPages); 9258 7584 $$CachedFeedPostsTableTableManager get cachedFeedPosts => 9259 7585 $$CachedFeedPostsTableTableManager(_db, _db.cachedFeedPosts); 9260 7586 $$CachedThreadRootsTableTableManager get cachedThreadRoots => 9261 7587 $$CachedThreadRootsTableTableManager(_db, _db.cachedThreadRoots); 9262 - $$SearchHistoryTableTableManager get searchHistory => 9263 - $$SearchHistoryTableTableManager(_db, _db.searchHistory); 9264 - $$DraftsTableTableManager get drafts => 9265 - $$DraftsTableTableManager(_db, _db.drafts); 9266 - $$SavedPostsTableTableManager get savedPosts => 9267 - $$SavedPostsTableTableManager(_db, _db.savedPosts); 9268 - $$LabelerCacheTableTableManager get labelerCache => 9269 - $$LabelerCacheTableTableManager(_db, _db.labelerCache); 7588 + $$SearchHistoryTableTableManager get searchHistory => $$SearchHistoryTableTableManager(_db, _db.searchHistory); 7589 + $$DraftsTableTableManager get drafts => $$DraftsTableTableManager(_db, _db.drafts); 7590 + $$SavedPostsTableTableManager get savedPosts => $$SavedPostsTableTableManager(_db, _db.savedPosts); 7591 + $$LabelerCacheTableTableManager get labelerCache => $$LabelerCacheTableTableManager(_db, _db.labelerCache); 9270 7592 $$NotificationDeliveriesTableTableManager get notificationDeliveries => 9271 - $$NotificationDeliveriesTableTableManager( 9272 - _db, 9273 - _db.notificationDeliveries, 9274 - ); 9275 - $$LikedPostsTableTableManager get likedPosts => 9276 - $$LikedPostsTableTableManager(_db, _db.likedPosts); 7593 + $$NotificationDeliveriesTableTableManager(_db, _db.notificationDeliveries); 7594 + $$LikedPostsTableTableManager get likedPosts => $$LikedPostsTableTableManager(_db, _db.likedPosts); 9277 7595 }
+1
lib/core/database/tables.dart
··· 7 7 TextColumn get displayName => text().nullable()(); 8 8 TextColumn get service => text().nullable()(); 9 9 TextColumn get oauthService => text().nullable()(); 10 + TextColumn get oauthClientId => text().nullable()(); 10 11 TextColumn get accessToken => text()(); 11 12 TextColumn get refreshToken => text().nullable()(); 12 13 TextColumn get dpopPublicKey => text().nullable()();
+10 -29
lib/core/network/xrpc_client_factory.dart
··· 3 3 import 'package:atproto_oauth/atproto_oauth.dart' as atp_oauth; 4 4 import 'package:bluesky/bluesky.dart'; 5 5 import 'package:bluesky/bluesky_chat.dart'; 6 - import 'package:flutter/foundation.dart'; 7 6 import 'package:lazurite/core/network/xrpc_network_interceptor.dart'; 8 7 import 'package:lazurite/features/auth/data/models/auth_models.dart'; 9 8 ··· 29 28 privateKey: tokens.dpopPrivateKey!, 30 29 ); 31 30 32 - return Bluesky.fromOAuthSession( 33 - oauthSession, 34 - getClient: _debugWrappedGetClient(), 35 - postClient: _debugWrappedPostClient(), 36 - ); 31 + return Bluesky.fromOAuthSession(oauthSession, getClient: _wrappedGetClient(), postClient: _wrappedPostClient()); 37 32 } 38 33 39 34 if (tokens.refreshToken == null) { ··· 50 45 return Bluesky.fromSession( 51 46 session, 52 47 service: tokens.service, 53 - getClient: _debugWrappedGetClient(), 54 - postClient: _debugWrappedPostClient(), 48 + getClient: _wrappedGetClient(), 49 + postClient: _wrappedPostClient(), 55 50 ); 56 51 } 57 52 ··· 71 66 privateKey: tokens.dpopPrivateKey!, 72 67 ); 73 68 74 - return BlueskyChat.fromOAuthSession( 75 - oauthSession, 76 - getClient: _debugWrappedGetClient(), 77 - postClient: _debugWrappedPostClient(), 78 - ); 69 + return BlueskyChat.fromOAuthSession(oauthSession, getClient: _wrappedGetClient(), postClient: _wrappedPostClient()); 79 70 } 80 71 81 72 if (tokens.refreshToken == null) return null; ··· 90 81 return BlueskyChat.fromSession( 91 82 session, 92 83 service: tokens.service, 93 - getClient: _debugWrappedGetClient(), 94 - postClient: _debugWrappedPostClient(), 84 + getClient: _wrappedGetClient(), 85 + postClient: _wrappedPostClient(), 95 86 ); 96 87 } 97 88 98 89 atp.ATProto createAtProtoForOAuthSession(atp_oauth.OAuthSession session) => 99 - atp.ATProto.fromOAuthSession(session, getClient: _debugWrappedGetClient(), postClient: _debugWrappedPostClient()); 90 + atp.ATProto.fromOAuthSession(session, getClient: _wrappedGetClient(), postClient: _wrappedPostClient()); 100 91 101 92 Bluesky createBlueskyForOAuthSession(atp_oauth.OAuthSession session) => 102 - Bluesky.fromOAuthSession(session, getClient: _debugWrappedGetClient(), postClient: _debugWrappedPostClient()); 93 + Bluesky.fromOAuthSession(session, getClient: _wrappedGetClient(), postClient: _wrappedPostClient()); 103 94 104 - atp_core.GetClient? _debugWrappedGetClient() { 105 - if (!kDebugMode) { 106 - return null; 107 - } 108 - return XrpcNetworkInterceptor.wrapGetClient(); 109 - } 95 + atp_core.GetClient _wrappedGetClient() => XrpcNetworkInterceptor.wrapGetClient(); 110 96 111 - atp_core.PostClient? _debugWrappedPostClient() { 112 - if (!kDebugMode) { 113 - return null; 114 - } 115 - return XrpcNetworkInterceptor.wrapPostClient(); 116 - } 97 + atp_core.PostClient _wrappedPostClient() => XrpcNetworkInterceptor.wrapPostClient();
+163 -50
lib/core/network/xrpc_network_interceptor.dart
··· 32 32 static atp_core.GetClient wrapGetClient([atp_core.GetClient? baseClient]) { 33 33 final delegate = baseClient ?? http.get; 34 34 return (Uri url, {Map<String, String>? headers}) async { 35 - final metadata = metadataFor(url, headers: headers); 36 - final stopwatch = Stopwatch()..start(); 37 - log.t(_requestLogLine(httpMethod: 'GET', metadata: metadata)); 38 - final forced = _takeForcedUnauthorized(method: 'GET', url: url, metadata: metadata); 39 - if (forced != null) { 40 - _logResponse( 41 - httpMethod: 'GET', 42 - metadata: metadata, 43 - statusCode: forced.statusCode, 44 - elapsed: stopwatch.elapsed, 45 - ); 46 - return forced; 35 + final normalizedHeaders = normalizeOutgoingHeaders(headers); 36 + XrpcRequestMetadata? metadata; 37 + Stopwatch? stopwatch; 38 + 39 + if (kDebugMode) { 40 + metadata = metadataFor(url, headers: normalizedHeaders); 41 + stopwatch = Stopwatch()..start(); 42 + _trace(_requestLogLine(httpMethod: 'GET', metadata: metadata)); 43 + final forced = _takeForcedUnauthorized(method: 'GET', url: url, metadata: metadata); 44 + if (forced != null) { 45 + _logResponse( 46 + httpMethod: 'GET', 47 + metadata: metadata, 48 + statusCode: forced.statusCode, 49 + elapsed: stopwatch.elapsed, 50 + ); 51 + return forced; 52 + } 47 53 } 48 54 try { 49 - final response = await delegate(url, headers: headers); 50 - _logResponse( 51 - httpMethod: 'GET', 52 - metadata: metadata, 53 - statusCode: response.statusCode, 54 - elapsed: stopwatch.elapsed, 55 - ); 55 + final response = await delegate(url, headers: normalizedHeaders); 56 + if (kDebugMode && metadata != null && stopwatch != null) { 57 + _logResponse( 58 + httpMethod: 'GET', 59 + metadata: metadata, 60 + statusCode: response.statusCode, 61 + elapsed: stopwatch.elapsed, 62 + ); 63 + } 56 64 return response; 57 65 } catch (error, stackTrace) { 58 - log.e( 59 - _failureLogLine(httpMethod: 'GET', metadata: metadata, elapsed: stopwatch.elapsed), 60 - error: error, 61 - stackTrace: stackTrace, 62 - ); 66 + if (kDebugMode && metadata != null && stopwatch != null) { 67 + _error( 68 + _failureLogLine(httpMethod: 'GET', metadata: metadata, elapsed: stopwatch.elapsed), 69 + error: error, 70 + stackTrace: stackTrace, 71 + ); 72 + } 63 73 rethrow; 64 74 } 65 75 }; ··· 68 78 static atp_core.PostClient wrapPostClient([atp_core.PostClient? baseClient]) { 69 79 final delegate = baseClient ?? http.post; 70 80 return (Uri url, {Map<String, String>? headers, Object? body, Encoding? encoding}) async { 71 - final metadata = metadataFor(url, headers: headers); 72 - final stopwatch = Stopwatch()..start(); 73 - log.t(_requestLogLine(httpMethod: 'POST', metadata: metadata)); 74 - final forced = _takeForcedUnauthorized(method: 'POST', url: url, metadata: metadata); 75 - if (forced != null) { 76 - _logResponse( 77 - httpMethod: 'POST', 78 - metadata: metadata, 79 - statusCode: forced.statusCode, 80 - elapsed: stopwatch.elapsed, 81 - ); 82 - return forced; 81 + final normalizedHeaders = normalizeOutgoingHeaders(headers); 82 + XrpcRequestMetadata? metadata; 83 + Stopwatch? stopwatch; 84 + 85 + if (kDebugMode) { 86 + metadata = metadataFor(url, headers: normalizedHeaders); 87 + stopwatch = Stopwatch()..start(); 88 + _trace(_requestLogLine(httpMethod: 'POST', metadata: metadata)); 89 + final forced = _takeForcedUnauthorized(method: 'POST', url: url, metadata: metadata); 90 + if (forced != null) { 91 + _logResponse( 92 + httpMethod: 'POST', 93 + metadata: metadata, 94 + statusCode: forced.statusCode, 95 + elapsed: stopwatch.elapsed, 96 + ); 97 + return forced; 98 + } 83 99 } 84 100 try { 85 - final response = await delegate(url, headers: headers, body: body, encoding: encoding); 86 - _logResponse( 87 - httpMethod: 'POST', 88 - metadata: metadata, 89 - statusCode: response.statusCode, 90 - elapsed: stopwatch.elapsed, 91 - ); 101 + final response = await delegate(url, headers: normalizedHeaders, body: body, encoding: encoding); 102 + if (kDebugMode && metadata != null && stopwatch != null) { 103 + _logResponse( 104 + httpMethod: 'POST', 105 + metadata: metadata, 106 + statusCode: response.statusCode, 107 + elapsed: stopwatch.elapsed, 108 + ); 109 + } 92 110 return response; 93 111 } catch (error, stackTrace) { 94 - log.e( 95 - _failureLogLine(httpMethod: 'POST', metadata: metadata, elapsed: stopwatch.elapsed), 96 - error: error, 97 - stackTrace: stackTrace, 98 - ); 112 + if (kDebugMode && metadata != null && stopwatch != null) { 113 + _error( 114 + _failureLogLine(httpMethod: 'POST', metadata: metadata, elapsed: stopwatch.elapsed), 115 + error: error, 116 + stackTrace: stackTrace, 117 + ); 118 + } 99 119 rethrow; 100 120 } 101 121 }; 102 122 } 103 123 104 124 @visibleForTesting 125 + static Map<String, String>? normalizeOutgoingHeaders(Map<String, String>? headers) { 126 + if (headers == null || headers.isEmpty) { 127 + return headers; 128 + } 129 + 130 + var dpopKey = ''; 131 + var dpopValue = ''; 132 + for (final entry in headers.entries) { 133 + if (entry.key.toLowerCase() == 'dpop') { 134 + dpopKey = entry.key; 135 + dpopValue = entry.value; 136 + break; 137 + } 138 + } 139 + if (dpopKey.isEmpty) { 140 + return headers; 141 + } 142 + 143 + final normalizedDpop = _normalizeDpopProof(dpopValue); 144 + if (normalizedDpop == dpopValue) { 145 + return headers; 146 + } 147 + 148 + final normalized = Map<String, String>.from(headers); 149 + normalized[dpopKey] = normalizedDpop; 150 + _trace('XRPC Request: normalized DPoP proof encoding to base64url'); 151 + return normalized; 152 + } 153 + 154 + @visibleForTesting 105 155 static XrpcRequestMetadata metadataFor(Uri url, {Map<String, String>? headers}) { 106 156 final pdsHost = url.host.isEmpty ? '<unknown>' : url.host; 107 157 final xrpcMethod = _extractXrpcMethod(url); ··· 131 181 return null; 132 182 } 133 183 184 + static String _normalizeDpopProof(String proof) { 185 + final trimmed = proof.trim(); 186 + if (trimmed.isEmpty) { 187 + return proof; 188 + } 189 + 190 + final segments = trimmed.split('.'); 191 + if (segments.length != 3) { 192 + return proof; 193 + } 194 + 195 + final decodedSignature = _decodeJwtSegment(segments[2]); 196 + if (decodedSignature == null) { 197 + return proof; 198 + } 199 + 200 + final normalizedSignature = base64UrlEncode(decodedSignature).replaceAll('=', ''); 201 + if (normalizedSignature == segments[2]) { 202 + return proof; 203 + } 204 + 205 + segments[2] = normalizedSignature; 206 + return segments.join('.'); 207 + } 208 + 209 + static List<int>? _decodeJwtSegment(String segment) { 210 + final normalizedSegment = segment.trim(); 211 + if (normalizedSegment.isEmpty) { 212 + return null; 213 + } 214 + 215 + try { 216 + return base64Url.decode(base64Url.normalize(normalizedSegment)); 217 + } catch (_) {} 218 + 219 + try { 220 + return base64.decode(base64.normalize(normalizedSegment)); 221 + } catch (_) {} 222 + 223 + return null; 224 + } 225 + 134 226 static http.Response? _takeForcedUnauthorized({ 135 227 required String method, 136 228 required Uri url, ··· 141 233 } 142 234 143 235 _forcedUnauthorizedResponses -= 1; 144 - log.w( 236 + _warn( 145 237 'XRPC Debug Hook: forcing 401 for method=$method, PDS=${metadata.pdsHost}, ' 146 238 'AppView=${metadata.appView}, XRPC method=${metadata.xrpcMethod}', 147 239 ); ··· 190 282 elapsed: elapsed, 191 283 ); 192 284 if (statusCode >= 400) { 193 - log.w(message); 285 + _warn(message); 286 + return; 287 + } 288 + _trace(message); 289 + } 290 + 291 + static void _trace(String message) { 292 + if (!kDebugMode) { 194 293 return; 195 294 } 196 295 log.t(message); 296 + } 297 + 298 + static void _warn(String message, {Object? error, StackTrace? stackTrace}) { 299 + if (!kDebugMode) { 300 + return; 301 + } 302 + log.w(message, error: error, stackTrace: stackTrace); 303 + } 304 + 305 + static void _error(String message, {Object? error, StackTrace? stackTrace}) { 306 + if (!kDebugMode) { 307 + return; 308 + } 309 + log.e(message, error: error, stackTrace: stackTrace); 197 310 } 198 311 }
+2
lib/features/account/cubit/account_switcher_cubit.dart
··· 101 101 displayName: account.displayName, 102 102 service: account.service, 103 103 oauthService: account.oauthService, 104 + oauthClientId: account.oauthClientId, 104 105 dpopNonce: account.dpopNonce, 105 106 dpopPublicKey: account.dpopPublicKey, 106 107 dpopPrivateKey: account.dpopPrivateKey, ··· 143 144 displayName: tokens.displayName != null ? Value(tokens.displayName!) : const Value.absent(), 144 145 service: tokens.service != null ? Value(tokens.service!) : const Value.absent(), 145 146 oauthService: tokens.oauthService != null ? Value(tokens.oauthService!) : const Value.absent(), 147 + oauthClientId: tokens.oauthClientId != null ? Value(tokens.oauthClientId!) : const Value.absent(), 146 148 accessToken: Value(tokens.accessToken), 147 149 refreshToken: tokens.refreshToken != null ? Value(tokens.refreshToken!) : const Value.absent(), 148 150 dpopPublicKey: tokens.dpopPublicKey != null ? Value(tokens.dpopPublicKey!) : const Value.absent(),
+20 -1
lib/features/auth/data/auth_repository.dart
··· 120 120 displayName: account.displayName, 121 121 service: account.service, 122 122 oauthService: authMethod == AuthMethod.oauth ? normalizeAtprotoServiceHost(account.oauthService) : null, 123 + oauthClientId: authMethod == AuthMethod.oauth ? account.oauthClientId : null, 123 124 dpopNonce: account.dpopNonce, 124 125 dpopPublicKey: account.dpopPublicKey, 125 126 dpopPrivateKey: account.dpopPrivateKey, ··· 163 164 displayName: tokens.displayName != null ? Value(tokens.displayName) : const Value.absent(), 164 165 service: tokens.service != null ? Value(tokens.service) : const Value.absent(), 165 166 oauthService: tokens.oauthService != null ? Value(tokens.oauthService) : const Value.absent(), 167 + oauthClientId: tokens.oauthClientId != null ? Value(tokens.oauthClientId) : const Value.absent(), 166 168 accessToken: Value(tokens.accessToken), 167 169 refreshToken: tokens.refreshToken != null ? Value(tokens.refreshToken) : const Value.absent(), 168 170 dpopPublicKey: tokens.dpopPublicKey != null ? Value(tokens.dpopPublicKey) : const Value.absent(), ··· 342 344 } 343 345 344 346 try { 345 - final metadata = await _loadClientMetadata(kClientId); 347 + final metadataClientId = _resolveOauthClientId(currentSession.oauthClientId); 348 + final metadata = await _loadClientMetadata(metadataClientId); 346 349 final restoredSession = _restoreOAuthSession( 347 350 currentSession: currentSession, 348 351 publicKey: publicKey, ··· 401 404 fallbackHandle: currentSession.handle, 402 405 fallbackPdsHost: fallbackPdsHost, 403 406 oauthService: successfulOauthService ?? currentSession.oauthService ?? _oauthService, 407 + oauthClientId: currentSession.oauthClientId, 404 408 ); 405 409 406 410 await saveSession( ··· 486 490 fallbackHandle: fallbackHandle, 487 491 fallbackPdsHost: _fallbackService, 488 492 oauthService: service, 493 + oauthClientId: oauthClient.metadata.clientId, 489 494 ); 490 495 await saveSession(tokens, makeActive: true); 491 496 log.i('AuthRepository: OAuth login completed for ${tokens.handle}'); ··· 556 561 required String fallbackHandle, 557 562 required String fallbackPdsHost, 558 563 required String oauthService, 564 + String? oauthClientId, 559 565 }) async { 560 566 var resolvedHandle = fallbackHandle; 561 567 String? displayName; ··· 569 575 normalizeAtprotoServiceHost(session.accessTokenJwt.iss) ?? 570 576 normalizeAtprotoServiceHost(oauthService) ?? 571 577 _oauthService; 578 + final candidateOauthClientId = oauthClientId?.trim(); 579 + final normalizedOauthClientId = candidateOauthClientId != null && candidateOauthClientId.isNotEmpty 580 + ? candidateOauthClientId 581 + : kClientId; 572 582 573 583 try { 574 584 final authSession = await createAtProtoForOAuthSession(session).server.getSession(); ··· 597 607 displayName: displayName, 598 608 service: pdsHost, 599 609 oauthService: normalizedOauthService, 610 + oauthClientId: normalizedOauthClientId, 600 611 dpopNonce: session.$dPoPNonce, 601 612 dpopPublicKey: session.$publicKey, 602 613 dpopPrivateKey: session.$privateKey, ··· 1040 1051 1041 1052 static String _defaultOAuthServiceResolver() { 1042 1053 return AppViewProviders.descriptorForSetting(AppViewProviders.defaultKey).entrywayUrl.host; 1054 + } 1055 + 1056 + String _resolveOauthClientId(String? value) { 1057 + final normalized = value?.trim(); 1058 + if (normalized == null || normalized.isEmpty) { 1059 + return kClientId; 1060 + } 1061 + return normalized; 1043 1062 } 1044 1063 1045 1064 static bool _defaultFalse() => false;
+5
lib/features/auth/data/models/auth_models.dart
··· 12 12 this.displayName, 13 13 this.service, 14 14 this.oauthService, 15 + this.oauthClientId, 15 16 this.dpopNonce, 16 17 this.dpopPublicKey, 17 18 this.dpopPrivateKey, ··· 25 26 final String? displayName; 26 27 final String? service; 27 28 final String? oauthService; 29 + final String? oauthClientId; 28 30 final String? dpopNonce; 29 31 final String? dpopPublicKey; 30 32 final String? dpopPrivateKey; ··· 39 41 String? displayName, 40 42 String? service, 41 43 String? oauthService, 44 + String? oauthClientId, 42 45 String? dpopNonce, 43 46 String? dpopPublicKey, 44 47 String? dpopPrivateKey, ··· 53 56 displayName: displayName ?? this.displayName, 54 57 service: service ?? this.service, 55 58 oauthService: oauthService ?? this.oauthService, 59 + oauthClientId: oauthClientId ?? this.oauthClientId, 56 60 dpopNonce: dpopNonce ?? this.dpopNonce, 57 61 dpopPublicKey: dpopPublicKey ?? this.dpopPublicKey, 58 62 dpopPrivateKey: dpopPrivateKey ?? this.dpopPrivateKey, ··· 77 81 displayName, 78 82 service, 79 83 oauthService, 84 + oauthClientId, 80 85 dpopNonce, 81 86 dpopPublicKey, 82 87 dpopPrivateKey,
+28 -8
lib/features/logs/cubit/log_viewer_cubit.dart
··· 1 1 import 'dart:async'; 2 2 import 'dart:io'; 3 + import 'package:path/path.dart' as p; 3 4 4 5 import 'package:equatable/equatable.dart'; 5 6 import 'package:flutter_bloc/flutter_bloc.dart'; ··· 23 24 } 24 25 25 26 static const String _shareDirectoryName = 'lazurite_logs_share'; 26 - static const String _shareFileName = 'redacted_share.log'; 27 - static const String _legacyShareDirectoryPrefix = 'lazurite_logs_share_'; 27 + static final RegExp _datedLogFilePattern = RegExp(r'(\d{4})-(\d{2})-(\d{2})'); 28 + static const String _staleShareDirectoryPrefix = 'lazurite_logs_share_'; 28 29 29 30 final Future<File?> Function() _todaysLogFileProvider; 30 31 final Directory Function() _systemTempDirectoryProvider; ··· 130 131 } 131 132 132 133 final systemTempDirectory = _systemTempDirectoryProvider(); 133 - await _cleanupLegacyShareTempDirectories(systemTempDirectory); 134 + await _cleanupStaleShareTempDirectories(systemTempDirectory); 134 135 135 136 final content = await rawFile.readAsString(); 136 137 final redactedLines = content.split('\n').map(LogRedactor.redact).join('\n'); ··· 139 140 await shareDirectory.create(recursive: true); 140 141 } 141 142 142 - final redactedFile = File('${shareDirectory.path}/$_shareFileName'); 143 + final shareFileName = _buildShareFileName(rawFile); 144 + final redactedFile = File('${shareDirectory.path}/$shareFileName'); 143 145 await redactedFile.writeAsString(redactedLines, flush: true); 144 146 return redactedFile; 145 147 } 146 148 147 - Future<void> _cleanupLegacyShareTempDirectories(Directory systemTempDirectory) async { 149 + String _buildShareFileName(File sourceFile) { 150 + final basename = p.basename(sourceFile.path); 151 + final match = _datedLogFilePattern.firstMatch(basename); 152 + if (match != null) { 153 + return 'lazurite_logs_${match.group(1)}_${match.group(2)}_${match.group(3)}_share.log'; 154 + } 155 + 156 + final now = DateTime.now(); 157 + final year = now.year.toString().padLeft(4, '0'); 158 + final month = now.month.toString().padLeft(2, '0'); 159 + final day = now.day.toString().padLeft(2, '0'); 160 + return 'lazurite_logs_${year}_${month}_${day}_share.log'; 161 + } 162 + 163 + Future<void> _cleanupStaleShareTempDirectories(Directory systemTempDirectory) async { 148 164 if (!await systemTempDirectory.exists()) { 149 165 return; 150 166 } ··· 157 173 final name = entity.uri.pathSegments.isNotEmpty 158 174 ? entity.uri.pathSegments[entity.uri.pathSegments.length - 2] 159 175 : ''; 160 - if (!name.startsWith(_legacyShareDirectoryPrefix)) { 176 + if (!name.startsWith(_staleShareDirectoryPrefix)) { 161 177 continue; 162 178 } 163 179 164 180 try { 165 181 await entity.delete(recursive: true); 166 - } catch (_) { 167 - // Best-effort cleanup only. 182 + } catch (error, stackTrace) { 183 + log.d( 184 + 'LogViewerCubit: could not remove stale temp share directory ${entity.path}.', 185 + error: error, 186 + stackTrace: stackTrace, 187 + ); 168 188 } 169 189 } 170 190 }
+15
test/core/database/app_database_test.dart
··· 183 183 expect(retrieved!.service, equals('porcini.us-east.host.bsky.network')); 184 184 expect(retrieved.oauthService, equals('bsky.social')); 185 185 }); 186 + 187 + test('should persist oauth client id for oauth-backed accounts', () async { 188 + final account = AccountsCompanion.insert( 189 + did: 'did:plc:oauthclient123', 190 + handle: 'oauth-client-user.bsky.social', 191 + accessToken: 'access-token', 192 + oauthClientId: const Value('https://lazurite.stormlightlabs.org/client-metadata.json'), 193 + ); 194 + 195 + await database.insertAccount(account); 196 + final retrieved = await database.getAccount('did:plc:oauthclient123'); 197 + 198 + expect(retrieved, isNotNull); 199 + expect(retrieved!.oauthClientId, equals('https://lazurite.stormlightlabs.org/client-metadata.json')); 200 + }); 186 201 }); 187 202 188 203 group('Cache operations', () {
+28
test/core/network/xrpc_network_interceptor_test.dart
··· 84 84 expect(response.statusCode, 201); 85 85 expect(response.body, 'created'); 86 86 }); 87 + 88 + test('normalizes DPoP signature segment to base64url before request dispatch', () async { 89 + const originalDpop = 90 + 'eyJhbGciOiJFUzI1NiIsInR5cCI6ImRwb3Arand0In0.eyJzdWIiOiJodHRwczovL2xhenVyaXRlLnN0b3JtbGlnaHRsYWJzLm9yZy9jbGllbnQtbWV0YWRhdGEuanNvbiJ9.Bw=='; 91 + late Map<String, String>? forwardedHeaders; 92 + 93 + final wrapped = XrpcNetworkInterceptor.wrapPostClient((url, {headers, body, encoding}) async { 94 + forwardedHeaders = headers; 95 + return http.Response('ok', 200, request: http.Request('POST', url)); 96 + }); 97 + 98 + await wrapped( 99 + Uri.parse('https://example.com/xrpc/com.atproto.server.getSession'), 100 + headers: {'DPoP': originalDpop}, 101 + ); 102 + 103 + expect(forwardedHeaders, isNotNull); 104 + expect(forwardedHeaders!['DPoP'], isNotNull); 105 + expect(forwardedHeaders!['DPoP'], isNot(equals(originalDpop))); 106 + expect(forwardedHeaders!['DPoP']!.split('.').last, equals('Bw')); 107 + }); 108 + 109 + test('leaves headers unchanged when DPoP proof is not a compact JWT', () { 110 + final headers = {'DPoP': 'not-a-jwt-proof'}; 111 + final normalized = XrpcNetworkInterceptor.normalizeOutgoingHeaders(headers); 112 + 113 + expect(identical(normalized, headers), isTrue); 114 + }); 87 115 }); 88 116 }); 89 117 }
+141
test/features/auth/data/auth_repository_test.dart
··· 81 81 handle: 'oauth-user.bsky.social', 82 82 service: 'porcini.us-east.host.bsky.network', 83 83 oauthService: 'bsky.social', 84 + oauthClientId: 'https://lazurite.stormlightlabs.org/client-metadata.json', 84 85 accessToken: 'access_token', 85 86 refreshToken: 'refresh_token', 86 87 dpopPublicKey: 'public-key', ··· 99 100 expect(result, isNotNull); 100 101 expect(result!.usesOAuth, isTrue); 101 102 expect(result.oauthService, equals('bsky.social')); 103 + expect(result.oauthClientId, equals('https://lazurite.stormlightlabs.org/client-metadata.json')); 102 104 }); 103 105 }); 104 106 ··· 111 113 handle: 'user.bsky.social', 112 114 displayName: 'User Name', 113 115 service: 'bsky.social', 116 + oauthClientId: 'https://lazurite.stormlightlabs.org/client-metadata.json', 114 117 ); 115 118 116 119 when(() => mockDatabase.insertAccount(any())).thenAnswer((_) async => 1); ··· 253 256 expect(refreshed.oauthService, equals('bsky.social')); 254 257 verifyNever(() => mockDatabase.deleteAccount(any())); 255 258 verify(() => mockDatabase.insertAccount(any())).called(1); 259 + }); 260 + 261 + test('loads OAuth refresh metadata using stored oauthClientId', () async { 262 + final requestedClientIds = <String>[]; 263 + final nowEpochSeconds = DateTime.now().toUtc().millisecondsSinceEpoch ~/ 1000; 264 + final expiredAccessToken = _buildJwt( 265 + sub: 'did:plc:abc123', 266 + expEpochSeconds: nowEpochSeconds - 3600, 267 + iatEpochSeconds: nowEpochSeconds - 7200, 268 + aud: 'did:web:porcini.us-east.host.bsky.network', 269 + iss: 'https://northsky.social', 270 + ); 271 + final refreshedAccessToken = _buildJwt( 272 + sub: 'did:plc:abc123', 273 + expEpochSeconds: nowEpochSeconds + 3600, 274 + iatEpochSeconds: nowEpochSeconds, 275 + aud: 'did:web:porcini.us-east.host.bsky.network', 276 + iss: 'https://northsky.social', 277 + ); 278 + 279 + authRepository = AuthRepository( 280 + database: mockDatabase, 281 + loadClientMetadata: (clientId) async { 282 + requestedClientIds.add(clientId); 283 + return _testClientMetadata(); 284 + }, 285 + oauthRefreshSession: 286 + ({required OAuthClientMetadata metadata, required String service, required OAuthSession session}) async { 287 + return OAuthSession( 288 + accessToken: refreshedAccessToken, 289 + refreshToken: session.refreshToken, 290 + tokenType: 'DPoP', 291 + scope: 'atproto', 292 + expiresAt: DateTime.now().toUtc().add(const Duration(hours: 1)), 293 + sub: session.sub, 294 + $dPoPNonce: 'new-nonce', 295 + $publicKey: session.$publicKey, 296 + $privateKey: session.$privateKey, 297 + ); 298 + }, 299 + ); 300 + 301 + const currentSession = AuthTokens( 302 + accessToken: 'REPLACE_ME', 303 + refreshToken: 'refresh-token', 304 + did: 'did:plc:abc123', 305 + handle: 'user.bsky.social', 306 + service: 'porcini.us-east.host.bsky.network', 307 + oauthService: 'northsky.social', 308 + oauthClientId: 'https://northsky.social/oauth/client-metadata.json', 309 + dpopNonce: 'nonce', 310 + dpopPublicKey: 'public-key', 311 + dpopPrivateKey: 'private-key', 312 + authMethod: AuthMethod.oauth, 313 + ); 314 + final sessionWithJwt = currentSession.copyWith(accessToken: expiredAccessToken); 315 + 316 + when( 317 + () => mockDatabase.getSetting(AppDatabase.activeAccountDidSettingKey), 318 + ).thenAnswer((_) async => currentSession.did); 319 + when(() => mockDatabase.insertAccount(any())).thenAnswer((_) async => 1); 320 + when( 321 + () => mockDatabase.setSetting(AppDatabase.activeAccountDidSettingKey, currentSession.did), 322 + ).thenAnswer((_) async => 1); 323 + 324 + final refreshed = await authRepository.refreshSession(sessionWithJwt); 325 + 326 + expect(refreshed, isNotNull); 327 + expect(requestedClientIds, equals(['https://northsky.social/oauth/client-metadata.json'])); 328 + }); 329 + 330 + test('falls back to default client id when stored oauthClientId is blank', () async { 331 + final requestedClientIds = <String>[]; 332 + final nowEpochSeconds = DateTime.now().toUtc().millisecondsSinceEpoch ~/ 1000; 333 + final expiredAccessToken = _buildJwt( 334 + sub: 'did:plc:abc123', 335 + expEpochSeconds: nowEpochSeconds - 3600, 336 + iatEpochSeconds: nowEpochSeconds - 7200, 337 + aud: 'did:web:porcini.us-east.host.bsky.network', 338 + iss: 'https://northsky.social', 339 + ); 340 + final refreshedAccessToken = _buildJwt( 341 + sub: 'did:plc:abc123', 342 + expEpochSeconds: nowEpochSeconds + 3600, 343 + iatEpochSeconds: nowEpochSeconds, 344 + aud: 'did:web:porcini.us-east.host.bsky.network', 345 + iss: 'https://northsky.social', 346 + ); 347 + 348 + authRepository = AuthRepository( 349 + database: mockDatabase, 350 + loadClientMetadata: (clientId) async { 351 + requestedClientIds.add(clientId); 352 + return _testClientMetadata(); 353 + }, 354 + oauthRefreshSession: 355 + ({required OAuthClientMetadata metadata, required String service, required OAuthSession session}) async { 356 + return OAuthSession( 357 + accessToken: refreshedAccessToken, 358 + refreshToken: session.refreshToken, 359 + tokenType: 'DPoP', 360 + scope: 'atproto', 361 + expiresAt: DateTime.now().toUtc().add(const Duration(hours: 1)), 362 + sub: session.sub, 363 + $dPoPNonce: 'new-nonce', 364 + $publicKey: session.$publicKey, 365 + $privateKey: session.$privateKey, 366 + ); 367 + }, 368 + ); 369 + 370 + const currentSession = AuthTokens( 371 + accessToken: 'REPLACE_ME', 372 + refreshToken: 'refresh-token', 373 + did: 'did:plc:abc123', 374 + handle: 'user.bsky.social', 375 + service: 'porcini.us-east.host.bsky.network', 376 + oauthService: 'northsky.social', 377 + oauthClientId: ' ', 378 + dpopNonce: 'nonce', 379 + dpopPublicKey: 'public-key', 380 + dpopPrivateKey: 'private-key', 381 + authMethod: AuthMethod.oauth, 382 + ); 383 + final sessionWithJwt = currentSession.copyWith(accessToken: expiredAccessToken); 384 + 385 + when( 386 + () => mockDatabase.getSetting(AppDatabase.activeAccountDidSettingKey), 387 + ).thenAnswer((_) async => currentSession.did); 388 + when(() => mockDatabase.insertAccount(any())).thenAnswer((_) async => 1); 389 + when( 390 + () => mockDatabase.setSetting(AppDatabase.activeAccountDidSettingKey, currentSession.did), 391 + ).thenAnswer((_) async => 1); 392 + 393 + final refreshed = await authRepository.refreshSession(sessionWithJwt); 394 + 395 + expect(refreshed, isNotNull); 396 + expect(requestedClientIds, equals([AuthRepository.kClientId])); 256 397 }); 257 398 }); 258 399
+9 -1
test/features/auth/data/models/auth_models_test.dart
··· 12 12 displayName: 'User Name', 13 13 service: 'bsky.social', 14 14 oauthService: 'bsky.social', 15 + oauthClientId: 'https://lazurite.stormlightlabs.org/client-metadata.json', 15 16 ); 16 17 17 18 expect(tokens.accessToken, equals('access_token')); ··· 21 22 expect(tokens.displayName, equals('User Name')); 22 23 expect(tokens.service, equals('bsky.social')); 23 24 expect(tokens.oauthService, equals('bsky.social')); 25 + expect(tokens.oauthClientId, equals('https://lazurite.stormlightlabs.org/client-metadata.json')); 24 26 }); 25 27 26 28 test('should create AuthTokens without optional fields', () { ··· 36 38 test('should copy with new values', () { 37 39 const tokens = AuthTokens(accessToken: 'old_token', did: 'did:plc:abc123', handle: 'user.bsky.social'); 38 40 39 - final newTokens = tokens.copyWith(accessToken: 'new_token', displayName: 'New Name', oauthService: 'bsky.social'); 41 + final newTokens = tokens.copyWith( 42 + accessToken: 'new_token', 43 + displayName: 'New Name', 44 + oauthService: 'bsky.social', 45 + oauthClientId: 'client-id', 46 + ); 40 47 41 48 expect(newTokens.accessToken, equals('new_token')); 42 49 expect(newTokens.did, equals('did:plc:abc123')); 43 50 expect(newTokens.displayName, equals('New Name')); 44 51 expect(newTokens.oauthService, equals('bsky.social')); 52 + expect(newTokens.oauthClientId, equals('client-id')); 45 53 }); 46 54 47 55 test('should identify oauth-backed sessions', () {
+2 -1
test/features/logs/cubit/log_viewer_cubit_test.dart
··· 94 94 final sharedFile = await cubit.getTodaysLogFile(); 95 95 expect(sharedFile, isNotNull); 96 96 expect(sharedFile!.path, isNot(equals(sourceFile.path))); 97 + expect(sharedFile.uri.pathSegments.last, 'lazurite_logs_2026_05_05_share.log'); 97 98 addTearDown(() async { 98 99 final shareDirectory = sharedFile.parent; 99 100 if (await shareDirectory.exists()) { ··· 134 135 expect(second!.path, equals(first!.path)); 135 136 }); 136 137 137 - test('cleans up legacy per-share temp directories', () async { 138 + test('cleans up stale per-share temp directories', () async { 138 139 final tempRoot = await Directory.systemTemp.createTemp('lazurite_log_viewer_temp_root_'); 139 140 final sourceDir = await tempRoot.createTemp('lazurite_log_source_'); 140 141 final sourceFile = File('${sourceDir.path}/lazurite_2026-05-06.log');