+1 -1

lib/src/core/network/atproto/data/models/records.dart

reviewed

··· 30 30 required Embed media, 31 31 required DateTime createdAt, 32 32 StrongRef? sound, 33 33 - List<SelfLabel>? selfLabels, 33 33 + List<SelfLabel>? labels, 34 34 List<String>? tags, 35 35 }) = StoryRecord; 36 36

+18 -12

lib/src/core/network/atproto/data/repositories/feed_repository_impl.dart

reviewed

··· 895 895 896 896 @override 897 897 Future<StrongRef> postStory(Embed embed, {List<SelfLabel>? selfLabels, List<String>? tags}) { 898 898 + final startedAt = DateTime.now(); 899 899 + _logger.d('Posting story (embed=${embed.runtimeType}, tags=${tags?.length ?? 0})'); 898 900 return _client.executeWithRetry(() async { 899 901 if (!_client.authRepository.isAuthenticated) { 900 902 _logger.w('Not authenticated'); 901 903 throw Exception('Not authenticated'); 902 904 } 903 905 904 904 - final record = StoryRecord(createdAt: DateTime.now(), media: embed, selfLabels: selfLabels, tags: tags); 906 906 + final record = StoryRecord(createdAt: DateTime.now(), media: embed, tags: tags); 907 907 + try { 908 908 + final response = await _client.authRepository.atproto!.repo.createRecord( 909 909 + collection: NSID.parse('so.sprk.feed.story'), 910 910 + record: record.toJson(), 911 911 + ); 905 912 906 906 - final response = await _client.authRepository.atproto!.repo.createRecord( 907 907 - collection: NSID.parse('so.sprk.feed.story'), 908 908 - record: record.toJson(), 909 909 - ); 910 910 - 911 911 - if (response.status == HttpStatus.ok) { 912 912 - _logger.i('Story posted successfully: ${response.data.uri}'); 913 913 - return response.data; 914 914 - } else { 915 915 - _logger.e('Failed to post story: ${response.status} ${response.data}'); 916 916 - throw Exception('Failed to post story: ${response.status} ${response.data}'); 913 913 + if (response.status == HttpStatus.ok) { 914 914 + _logger.i('Story posted in ${DateTime.now().difference(startedAt).inMilliseconds}ms uri=${response.data.uri}'); 915 915 + return response.data; 916 916 + } else { 917 917 + _logger.e('Failed to post story: status=${response.status}'); 918 918 + throw Exception('Failed to post story: ${response.status} ${response.data}'); 919 919 + } 920 920 + } catch (e, s) { 921 921 + _logger.e('Exception posting story: $e', error: e, stackTrace: s); 922 922 + rethrow; 917 923 } 918 924 }); 919 925 }

+3

lib/src/core/routing/app_router.dart

reviewed

··· 94 94 ], 95 95 ), 96 96 97 97 + // Story Manager 98 98 + AutoRoute(page: StoryManagerRoute.page, path: '/story-manager'), 99 99 + 97 100 // Alternate starting routes 98 101 AutoRoute(page: EmptyRoute.page, path: '/empty'), 99 102 AutoRoute(page: LoginRoute.page, path: '/login'),

+1

lib/src/core/routing/pages.dart

reviewed

··· 29 29 export 'package:sparksocial/src/features/splash/ui/pages/splash_page.dart'; 30 30 export 'package:sparksocial/src/features/stories/ui/pages/all_stories_page.dart'; 31 31 export 'package:sparksocial/src/features/stories/ui/pages/author_stories_page.dart'; 32 32 + export 'package:sparksocial/src/features/stories/ui/pages/story_manager_page.dart'; 32 33 export 'package:sparksocial/src/features/stories/ui/pages/story_page.dart';

+3

lib/src/core/storage/preferences/storage_constants.dart

reviewed

··· 29 29 30 30 /// Post to Bluesky 31 31 static const String postToBskyKey = 'post_to_bsky_enabled'; 32 32 + 33 33 + /// Story auto deletion 34 34 + static const String storyAutoDeleteEnabled = 'story_auto_delete_enabled'; 32 35 }

+49 -44

lib/src/features/posting/providers/video_upload_provider.dart

reviewed

