From 6c698c5b942a71b46eaa86622c230bae04575ac2 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 5 May 2020 21:08:51 -0500
Subject: [PATCH] Use video preview if available

---
 .../FeedProvider/Reddit/RedditLink.swift      | 23 +++++++++++++++----
 .../FeedProvider/Reddit/RedditPreview.swift   | 16 +++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/Frameworks/Account/FeedProvider/Reddit/RedditLink.swift b/Frameworks/Account/FeedProvider/Reddit/RedditLink.swift
index 847c0a78e..73bf3b159 100644
--- a/Frameworks/Account/FeedProvider/Reddit/RedditLink.swift
+++ b/Frameworks/Account/FeedProvider/Reddit/RedditLink.swift
@@ -73,10 +73,11 @@ struct RedditLinkData: Codable {
 			return mediaEmbedContent
 		}
 		
-		if isVideo ?? false {
-			guard let fallbackURL = media?.video?.fallbackURL else {
-				return nil
-			}
+		if url.hasSuffix(".gif") {
+			return "<figure><img src=\"\(url)\"></figure>"
+		}
+		
+		if isVideo ?? false, let videoURL = media?.video?.fallbackURL {
 			var html = "<video "
 			if let previewImageURL = preview?.images?.first?.source?.url {
 				html += "poster=\"\(previewImageURL)\" "
@@ -84,7 +85,19 @@ struct RedditLinkData: Codable {
 			if let width = media?.video?.width, let height = media?.video?.height {
 				html += "width=\"\(width)\" height=\"\(height)\" "
 			}
-			html += "src=\"\(fallbackURL)\"></video>"
+			html += "src=\"\(videoURL)\"></video>"
+			return html
+		}
+		
+		if let videoPreviewURL = preview?.videoPreview?.url {
+			var html = "<video "
+			if let previewImageURL = preview?.images?.first?.source?.url {
+				html += "poster=\"\(previewImageURL)\" "
+			}
+			if let width = preview?.videoPreview?.width, let height = preview?.videoPreview?.height {
+				html += "width=\"\(width)\" height=\"\(height)\" "
+			}
+			html += "src=\"\(videoPreviewURL)\"></video>"
 			return html
 		}
 		
diff --git a/Frameworks/Account/FeedProvider/Reddit/RedditPreview.swift b/Frameworks/Account/FeedProvider/Reddit/RedditPreview.swift
index 93e90f3a0..567faeddf 100644
--- a/Frameworks/Account/FeedProvider/Reddit/RedditPreview.swift
+++ b/Frameworks/Account/FeedProvider/Reddit/RedditPreview.swift
@@ -11,9 +11,11 @@ import Foundation
 struct RedditPreview: Codable {
 
 	let images: [RedditPreviewImage]?
+	let videoPreview: RedditVideoPreview?
     
     enum CodingKeys: String, CodingKey {
         case images = "images"
+		case videoPreview = "reddit_video_preview"
     }
 	
 }
@@ -41,3 +43,17 @@ struct RedditPreviewImageSource: Codable {
 	}
 	
 }
+
+struct RedditVideoPreview: Codable {
+	
+	let url: String?
+	let width: Int?
+	let height: Int?
+
+	enum CodingKeys: String, CodingKey {
+		case url = "fallback_url"
+		case width = "width"
+		case height = "height"
+	}
+	
+}