Show cross-posts on Post page (#851)

* Show cross-posts

* Finish create cross-post functionality

* More merge fixes

* Refactor crossposts widget

CHANGELOG.md

@@ -18,6 +18,7 @@
 - Added support for receiving share intents. Android only. - contribution from @ggichure
 - Added ability to block instances from long-press menu and user settings
 - Add more search options - contribution from @micahmo
+- Added support for display cross-posts - contribution from @micahmo
 
 ### Changed
 - Collapsed comments are easier to expand - contribution from @micahmo

lib/community/pages/create_post_page.dart

@@ -32,6 +32,7 @@ class CreatePostPage extends StatefulWidget {
   final DraftPost? previousDraftPost;
 
   // used create post from action sheet
+  final String? title;
   final String? text;
   final File? image;
   final String? url;
@@ -45,6 +46,7 @@ class CreatePostPage extends StatefulWidget {
     this.previousDraftPost,
     this.onUpdateDraft,
     this.image,
+    this.title,
     this.text,
     this.url,
     this.prePopulated = false,
@@ -100,6 +102,7 @@ class _CreatePostPageState extends State<CreatePostPage> {
     });
 
     if (widget.prePopulated == true) {
+      _titleTextController.text = widget.title ?? '';
       _bodyTextController.text = widget.text ?? '';
       _urlTextController.text = widget.url ?? '';
       _getDataFromLink();

lib/core/enums/local_settings.dart

@@ -38,6 +38,7 @@ enum LocalSettings {
   showPostAuthor(name: 'setting_general_show_post_author', label: 'Show Post Author'),
   dimReadPosts(name: 'setting_dim_read_posts', label: 'Dim Read Posts'),
   useAdvancedShareSheet(name: 'setting_use_advanced_share_sheet', label: 'Use Advanced Share Sheet'),
+  showCrossPosts(name: 'setting_show_cross_posts', label: 'Show Cross-Posts'),
 
   /// -------------------------- Post Page Related Settings --------------------------
   // Comment Related Settings

lib/l10n/app_en.arb

@@ -168,6 +168,9 @@
   "search": "Search",
   "@search": {},
   "account": "Account",
+  "crossPostedTo": "Cross-posted to",
+  "andXMore": "and {count} more",
+  "createNewCrossPost": "Create new cross-post",
   "@account": {},
   "inbox": "Inbox",
   "@inbox": {},

lib/post/bloc/post_bloc.dart

@@ -104,14 +104,17 @@ class PostBloc extends Bloc<PostEvent, PostState> {
 
           GetPostResponse? getPostResponse;
 
-          if (event.postId != null) {
-            getPostResponse = await lemmy.run(GetPost(id: event.postId!, auth: account?.jwt)).timeout(timeout, onTimeout: () {
+          // Retrieve the full post for moderators and cross-posts
+          int? postId = event.postId ?? event.postView?.postView.post.id;
+          if (postId != null) {
+            getPostResponse = await lemmy.run(GetPost(id: postId, auth: account?.jwt)).timeout(timeout, onTimeout: () {
               throw Exception(AppLocalizations.of(GlobalContext.context)!.timeoutComments);
             });
           }
 
           PostViewMedia? postView = event.postView;
           List<CommunityModeratorView>? moderators;
+          List<PostView>? crossPosts;
 
           if (getPostResponse != null) {
             // Parse the posts and add in media information which is used elsewhere in the app
@@ -120,6 +123,7 @@ class PostBloc extends Bloc<PostEvent, PostState> {
             postView = posts.first;
 
             moderators = getPostResponse.moderators;
+            crossPosts = getPostResponse.crossPosts;
           }
 
           // If we can't get mods from the post response, fallback to getting the whole community.
@@ -140,6 +144,7 @@ class PostBloc extends Bloc<PostEvent, PostState> {
               postView: postView,
               communityId: postView?.postView.post.communityId,
               moderators: moderators,
+              crossPosts: crossPosts,
               selectedCommentPath: event.selectedCommentPath,
               selectedCommentId: event.selectedCommentId,
               newlyCreatedCommentId: event.newlyCreatedCommentId));

lib/post/bloc/post_state.dart

@@ -13,6 +13,7 @@ class PostState extends Equatable {
     this.commentCount = 0,
     this.communityId,
     this.moderators,
+    this.crossPosts,
     this.hasReachedCommentEnd = false,
     this.errorMessage,
     this.sortType,
@@ -36,6 +37,7 @@ class PostState extends Equatable {
   final int? postId;
   final int? communityId;
   final List<CommunityModeratorView>? moderators;
+  final List<PostView>? crossPosts;
   final PostViewMedia? postView;
 
   // Comment related data
@@ -71,6 +73,7 @@ class PostState extends Equatable {
     bool? hasReachedCommentEnd,
     int? communityId,
     List<CommunityModeratorView>? moderators,
+    List<PostView>? crossPosts,
     String? errorMessage,
     CommentSortType? sortType,
     IconData? sortTypeIcon,
@@ -93,6 +96,7 @@ class PostState extends Equatable {
       hasReachedCommentEnd: hasReachedCommentEnd ?? this.hasReachedCommentEnd,
       communityId: communityId ?? this.communityId,
       moderators: moderators ?? this.moderators,
+      crossPosts: crossPosts ?? this.crossPosts,
       errorMessage: errorMessage ?? this.errorMessage,
       sortType: sortType ?? this.sortType,
       sortTypeIcon: sortTypeIcon ?? this.sortTypeIcon,
@@ -116,6 +120,7 @@ class PostState extends Equatable {
         commentCount,
         communityId,
         moderators,
+        crossPosts,
         errorMessage,
         hasReachedCommentEnd,
         sortType,

lib/post/pages/post_page.dart

@@ -401,6 +401,7 @@ class _PostPageState extends State<PostPage> {
                                 itemPositionsListener: _itemPositionsListener,
                                 hasReachedCommentEnd: state.hasReachedCommentEnd,
                                 moderators: state.moderators,
+                                crossPosts: state.crossPosts,
                               ),
                             );
                           }

lib/post/pages/post_page_success.dart

@@ -38,6 +38,7 @@ class PostPageSuccess extends StatefulWidget {
   final bool viewFullCommentsRefreshing;
 
   final List<CommunityModeratorView>? moderators;
+  final List<PostView>? crossPosts;
 
   const PostPageSuccess({
     super.key,
@@ -52,6 +53,7 @@ class PostPageSuccess extends StatefulWidget {
     this.moddingCommentId,
     this.viewFullCommentsRefreshing = false,
     required this.moderators,
+    required this.crossPosts,
   });
 
   @override
@@ -160,6 +162,7 @@ class _PostPageSuccessState extends State<PostPageSuccess> {
               });
             },
             moderators: widget.moderators,
+            crossPosts: widget.crossPosts,
           ),
         ),
       ],

lib/post/widgets/comment_view.dart

@@ -37,6 +37,7 @@ class CommentSubview extends StatefulWidget {
   final DateTime now;
 
   final List<CommunityModeratorView>? moderators;
+  final List<PostView>? crossPosts;
 
   const CommentSubview({
     super.key,
@@ -58,6 +59,7 @@ class CommentSubview extends StatefulWidget {
     this.viewFullCommentsRefreshing = false,
     required this.now,
     required this.moderators,
+    required this.crossPosts,
   });
 
   @override
@@ -135,6 +137,7 @@ class _CommentSubviewState extends State<CommentSubview> with SingleTickerProvid
               useDisplayNames: state.useDisplayNames,
               postViewMedia: widget.postViewMedia!,
               moderators: widget.moderators,
+              crossPosts: widget.crossPosts,
             );
           }
           if (widget.hasReachedCommentEnd == false && widget.comments.isEmpty) {