··· 16 16 final feedRepository = GetIt.I<SprkRepository>().feed; 17 17 final logger = GetIt.I<LogService>().getLogger('Processing Video'); 18 18 try { 19 19 - logger.i('Starting video processing for: $videoPath'); 20 20 - 19 19 + logger.d('Processing video: $videoPath'); 21 20 final blob = await feedRepository.uploadVideo(videoPath); 22 22 - 23 23 - logger.i('Video processed successfully'); 21 21 + logger.i('Video processed (size=${blob.size}, mime=${blob.mimeType})'); 24 22 return blob; 25 23 } catch (error, stackTrace) { 26 26 - logger.e('Error processing video', error: error, stackTrace: stackTrace); 24 24 + logger.e('Error processing video ($videoPath)', error: error, stackTrace: stackTrace); 27 25 return null; 28 26 } 29 27 } ··· 40 38 }) async { 41 39 final logger = GetIt.I<LogService>().getLogger('Posting Video'); 42 40 try { 41 41 + logger.d('Posting video (size=${blob.size}, crosspost=$crosspostToBsky)'); 43 42 final authRepository = GetIt.I<AuthRepository>(); 44 44 - 45 43 final authAtProto = authRepository.atproto; 46 44 if (authAtProto == null || authAtProto.session == null) { 47 45 throw Exception('AtProto not initialized'); 48 46 } 49 47 50 50 - final postText = description.isNotEmpty ? description : ''; 51 51 - 52 52 - // Create a properly formatted AT Protocol post record 53 48 final postRecord = PostRecord( 54 54 - text: postText, 49 49 + text: description.isNotEmpty ? description : '', 55 50 embed: EmbedVideo(video: blob, alt: altText), 56 51 createdAt: DateTime.now().toUtc(), 57 52 ); 58 53 59 59 - // Create the post record 60 54 final recordRes = await authAtProto.repo.createRecord( 61 55 collection: NSID.parse('so.sprk.feed.post'), 62 56 record: postRecord.toJson(), 63 57 ); 64 58 65 59 if (recordRes.status != HttpStatus.ok) { 66 66 - throw Exception('Failed to post video: ${recordRes.status} ${recordRes.data}'); 60 60 + throw Exception('Failed to post video: ${recordRes.status}'); 67 61 } 68 62 69 69 - // Crosspost to Bluesky if enabled 70 63 if (crosspostToBsky) { 71 64 try { 72 72 - await _crosspostVideoToBlueSky(ref, postText, blob, altText, recordRes.data.uri.rkey); 73 73 - } catch (e) { 74 74 - logger.w('Failed to crosspost video to Bluesky: $e'); 75 75 - // Don't fail the entire operation if Bluesky crossposting fails 65 65 + await _crosspostVideoToBlueSky(ref, description, blob, altText, recordRes.data.uri.rkey); 66 66 + } catch (e, s) { 67 67 + logger.w('Crosspost to Bluesky failed: $e', error: e, stackTrace: s); 76 68 } 77 69 } 78 78 - logger.i('Video posted successfully'); 70 70 + logger.i('Video posted successfully: ${recordRes.data.uri}'); 79 71 return recordRes.data; 80 72 } catch (error, stackTrace) { 81 73 logger.e('Error posting video', error: error, stackTrace: stackTrace); ··· 93 85 bool crosspostToBsky = false, 94 86 bool storyMode = false, 95 87 }) async { 88 88 + final logger = GetIt.I<LogService>().getLogger('Process/Post Video'); 89 89 + logger.d('Processing then posting video: $videoPath (storyMode=$storyMode)'); 96 90 final blob = await processVideo(ref, videoPath); 97 91 if (blob == null) { 92 92 + logger.e('Aborting: processing failed'); 98 93 throw Exception('Failed to process video'); 99 94 } 100 95 101 96 if (storyMode) { 102 102 - // Post as a story 103 103 - return ref 104 104 - .read( 105 105 - postStoryProvider( 106 106 - EmbedVideo(video: blob), 107 107 - selfLabels: [], 108 108 - tags: [], 109 109 - ), 110 110 - ) 111 111 - .value; 97 97 + try { 98 98 + final res = await ref.read( 99 99 + postStoryProvider( 100 100 + EmbedVideo(video: blob), 101 101 + selfLabels: [], 102 102 + tags: [], 103 103 + ).future, 104 104 + ); 105 105 + logger.i('Story posted: ${res?.uri}'); 106 106 + return res; 107 107 + } catch (e, s) { 108 108 + logger.e('Failed to post story', error: e, stackTrace: s); 109 109 + rethrow; 110 110 + } 112 111 } else { 113 113 - // Post as a regular video 114 114 - return postVideo( 112 112 + final res = await postVideo( 115 113 ref, 116 114 blob: blob, 117 115 description: description, ··· 119 117 videoPath: videoPath, 120 118 crosspostToBsky: crosspostToBsky, 121 119 ); 120 120 + logger.i('Video flow complete (storyMode=false) success=${res != null}'); 121 121 + return res; 122 122 } 123 123 } 124 124 125 125 /// Crosspost video to Bluesky using same blob but Bluesky models 126 126 @riverpod 127 127 - Future<void> _crosspostVideoToBlueSky(Ref ref, String text, Blob blob, String altText, String rkey) async { 128 128 - final logger = GetIt.I<LogService>().getLogger('Crossposting Video to Bluesky'); 127 127 + Future<void> _crosspostVideoToBlueSky( 128 128 + Ref ref, 129 129 + String text, 130 130 + Blob blob, 131 131 + String altText, 132 132 + String rkey, 133 133 + ) async { 134 134 + final logger = GetIt.I<LogService>().getLogger('Crosspost Video'); 129 135 final authRepository = GetIt.I<AuthRepository>(); 130 136 logger.d('Crossposting video to Bluesky'); 131 131 - 132 137 final session = authRepository.session; 133 138 if (session == null) { 134 139 throw Exception('No session available for Bluesky crosspost'); 135 140 } 136 136 - 137 137 - // Create Bluesky video post record using direct JSON structure 138 141 final bskyPostRecord = <String, dynamic>{ 139 142 r'$type': 'app.bsky.feed.post', 140 143 'text': text, 141 144 'embed': {r'$type': 'app.bsky.embed.video', 'video': blob.toJson(), 'alt': altText}, 142 145 'createdAt': DateTime.now().toUtc().toIso8601String(), 143 146 }; 144 144 - 145 145 - final bskyAtProto = authRepository.atproto!; 146 146 - final bskyResult = await bskyAtProto.repo.createRecord( 147 147 - collection: NSID.parse('app.bsky.feed.post'), 148 148 - record: bskyPostRecord, 149 149 - rkey: rkey, 150 150 - ); 151 151 - 152 152 - logger.i('Successfully crossposted video to Bluesky: ${bskyResult.data.uri}'); 147 147 + try { 148 148 + final bskyAtProto = authRepository.atproto!; 149 149 + final bskyResult = await bskyAtProto.repo.createRecord( 150 150 + collection: NSID.parse('app.bsky.feed.post'), 151 151 + record: bskyPostRecord, 152 152 + rkey: rkey, 153 153 + ); 154 154 + logger.i('Crossposted video to Bluesky: ${bskyResult.data.uri}'); 155 155 + } catch (e, s) { 156 156 + logger.w('Failed to crosspost video: $e', error: e, stackTrace: s); 157 157 + } 153 158 }

+68 -58

lib/src/features/posting/ui/pages/image_review_page.dart

reviewed

··· 121 121 _isPosting = true; 122 122 }); 123 123 try { 124 124 - final crosspostEnabled = ref.read(settingsProvider).postToBskyEnabled; 124 124 + final crosspostEnabled = widget.storyMode ? false : ref.read(settingsProvider).postToBskyEnabled; 125 125 final description = _descriptionController.text; 126 126 StrongRef result; 127 127 if (widget.storyMode) { ··· 132 132 if (uploadedImage.isEmpty) { 133 133 throw Exception('No images uploaded'); 134 134 } 135 135 - result = ref 136 136 - .read( 137 137 - postStoryProvider( 138 138 - Embed.image(images: uploadedImage), 139 139 - ), 140 140 - ) 141 141 - .value!; 135 135 + final storyProvider = postStoryProvider( 136 136 + Embed.image(images: uploadedImage), 137 137 + ); 138 138 + final asyncResult = await ref.read(storyProvider.future); 139 139 + if (asyncResult == null) { 140 140 + throw Exception('Story post returned null StrongRef'); 141 141 + } 142 142 + result = asyncResult; 142 143 } else { 143 144 // Post as a regular image post 144 145 result = await _feedRepository.postImages(description, _imageFiles, _altTexts, crosspostToBsky: crosspostEnabled); ··· 218 219 SizedBox(width: 4), 219 220 Text( 220 221 'Tap to edit', 221 221 - style: TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.bold), 222 222 + style: TextStyle( 223 223 + color: Colors.white, 224 224 + fontSize: 14, 225 225 + fontWeight: FontWeight.bold, 226 226 + ), 222 227 ), 223 228 ], 224 229 ), ··· 380 385 }, 381 386 ), 382 387 const SizedBox(height: 20), 383 383 - // Bluesky Cross-posting Switch 384 384 - Consumer( 385 385 - builder: (context, ref, _) { 386 386 - final settings = ref.watch(settingsProvider); 387 387 - final showWarning = settings.postToBskyEnabled && _imageFiles.length > 4; 388 388 - return Column( 389 389 - children: [ 390 390 - Container( 391 391 - decoration: BoxDecoration( 392 392 - color: Theme.of(context).colorScheme.surface, 393 393 - borderRadius: BorderRadius.circular(8), 394 394 - ), 395 395 - child: ListTile( 396 396 - title: Text( 397 397 - 'Post to Bluesky', 398 398 - style: TextStyle(color: Theme.of(context).colorScheme.onSurface), 399 399 - ), 400 400 - trailing: Switch( 401 401 - value: settings.postToBskyEnabled, 402 402 - onChanged: (bool value) { 403 403 - ref.read(settingsProvider.notifier).setPostToBsky(value); 404 404 - }, 405 405 - activeColor: Theme.of(context).colorScheme.primary, 406 406 - ), 407 407 - onTap: () { 408 408 - ref.read(settingsProvider.notifier).setPostToBsky(!settings.postToBskyEnabled); 409 409 - }, 410 410 - ), 411 411 - ), 412 412 - if (showWarning) ...[ 413 413 - const SizedBox(height: 12), 388 388 + if (!widget.storyMode) 389 389 + Consumer( 390 390 + builder: (context, ref, _) { 391 391 + final settings = ref.watch(settingsProvider); 392 392 + final showWarning = settings.postToBskyEnabled && _imageFiles.length > 4; 393 393 + return Column( 394 394 + children: [ 414 395 Container( 415 415 - width: double.infinity, 416 416 - padding: const EdgeInsets.all(12), 417 396 decoration: BoxDecoration( 418 418 - color: Colors.orange.withAlpha(25), 397 397 + color: Theme.of(context).colorScheme.surface, 419 398 borderRadius: BorderRadius.circular(8), 420 399 ), 421 421 - child: const Row( 422 422 - children: [ 423 423 - Icon(Icons.info_outline, color: Colors.orange, size: 20), 424 424 - SizedBox(width: 8), 425 425 - Expanded( 426 426 - child: Text( 427 427 - 'Bluesky supports a maximum of 4 images. Your Bluesky post will link to the full Spark post instead.', 428 428 - style: TextStyle(color: Colors.orange, fontSize: 13, fontWeight: FontWeight.w500), 400 400 + child: ListTile( 401 401 + title: Text( 402 402 + 'Post to Bluesky', 403 403 + style: TextStyle(color: Theme.of(context).colorScheme.onSurface), 404 404 + ), 405 405 + trailing: Switch( 406 406 + value: settings.postToBskyEnabled, 407 407 + onChanged: (bool value) { 408 408 + ref.read(settingsProvider.notifier).setPostToBsky(value); 409 409 + }, 410 410 + activeColor: Theme.of(context).colorScheme.primary, 411 411 + ), 412 412 + onTap: () { 413 413 + ref.read(settingsProvider.notifier).setPostToBsky(!settings.postToBskyEnabled); 414 414 + }, 415 415 + ), 416 416 + ), 417 417 + if (showWarning) ...[ 418 418 + const SizedBox(height: 12), 419 419 + Container( 420 420 + width: double.infinity, 421 421 + padding: const EdgeInsets.all(12), 422 422 + decoration: BoxDecoration( 423 423 + color: Colors.orange.withAlpha(25), 424 424 + borderRadius: BorderRadius.circular(8), 425 425 + ), 426 426 + child: const Row( 427 427 + children: [ 428 428 + Icon(Icons.info_outline, color: Colors.orange, size: 20), 429 429 + SizedBox(width: 8), 430 430 + Expanded( 431 431 + child: Text( 432 432 + 'Bluesky supports a maximum of 4 images. Your Bluesky post will link to the full Spark post instead.', 433 433 + style: TextStyle(color: Colors.orange, fontSize: 13, fontWeight: FontWeight.w500), 434 434 + ), 429 435 ), 430 430 - ), 431 431 - ], 436 436 + ], 437 437 + ), 432 438 ), 433 433 - ), 439 439 + ], 434 440 ], 435 435 - ], 436 436 - ); 437 437 - }, 438 438 - ), 441 441 + ); 442 442 + }, 443 443 + ), 439 444 ], 440 445 ), 441 446 ), ··· 451 456 : () async { 452 457 final postRef = await _uploadImagesAndPost(); 453 458 if (context.mounted && postRef != null) { 459 459 + if (widget.storyMode) { 460 460 + ScaffoldMessenger.of(context).showSnackBar( 461 461 + const SnackBar(content: Text('Story posted successfully!')), 462 462 + ); 463 463 + } 454 464 context.router.popUntilRoot(); 455 465 final did = ref.read(sessionProvider)?.did; 456 466 if (did != null) {

+29 -29

lib/src/features/posting/ui/pages/video_review_page.dart

reviewed

··· 70 70 71 71 try { 72 72 final description = _descriptionController.text; 73 73 - final crosspostEnabled = ref.read(settingsProvider).postToBskyEnabled; 73 73 + final crosspostEnabled = widget.storyMode ? false : ref.read(settingsProvider).postToBskyEnabled; 74 74 75 75 // Process and post the video with the video upload provider 76 76 final postRef = await ref.read( ··· 292 292 }, 293 293 ), 294 294 const SizedBox(height: 20), 295 295 - // Bluesky Cross-posting Switch 296 296 - Consumer( 297 297 - builder: (context, ref, _) { 298 298 - final settings = ref.watch(settingsProvider); 299 299 - return Column( 300 300 - children: [ 301 301 - Container( 302 302 - decoration: BoxDecoration( 303 303 - color: Theme.of(context).colorScheme.surface, 304 304 - borderRadius: BorderRadius.circular(8), 305 305 - ), 306 306 - child: ListTile( 307 307 - title: Text( 308 308 - 'Post to Bluesky', 309 309 - style: TextStyle(color: Theme.of(context).colorScheme.onSurface), 295 295 + if (!widget.storyMode) 296 296 + Consumer( 297 297 + builder: (context, ref, _) { 298 298 + final settings = ref.watch(settingsProvider); 299 299 + return Column( 300 300 + children: [ 301 301 + Container( 302 302 + decoration: BoxDecoration( 303 303 + color: Theme.of(context).colorScheme.surface, 304 304 + borderRadius: BorderRadius.circular(8), 310 305 ), 311 311 - trailing: Switch( 312 312 - value: settings.postToBskyEnabled, 313 313 - onChanged: (bool value) { 314 314 - ref.read(settingsProvider.notifier).setPostToBsky(value); 306 306 + child: ListTile( 307 307 + title: Text( 308 308 + 'Post to Bluesky', 309 309 + style: TextStyle(color: Theme.of(context).colorScheme.onSurface), 310 310 + ), 311 311 + trailing: Switch( 312 312 + value: settings.postToBskyEnabled, 313 313 + onChanged: (bool value) { 314 314 + ref.read(settingsProvider.notifier).setPostToBsky(value); 315 315 + }, 316 316 + activeColor: Theme.of(context).colorScheme.primary, 317 317 + ), 318 318 + onTap: () { 319 319 + ref.read(settingsProvider.notifier).setPostToBsky(!settings.postToBskyEnabled); 315 320 }, 316 316 - activeColor: Theme.of(context).colorScheme.primary, 317 321 ), 318 318 - onTap: () { 319 319 - ref.read(settingsProvider.notifier).setPostToBsky(!settings.postToBskyEnabled); 320 320 - }, 321 322 ), 322 322 - ), 323 323 - ], 324 324 - ); 325 325 - }, 326 326 - ), 323 323 + ], 324 324 + ); 325 325 + }, 326 326 + ), 327 327 ], 328 328 ), 329 329 ),

+102

lib/src/features/stories/providers/story_auto_delete_provider.dart

reviewed

··· 1 1 + import 'package:atproto_core/atproto_core.dart'; 2 2 + import 'package:flutter_riverpod/flutter_riverpod.dart'; 3 3 + import 'package:get_it/get_it.dart'; 4 4 + import 'package:riverpod_annotation/riverpod_annotation.dart'; 5 5 + import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart'; 6 6 + import 'package:sparksocial/src/core/storage/preferences/storage_constants.dart'; 7 7 + import 'package:sparksocial/src/core/storage/preferences/storage_manager.dart'; 8 8 + import 'package:sparksocial/src/core/utils/logging/log_service.dart'; 9 9 + import 'package:sparksocial/src/core/utils/logging/logger.dart'; 10 10 + import 'package:sparksocial/src/features/stories/providers/story_manager_provider.dart'; 11 11 + 12 12 + part 'story_auto_delete_provider.g.dart'; 13 13 + 14 14 + /// Holds the auto delete preference state (bool) 15 15 + @riverpod 16 16 + class StoryAutoDeletePref extends _$StoryAutoDeletePref { 17 17 + late final SparkLogger _logger; 18 18 + 19 19 + @override 20 20 + Future<bool> build() async { 21 21 + _logger = GetIt.I<LogService>().getLogger('StoryAutoDeletePref'); 22 22 + final prefs = StorageManager.instance.preferences; 23 23 + var stored = await prefs.getBool(StorageKeys.storyAutoDeleteEnabled); 24 24 + if (stored == null) { 25 25 + stored = true; 26 26 + await prefs.setBool(StorageKeys.storyAutoDeleteEnabled, true); 27 27 + _logger.d('Auto delete preference not found. Setting default to true.'); 28 28 + } else { 29 29 + _logger.d('Loaded auto delete preference: $stored'); 30 30 + } 31 31 + return stored; 32 32 + } 33 33 + 34 34 + Future<void> setEnabled(bool value) async { 35 35 + final prefs = StorageManager.instance.preferences; 36 36 + await prefs.setBool(StorageKeys.storyAutoDeleteEnabled, value); 37 37 + _logger.d('Set auto delete preference to $value'); 38 38 + // Update state immutably 39 39 + state = AsyncData(value); 40 40 + } 41 41 + } 42 42 + 43 43 + /// Executes auto deletion (once) at startup if enabled. Exposed as a Future provider 44 44 + /// so that splash / root widgets can await or just watch for side-effects. 45 45 + @riverpod 46 46 + Future<void> storyAutoDeleteExecutor(Ref ref) async { 47 47 + final enabledAsync = await ref.watch(storyAutoDeletePrefProvider.future); 48 48 + if (!enabledAsync) return; 49 49 + 50 50 + final sprk = GetIt.I<SprkRepository>(); 51 51 + final logger = GetIt.I<LogService>().getLogger('StoryAutoDeleteExec'); 52 52 + final atproto = sprk.authRepository.atproto; 53 53 + final did = sprk.authRepository.session?.did; 54 54 + if (atproto == null || did == null) return; 55 55 + 56 56 + try { 57 57 + const collection = 'so.sprk.feed.story'; 58 58 + String? cursor; 59 59 + final expiredUris = <AtUri>[]; 60 60 + final now = DateTime.now().toUtc(); 61 61 + do { 62 62 + final page = await atproto.repo.listRecords( 63 63 + repo: did, 64 64 + collection: NSID.parse(collection), 65 65 + cursor: cursor, 66 66 + limit: 100, 67 67 + ); 68 68 + for (final rec in page.data.records) { 69 69 + final createdAt = rec.value['createdAt']; 70 70 + DateTime? ts; 71 71 + if (createdAt is String) { 72 72 + ts = DateTime.tryParse(createdAt)?.toUtc(); 73 73 + } 74 74 + if (ts != null && now.difference(ts) > const Duration(hours: 24)) { 75 75 + expiredUris.add(rec.uri); 76 76 + } 77 77 + } 78 78 + cursor = page.data.cursor; 79 79 + } while (cursor != null); 80 80 + 81 81 + if (expiredUris.isEmpty) { 82 82 + logger.d('Auto delete: no expired stories'); 83 83 + return; 84 84 + } 85 85 + 86 86 + logger.d('Auto delete: deleting ${expiredUris.length} expired stories'); 87 87 + for (final uri in expiredUris) { 88 88 + try { 89 89 + await sprk.repo.deleteRecord(uri: uri); 90 90 + } catch (e) { 91 91 + logger.w('Failed deleting expired story $uri', error: e); 92 92 + } 93 93 + } 94 94 + 95 95 + // Refresh manager state if it's already loaded 96 96 + // Refresh story manager provider (will instantiate if not yet) so UI reflects deletions 97 97 + final manager = ref.read(storyManagerProvider.notifier); 98 98 + await manager.refresh(); 99 99 + } catch (e, s) { 100 100 + GetIt.I<LogService>().getLogger('StoryAutoDeleteExec').e('Auto delete failed', error: e, stackTrace: s); 101 101 + } 102 102 + }

+100

lib/src/features/stories/providers/story_manager_provider.dart

reviewed

··· 1 1 + import 'package:atproto_core/atproto_core.dart'; 2 2 + import 'package:get_it/get_it.dart'; 3 3 + import 'package:riverpod_annotation/riverpod_annotation.dart'; 4 4 + import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart'; 5 5 + import 'package:sparksocial/src/core/network/atproto/data/repositories/sprk_repository.dart'; 6 6 + import 'package:sparksocial/src/core/utils/logging/log_service.dart'; 7 7 + import 'package:sparksocial/src/core/utils/logging/logger.dart'; 8 8 + import 'package:sparksocial/src/features/stories/providers/story_auto_delete_provider.dart'; 9 9 + 10 10 + part 'story_manager_provider.g.dart'; 11 11 + 12 12 + /// Simple state holder for the story manager 13 13 + class StoryManagerState { 14 14 + StoryManagerState({required this.stories, this.isLoading = false, this.error}); 15 15 + final List<StoryView> stories; // hydrated story views 16 16 + final bool isLoading; 17 17 + final String? error; 18 18 + 19 19 + StoryManagerState copyWith({List<StoryView>? stories, bool? isLoading, String? error}) { 20 20 + return StoryManagerState( 21 21 + stories: stories ?? this.stories, 22 22 + isLoading: isLoading ?? this.isLoading, 23 23 + error: error, 24 24 + ); 25 25 + } 26 26 + } 27 27 + 28 28 + @riverpod 29 29 + class StoryManager extends _$StoryManager { 30 30 + late final SprkRepository _sprk; 31 31 + late final SparkLogger _logger; 32 32 + 33 33 + @override 34 34 + Future<StoryManagerState> build() async { 35 35 + _sprk = GetIt.I<SprkRepository>(); 36 36 + _logger = GetIt.I<LogService>().getLogger('StoryManager'); 37 37 + ref.read(storyAutoDeleteExecutorProvider.future).catchError((_) {}); 38 38 + return _loadInitial(); 39 39 + } 40 40 + 41 41 + Future<StoryManagerState> _loadInitial() async { 42 42 + try { 43 43 + final did = _sprk.authRepository.session?.did; 44 44 + if (did == null) { 45 45 + return StoryManagerState(stories: const [], error: 'Not authenticated'); 46 46 + } 47 47 + // Page through all story records directly via atproto to include expired ( >24h ) ones 48 48 + final atproto = _sprk.authRepository.atproto; 49 49 + if (atproto == null) { 50 50 + return StoryManagerState(stories: const [], error: 'AtProto not initialized'); 51 51 + } 52 52 + const collection = 'so.sprk.feed.story'; 53 53 + String? cursor; 54 54 + final uris = <AtUri>[]; 55 55 + do { 56 56 + final result = await atproto.repo.listRecords( 57 57 + repo: did, 58 58 + collection: NSID.parse(collection), 59 59 + cursor: cursor, 60 60 + limit: 100, 61 61 + ); 62 62 + for (final record in result.data.records) { 63 63 + uris.add(record.uri); 64 64 + } 65 65 + cursor = result.data.cursor; 66 66 + } while (cursor != null); 67 67 + if (uris.isEmpty) { 68 68 + return StoryManagerState(stories: const []); 69 69 + } 70 70 + final storyViews = await _sprk.feed.getStoryViews(uris); 71 71 + 72 72 + storyViews.sort((a, b) => b.indexedAt.compareTo(a.indexedAt)); 73 73 + 74 74 + return StoryManagerState(stories: storyViews); 75 75 + } catch (e, s) { 76 76 + _logger.e('Failed to load stories for manager', error: e, stackTrace: s); 77 77 + return StoryManagerState(stories: const [], error: e.toString()); 78 78 + } 79 79 + } 80 80 + 81 81 + Future<void> refresh() async { 82 82 + state = const AsyncLoading(); 83 83 + state = await AsyncValue.guard(_loadInitial); 84 84 + } 85 85 + 86 86 + Future<void> deleteStory(StoryView story) async { 87 87 + final current = state.valueOrNull; 88 88 + if (current == null) return; 89 89 + try { 90 90 + // Optimistic update 91 91 + final updatedList = List<StoryView>.from(current.stories)..removeWhere((s) => s.uri == story.uri); 92 92 + state = AsyncData(current.copyWith(stories: updatedList)); 93 93 + await _sprk.repo.deleteRecord(uri: story.uri); 94 94 + } catch (e, s) { 95 95 + _logger.e('Error deleting story', error: e, stackTrace: s); 96 96 + // Revert by refreshing fully 97 97 + await refresh(); 98 98 + } 99 99 + } 100 100 + }

+3

lib/src/features/stories/ui/pages/all_stories_page.dart

reviewed

··· 10 10 required this.storiesByAuthor, 11 11 super.key, 12 12 this.initialAuthorIndex = 0, 13 13 + this.initialStoryIndex, 13 14 }); 14 15 15 16 final Map<ProfileViewBasic, List<StoryView>> storiesByAuthor; 16 17 final int initialAuthorIndex; 18 18 + final int? initialStoryIndex; 17 19 18 20 @override 19 21 State<AllStoriesPage> createState() => _AllStoriesPageState(); ··· 51 53 return AuthorStoriesPage( 52 54 author: entry.key, 53 55 stories: entry.value, 56 56 + initialStoryIndex: index == _currentAuthorIndex ? (widget.initialStoryIndex ?? 0) : 0, 54 57 onPreviousAuthor: index > 0 55 58 ? () => _pageController.previousPage( 56 59 duration: const Duration(milliseconds: 250),

+237

lib/src/features/stories/ui/pages/story_manager_page.dart

reviewed

··· 1 1 + import 'package:auto_route/auto_route.dart'; 2 2 + import 'package:cached_network_image/cached_network_image.dart'; 3 3 + import 'package:flutter/material.dart'; 4 4 + import 'package:flutter_riverpod/flutter_riverpod.dart'; 5 5 + import 'package:sparksocial/src/core/network/atproto/data/models/feed_models.dart'; 6 6 + import 'package:sparksocial/src/core/routing/app_router.dart'; 7 7 + import 'package:sparksocial/src/features/stories/providers/story_auto_delete_provider.dart'; 8 8 + import 'package:sparksocial/src/features/stories/providers/story_manager_provider.dart'; 9 9 + 10 10 + @RoutePage() 11 11 + class StoryManagerPage extends ConsumerWidget { 12 12 + const StoryManagerPage({super.key}); 13 13 + 14 14 + void _openStoryViewer(BuildContext context, WidgetRef ref, int index) { 15 15 + final state = ref.read(storyManagerProvider).valueOrNull; 16 16 + if (state == null) return; 17 17 + // Build map required by AllStoriesRoute (single author -> list) 18 18 + if (state.stories.isEmpty) return; 19 19 + final author = state.stories.first.author; 20 20 + context.router.push( 21 21 + AllStoriesRoute( 22 22 + storiesByAuthor: {author: state.stories}, 23 23 + initialStoryIndex: index, 24 24 + ), 25 25 + ); 26 26 + } 27 27 + 28 28 + Future<void> _deleteStory(BuildContext context, WidgetRef ref, int index) async { 29 29 + final notifier = ref.read(storyManagerProvider.notifier); 30 30 + final stories = ref.read(storyManagerProvider).valueOrNull?.stories ?? []; 31 31 + if (index >= stories.length) return; 32 32 + final story = stories[index]; 33 33 + final shouldDelete = 34 34 + await showDialog<bool>( 35 35 + context: context, 36 36 + builder: (ctx) => AlertDialog( 37 37 + title: const Text('Delete Story'), 38 38 + content: const Text('Are you sure you want to delete this story?'), 39 39 + actions: [ 40 40 + TextButton(onPressed: () => Navigator.of(ctx).maybePop(false), child: const Text('Cancel')), 41 41 + TextButton( 42 42 + onPressed: () => Navigator.of(ctx).maybePop(true), 43 43 + style: TextButton.styleFrom(foregroundColor: Colors.red), 44 44 + child: const Text('Delete'), 45 45 + ), 46 46 + ], 47 47 + ), 48 48 + ) ?? 49 49 + false; 50 50 + if (!shouldDelete) return; 51 51 + await notifier.deleteStory(story); 52 52 + if (context.mounted) { 53 53 + ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Story deleted'))); 54 54 + } 55 55 + } 56 56 + 57 57 + @override 58 58 + Widget build(BuildContext context, WidgetRef ref) { 59 59 + final asyncState = ref.watch(storyManagerProvider); 60 60 + final theme = Theme.of(context); 61 61 + 62 62 + final autoDeletePref = ref.watch(storyAutoDeletePrefProvider); 63 63 + 64 64 + return Scaffold( 65 65 + appBar: AppBar( 66 66 + title: const Text('Story Manager'), 67 67 + ), 68 68 + body: asyncState.when( 69 69 + data: (data) { 70 70 + return RefreshIndicator( 71 71 + onRefresh: () => ref.read(storyManagerProvider.notifier).refresh(), 72 72 + child: ListView.separated( 73 73 + padding: const EdgeInsets.all(16), 74 74 + separatorBuilder: (_, _) => const SizedBox(height: 12), 75 75 + itemCount: 1 + data.stories.length, // header + stories 76 76 + itemBuilder: (ctx, i) { 77 77 + if (i == 0) { 78 78 + return _AutoDeleteHeader(autoDeletePref: autoDeletePref, ref: ref); 79 79 + } 80 80 + final storyIndex = i - 1; 81 81 + if (data.stories.isEmpty) { 82 82 + return const SizedBox.shrink(); 83 83 + } 84 84 + final story = data.stories[storyIndex]; 85 85 + final age = DateTime.now().difference(story.indexedAt); 86 86 + final ageStr = age.inDays >= 1 87 87 + ? '${age.inDays}d' 88 88 + : age.inHours >= 1 89 89 + ? '${age.inHours}h' 90 90 + : age.inMinutes >= 1 91 91 + ? '${age.inMinutes}m' 92 92 + : 'now'; 93 93 + final thumbUrl = switch (story.media) { 94 94 + EmbedViewVideo(:final thumbnail) => thumbnail.toString(), 95 95 + EmbedViewBskyVideo(:final thumbnail) => thumbnail.toString(), 96 96 + EmbedViewImage(:final images) when images.isNotEmpty => images.first.thumb.toString(), 97 97 + EmbedViewBskyImages(:final images) when images.isNotEmpty => images.first.thumb.toString(), 98 98 + EmbedViewBskyRecordWithMedia(:final media) => switch (media) { 99 99 + EmbedViewVideo(:final thumbnail) => thumbnail.toString(), 100 100 + EmbedViewBskyVideo(:final thumbnail) => thumbnail.toString(), 101 101 + EmbedViewImage(:final images) when images.isNotEmpty => images.first.thumb.toString(), 102 102 + EmbedViewBskyImages(:final images) when images.isNotEmpty => images.first.thumb.toString(), 103 103 + _ => story.author.avatar.toString(), 104 104 + }, 105 105 + _ => story.author.avatar.toString(), 106 106 + }; 107 107 + return Material( 108 108 + color: Colors.transparent, 109 109 + child: InkWell( 110 110 + borderRadius: BorderRadius.circular(12), 111 111 + onTap: () => _openStoryViewer(context, ref, storyIndex), 112 112 + child: Padding( 113 113 + padding: const EdgeInsets.symmetric(vertical: 8), 114 114 + child: Row( 115 115 + children: [ 116 116 + ClipRRect( 117 117 + borderRadius: BorderRadius.circular(8), 118 118 + child: CachedNetworkImage( 119 119 + imageUrl: thumbUrl, 120 120 + width: 56, 121 121 + height: 56, 122 122 + fit: BoxFit.cover, 123 123 + errorWidget: (_, _, _) => Container( 124 124 + width: 56, 125 125 + height: 56, 126 126 + alignment: Alignment.center, 127 127 + color: theme.colorScheme.surfaceContainerHighest, 128 128 + child: const Icon(Icons.image_not_supported), 129 129 + ), 130 130 + ), 131 131 + ), 132 132 + const SizedBox(width: 12), 133 133 + Expanded( 134 134 + child: Column( 135 135 + crossAxisAlignment: CrossAxisAlignment.start, 136 136 + children: [ 137 137 + Text('Story ${data.stories.length - storyIndex}', style: theme.textTheme.titleMedium), 138 138 + const SizedBox(height: 4), 139 139 + Text('Posted $ageStr ago', style: theme.textTheme.bodySmall), 140 140 + ], 141 141 + ), 142 142 + ), 143 143 + IconButton( 144 144 + icon: const Icon(Icons.delete_outline, color: Colors.red), 145 145 + tooltip: 'Delete', 146 146 + onPressed: () => _deleteStory(context, ref, storyIndex), 147 147 + ), 148 148 + ], 149 149 + ), 150 150 + ), 151 151 + ), 152 152 + ); 153 153 + }, 154 154 + ), 155 155 + ); 156 156 + }, 157 157 + loading: () => const Center(child: CircularProgressIndicator()), 158 158 + error: (err, _) => Center( 159 159 + child: Column( 160 160 + mainAxisSize: MainAxisSize.min, 161 161 + children: [ 162 162 + Text('Error: $err'), 163 163 + const SizedBox(height: 12), 164 164 + ElevatedButton( 165 165 + onPressed: () => ref.read(storyManagerProvider.notifier).refresh(), 166 166 + child: const Text('Retry'), 167 167 + ), 168 168 + ], 169 169 + ), 170 170 + ), 171 171 + ), 172 172 + ); 173 173 + } 174 174 + } 175 175 + 176 176 + class _AutoDeleteHeader extends StatelessWidget { 177 177 + const _AutoDeleteHeader({required this.autoDeletePref, required this.ref}); 178 178 + final AsyncValue<bool> autoDeletePref; 179 179 + final WidgetRef ref; 180 180 + 181 181 + @override 182 182 + Widget build(BuildContext context) { 183 183 + final theme = Theme.of(context); 184 184 + final cardColor = theme.colorScheme.surfaceContainerHighest; 185 185 + return Container( 186 186 + decoration: BoxDecoration( 187 187 + color: cardColor, 188 188 + borderRadius: BorderRadius.circular(16), 189 189 + border: Border.all(color: theme.colorScheme.outline.withValues(alpha: 0.3)), 190 190 + ), 191 191 + padding: const EdgeInsets.all(16), 192 192 + child: Column( 193 193 + crossAxisAlignment: CrossAxisAlignment.start, 194 194 + children: [ 195 195 + Row( 196 196 + children: [ 197 197 + Expanded( 198 198 + child: Text( 199 199 + 'Auto-delete stories', 200 200 + style: theme.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600), 201 201 + ), 202 202 + ), 203 203 + autoDeletePref.when( 204 204 + data: (enabled) => Switch( 205 205 + value: enabled, 206 206 + onChanged: (v) async { 207 207 + await ref.read(storyAutoDeletePrefProvider.notifier).setEnabled(v); 208 208 + if (v) { 209 209 + final f = ref.refresh(storyAutoDeleteExecutorProvider.future); 210 210 + await f; 211 211 + await ref.read(storyManagerProvider.notifier).refresh(); 212 212 + } 213 213 + }, 214 214 + ), 215 215 + loading: () => const SizedBox( 216 216 + width: 28, 217 217 + height: 28, 218 218 + child: CircularProgressIndicator(strokeWidth: 2), 219 219 + ), 220 220 + error: (_, _) => IconButton( 221 221 + icon: const Icon(Icons.refresh), 222 222 + tooltip: 'Retry', 223 223 + onPressed: () => ref.refresh(storyAutoDeletePrefProvider), 224 224 + ), 225 225 + ), 226 226 + ], 227 227 + ), 228 228 + const SizedBox(height: 8), 229 229 + Text( 230 230 + 'Stories are public and stored on your PDS indefinitely. Enable this so the app auto deletes them forever after 24h. Enabling this will also execute an initial cleanup of any stories older than 24h.', 231 231 + style: theme.textTheme.bodySmall?.copyWith(color: theme.colorScheme.onSurfaceVariant), 232 232 + ), 233 233 + ], 234 234 + ), 235 235 + ); 236 236 + } 237 237 + }

+18 -4

lib/src/features/stories/ui/pages/story_page.dart

reviewed

··· 125 125 126 126 if (_isVideoStory(widget.story)) { 127 127 if (_videoController != null && _isVideoInitialized) { 128 128 - mediaContent = AspectRatio( 129 129 - aspectRatio: _videoController!.value.aspectRatio, 130 130 - child: VideoPlayer(_videoController!), 131 131 - ); 128 128 + if (_videoController!.value.isInitialized) { 129 129 + final size = _videoController!.value.size; 130 130 + mediaContent = Container( 131 131 + color: Colors.black, 132 132 + alignment: Alignment.center, 133 133 + child: FittedBox( 134 134 + child: SizedBox( 135 135 + width: (size.width > 0 ? size.width : 1280), 136 136 + height: (size.height > 0 ? size.height : 720), 137 137 + child: VideoPlayer(_videoController!), 138 138 + ), 139 139 + ), 140 140 + ); 141 141 + } else { 142 142 + mediaContent = const Center( 143 143 + child: Icon(Icons.videocam_off, size: 48, color: Colors.white), 144 144 + ); 145 145 + } 132 146 } else { 133 147 mediaContent = const Center(child: CircularProgressIndicator()); 134 148 }

+6

lib/src/features/stories/ui/widgets/stories_list.dart

reviewed

··· 118 118 'Stories', 119 119 style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: Theme.of(context).colorScheme.onSurface), 120 120 ), 121 121 + const Spacer(), 122 122 + IconButton( 123 123 + icon: const Icon(Icons.manage_history_outlined, size: 20), 124 124 + tooltip: 'Manage', 125 125 + onPressed: () => context.router.push(const StoryManagerRoute()), 126 126 + ), 121 127 ], 122 128 ), 123 129 ),

+1 -1

pubspec.lock

reviewed

··· 1611 1611 source: hosted 1612 1612 version: "9.0.0" 1613 1613 video_player: 1614 1614 - dependency: transitive 1614 1614 + dependency: "direct main" 1615 1615 description: 1616 1616 name: video_player 1617 1617 sha256: "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a"

+1

pubspec.yaml

reviewed

··· 46 46 any_link_preview: ^3.0.3 47 47 better_player_plus: ^1.0.8 48 48 flutter_animated_progress_bar: ^1.0.5 49 49 + video_player: ^2.10.0 49 50 50 51 dev_dependencies: 51 52 flutter_test: