Distinguish direct video URLs

lib/community/pages/create_post_page.dart

@@ -36,7 +36,7 @@ import 'package:thunder/shared/snackbar.dart';
 import 'package:thunder/user/utils/restore_user.dart';
 import 'package:thunder/user/widgets/user_selector.dart';
 import 'package:thunder/utils/debounce.dart';
-import 'package:thunder/utils/image.dart';
+import 'package:thunder/utils/media/image.dart';
 import 'package:thunder/utils/instance.dart';
 
 class CreatePostPage extends StatefulWidget {

lib/community/widgets/post_card_type_badge.dart

@@ -43,7 +43,11 @@ class TypeBadge extends StatelessWidget {
       MediaType.image: MediaTypeBadgeItem(
         baseColor: Colors.red,
         icon: Icon(size: 17, Icons.image_outlined, color: getIconColor(theme, Colors.red)),
-      )
+      ),
+      MediaType.video: MediaTypeBadgeItem(
+        baseColor: Colors.purple,
+        icon: Icon(size: 17, Icons.play_arrow_rounded, color: getIconColor(theme, Colors.purple)),
+      ),
     };
 
     return SizedBox(
@@ -60,6 +64,7 @@ class TypeBadge extends StatelessWidget {
             MediaType.text => typeBadgeItem(context, mediaTypeItems[MediaType.text]!),
             MediaType.link => typeBadgeItem(context, mediaTypeItems[MediaType.link]!),
             MediaType.image => typeBadgeItem(context, mediaTypeItems[MediaType.image]!),
+            MediaType.video => typeBadgeItem(context, mediaTypeItems[MediaType.video]!),
             _ => typeBadgeItem(context, mediaTypeItems[MediaType.text]!),
           },
         ),

lib/community/widgets/post_card_view_comfortable.dart

@@ -81,7 +81,7 @@ class PostCardViewComfortable extends StatelessWidget {
 
     var mediaView = MediaView(
       scrapeMissingPreviews: state.scrapeMissingPreviews,
-      postView: postViewMedia,
+      postViewMedia: postViewMedia,
       showFullHeightImages: showFullHeightImages,
       hideNsfwPreviews: hideNsfwPreviews,
       edgeToEdgeImages: edgeToEdgeImages,

lib/community/widgets/post_card_view_compact.dart

@@ -213,7 +213,7 @@ class ThumbnailPreview extends StatelessWidget {
             padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 4),
             child: MediaView(
               scrapeMissingPreviews: state.scrapeMissingPreviews,
-              postView: postViewMedia,
+              postViewMedia: postViewMedia,
               showFullHeightImages: false,
               hideNsfwPreviews: hideNsfwPreviews,
               markPostReadOnMediaView: markPostReadOnMediaView,

lib/core/enums/media_type.dart

@@ -1 +1 @@
-enum MediaType { image, video, gallery, link, text }
+enum MediaType { image, video, link, text }

lib/l10n/app_en.arb

@@ -935,6 +935,10 @@
   "@notificationsWarningDialog": {
     "description": "The content of the warning dialog for the notifications feature"
   },
+  "nsfwWarning": "NSFW - Tap to reveal",
+  "@nsfwWarning": {
+    "description": "Warning for NSFW posts"
+  },
   "off": "off",
   "@off": {},
   "ok": "OK",

lib/post/pages/create_comment_page.dart

@@ -18,7 +18,7 @@ import 'package:thunder/shared/snackbar.dart';
 import 'package:thunder/shared/text/scalable_text.dart';
 import 'package:thunder/thunder/bloc/thunder_bloc.dart';
 import 'package:thunder/user/widgets/user_indicator.dart';
-import 'package:thunder/utils/image.dart';
+import 'package:thunder/utils/media/image.dart';
 import 'package:thunder/utils/instance.dart';
 
 class CreateCommentPage extends StatefulWidget {
@@ -281,7 +281,7 @@ class _CreateCommentPageState extends State<CreateCommentPage> {
                                       ),
                                       MediaView(
                                         scrapeMissingPreviews: thunderState.scrapeMissingPreviews,
-                                        postView: widget.postView,
+                                        postViewMedia: widget.postView!,
                                         hideNsfwPreviews: thunderState.hideNsfwPreviews,
                                         markPostReadOnMediaView: thunderState.markPostReadOnMediaView,
                                         isUserLoggedIn: true,

lib/post/utils/post.dart

@@ -14,8 +14,9 @@ import 'package:thunder/core/models/media_extension.dart';
 import 'package:thunder/core/models/post_view_media.dart';
 import 'package:thunder/core/singletons/lemmy_client.dart';
 import 'package:thunder/core/singletons/preferences.dart';
-import 'package:thunder/utils/image.dart';
+import 'package:thunder/utils/media/image.dart';
 import 'package:thunder/utils/links.dart';
+import 'package:thunder/utils/media/video.dart';
 
 extension on MarkPostAsReadResponse {
   bool isSuccess() {
@@ -237,8 +238,10 @@ Future<List<PostViewMedia>> parsePostViews(List<PostView> postViews, {String? re
   bool edgeToEdgeImages = prefs.getBool(LocalSettings.showPostEdgeToEdgeImages.name) ?? false;
   bool tabletMode = prefs.getBool(LocalSettings.useTabletMode.name) ?? false;
   bool hideNsfwPosts = prefs.getBool(LocalSettings.hideNsfwPosts.name) ?? false;
+  bool scrapeMissingPreviews = prefs.getBool(LocalSettings.scrapeMissingPreviews.name) ?? false;
 
   List<PostView> postViewsFinal = [];
+
   if (resolutionInstance != null) {
     final LemmyApiV3 lemmy = (LemmyClient()..changeBaseUrl(resolutionInstance)).lemmyApiV3;
 
@@ -254,92 +257,66 @@ Future<List<PostViewMedia>> parsePostViews(List<PostView> postViews, {String? re
     postViewsFinal = postViews.toList();
   }
 
-  Iterable<Future<PostViewMedia>> postFutures =
-      postViewsFinal.expand((post) => [if (!hideNsfwPosts || (!post.post.nsfw && hideNsfwPosts)) parsePostView(post, fetchImageDimensions, edgeToEdgeImages, tabletMode)]).toList();
-  List<PostViewMedia> posts = await Future.wait(postFutures);
+  Iterable<Future<PostViewMedia>> postFutures = postViewsFinal
+      .expand(
+        (post) => [
+          if (!hideNsfwPosts || (!post.post.nsfw && hideNsfwPosts)) parsePostView(post, fetchImageDimensions, edgeToEdgeImages, tabletMode, scrapeMissingPreviews),
+        ],
+      )
+      .toList();
 
+  List<PostViewMedia> posts = await Future.wait(postFutures);
   return posts;
 }
 
-Future<PostViewMedia> parsePostView(PostView postView, bool fetchImageDimensions, bool edgeToEdgeImages, bool tabletMode) async {
-  List<Media> media = [];
-  String? url = postView.post.url;
+Future<PostViewMedia> parsePostView(PostView postView, bool fetchImageDimensions, bool edgeToEdgeImages, bool tabletMode, bool scrapeMissingPreviews) async {
+  List<Media> mediaList = [];
 
-  if (url != null && isImageUrl(url)) {
-    try {
-      MediaType mediaType = MediaType.image;
+  // There are three sources of URLs: the main url attached to the post, the thumbnail url attached to the post, and the video url attached to the post
+  String? url = postView.post.url ?? '';
+  String? thumbnailUrl = postView.post.thumbnailUrl;
+  String? videoUrl = postView.post.embedVideoUrl; // @TODO: Add support for videos
 
-      if (fetchImageDimensions) {
-        Size result = await retrieveImageDimensions(imageUrl: url);
-        Size size = MediaExtension.getScaledMediaSize(width: result.width, height: result.height, offset: edgeToEdgeImages ? 0 : 24, tabletMode: tabletMode);
-        media.add(Media(mediaUrl: url, originalUrl: url, width: size.width, height: size.height, mediaType: mediaType));
-      } else {
-        media.add(Media(mediaUrl: url, originalUrl: url, mediaType: mediaType));
-      }
-    } catch (e) {
-      // If it fails, fall back to a media type of link
-      media.add(Media(originalUrl: url, mediaType: MediaType.link));
-    }
-  } else if (url != null) {
-    if (fetchImageDimensions) {
-      if (postView.post.thumbnailUrl?.isNotEmpty == true) {
-        try {
-          Size result = await retrieveImageDimensions(imageUrl: postView.post.thumbnailUrl!);
-          Size size = MediaExtension.getScaledMediaSize(width: result.width, height: result.height, offset: edgeToEdgeImages ? 0 : 24, tabletMode: tabletMode);
-          media.add(Media(
-            mediaUrl: postView.post.thumbnailUrl!,
-            mediaType: MediaType.link,
-            originalUrl: url,
-            width: size.width,
-            height: size.height,
-          ));
-        } catch (e) {
-          // If it fails, fall back to a media type of link
-          media.add(Media(originalUrl: url, mediaType: MediaType.link));
-        }
-      } else {
-        try {
-          // For external links, attempt to fetch any media associated with it (image, title)
-          LinkInfo linkInfo = await getLinkInfo(url);
-
-          if (linkInfo.imageURL != null && linkInfo.imageURL!.isNotEmpty) {
-            Size result = await retrieveImageDimensions(imageUrl: linkInfo.imageURL!);
-
-            int mediaHeight = result.height.toInt();
-            int mediaWidth = result.width.toInt();
-            Size size = MediaExtension.getScaledMediaSize(width: mediaWidth, height: mediaHeight, offset: edgeToEdgeImages ? 0 : 24, tabletMode: tabletMode);
-            media.add(Media(mediaUrl: linkInfo.imageURL!, mediaType: MediaType.link, originalUrl: url, height: size.height, width: size.width));
-          } else {
-            media.add(Media(mediaUrl: linkInfo.imageURL!, mediaType: MediaType.link, originalUrl: url));
-          }
-        } catch (e) {
-          // Default back to a link
-          media.add(Media(mediaType: MediaType.link, originalUrl: url));
-        }
-      }
-    } else {
-      if (postView.post.thumbnailUrl?.isNotEmpty == true) {
-        media.add(Media(mediaUrl: postView.post.thumbnailUrl!, mediaType: MediaType.link, originalUrl: url));
-      } else {
-        media.add(Media(mediaType: MediaType.link, originalUrl: url));
-      }
+  // First, check what type of link we're dealing with based on the url (MediaType.image, MediaType.video, MediaType.link, MediaType.text)
+  bool isImage = isImageUrl(url);
+  bool isVideo = isVideoUrl(url);
+
+  MediaType mediaType;
+
+  if (isImage) {
+    mediaType = MediaType.image;
+  } else if (isVideo) {
+    mediaType = MediaType.video;
+  } else if (url.isNotEmpty) {
+    mediaType = MediaType.link;
+  } else {
+    mediaType = MediaType.text;
+  }
+
+  Media media = Media(mediaType: mediaType, originalUrl: url);
+
+  if (thumbnailUrl != null && thumbnailUrl.isNotEmpty) {
+    // Now check to see if there is a thumbnail image. If there is, we'll use that for the image
+    media.mediaUrl = thumbnailUrl;
+  } else if (scrapeMissingPreviews) {
+    // If there is no thumbnail image, we'll see if we should try to fetch the link metadata
+    LinkInfo linkInfo = await getLinkInfo(url);
+
+    if (linkInfo.imageURL != null && linkInfo.imageURL!.isNotEmpty) {
+      media.mediaUrl = linkInfo.imageURL!;
     }
   }
 
-  return PostViewMedia(
-    postView: PostView(
-      community: postView.community,
-      counts: postView.counts,
-      creator: postView.creator,
-      creatorBannedFromCommunity: postView.creatorBannedFromCommunity,
-      creatorBlocked: postView.creatorBlocked,
-      myVote: postView.myVote,
-      post: postView.post,
-      read: postView.read,
-      saved: postView.saved,
-      subscribed: postView.subscribed,
-      unreadComments: postView.unreadComments,
-    ),
-    media: media,
-  );
+  // Finally, check to see if we need to fetch the image dimensions
+  if (fetchImageDimensions && media.mediaUrl != null) {
+    Size result = await retrieveImageDimensions(imageUrl: media.mediaUrl);
+    Size size = MediaExtension.getScaledMediaSize(width: result.width, height: result.height, offset: edgeToEdgeImages ? 0 : 24, tabletMode: tabletMode);
+
+    media.width = size.width;
+    media.height = size.height;
+  }
+
+  mediaList.add(media);
+
+  return PostViewMedia(postView: postView, media: mediaList);
 }

lib/post/widgets/post_view.dart

@@ -148,8 +148,7 @@ class _PostSubviewState extends State<PostSubview> with SingleTickerProviderStat
                 collapsed: Container(),
                 expanded: MediaView(
                   scrapeMissingPreviews: scrapeMissingPreviews,
-                  post: post,
-                  postView: widget.postViewMedia,
+                  postViewMedia: widget.postViewMedia,
                   hideNsfwPreviews: hideNsfwPreviews,
                   markPostReadOnMediaView: markPostReadOnMediaView,
                   isUserLoggedIn: isUserLoggedIn,
@@ -542,7 +541,7 @@ class _PostSubviewState extends State<PostSubview> with SingleTickerProviderStat
           ),
           child: MediaView(
             scrapeMissingPreviews: thunderState.scrapeMissingPreviews,
-            postView: postViewMedia,
+            postViewMedia: postViewMedia,
             showFullHeightImages: false,
             hideNsfwPreviews: hideNsfwPreviews,
             markPostReadOnMediaView: markPostReadOnMediaView,

lib/shared/common_markdown_body.dart

@@ -8,7 +8,7 @@ import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:thunder/shared/text/scalable_text.dart';
 
-import 'package:thunder/utils/image.dart';
+import 'package:thunder/utils/media/image.dart';
 import 'package:thunder/utils/links.dart';
 import 'package:thunder/shared/image_preview.dart';
 import 'package:thunder/core/enums/font_scale.dart';

lib/shared/image_preview.dart

@@ -9,7 +9,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:thunder/core/enums/image_caching_mode.dart';
 import 'package:thunder/thunder/bloc/thunder_bloc.dart';
 
-import 'package:thunder/utils/image.dart';
+import 'package:thunder/utils/media/image.dart';
 
 class ImagePreview extends StatefulWidget {
   final String? url;

lib/shared/image_viewer.dart

@@ -21,7 +21,7 @@ import 'package:thunder/shared/dialogs.dart';
 import 'package:thunder/shared/snackbar.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:thunder/thunder/bloc/thunder_bloc.dart';
-import 'package:thunder/utils/image.dart';
+import 'package:thunder/utils/media/image.dart';
 
 class ImageViewer extends StatefulWidget {
   final String? url;