Merge branch '131' into release-candidate/3.3.0

Author: leonardocardoso

CHANGELOG.md

@@ -20,6 +20,10 @@
 
 ---
 
+#### Changed
+- fixed youtube and open graph tags image metadata issues
+  - Changed by [nafis042](https://github.com/nafis042)
+
 ## [3.2.0](https://github.com/LeonardoCardoso/Swift-Link-Preview/releases/tag/3.2.0)
 
 #### Changed

Sources/Regex.swift

@@ -12,7 +12,9 @@ class Regex {
 
     static let imagePattern = "(.+?)\\.(gif|jpg|jpeg|png|bmp)$"
     static let videoTagPattern = "<video[^>]+src=\"([^\"]+)"
+    static let secondaryVideoTagPattern = "og:video\" content=\"([^\"](.+?))\"(.+?)[/]?>"
     static let imageTagPattern = "<img(.+?)src=\"([^\"](.+?))\"(.+?)[/]?>"
+    static let secondaryImageTagPattern = "og:image\" content=\"([^\"](.+?))\"(.+?)[/]?>"
     static let titlePattern = "<title(.*?)>(.*?)</title>"
     static let metatagPattern = "<meta(.*?)>"
     static let metatagContentPattern = "content=(\"(.*?)\")|('(.*?)')"

Sources/SwiftLinkPreview.swift

@@ -380,6 +380,7 @@ extension SwiftLinkPreview {
             }
             var request = URLRequest( url: sourceUrl )
             request.addValue("text/html,application/xhtml+xml,application/xml", forHTTPHeaderField: "Accept")
+            request.addValue("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", forHTTPHeaderField: "user-Agent")
             let (data, urlResponse, error) = session.synchronousDataTask(with: request )
             if let error = error {
                 if !cancellable.isCancelled {
@@ -627,9 +628,23 @@ extension SwiftLinkPreview {
                     result.images = imgs
                     result.image = imgs.first
                 }
+                else{
+                    let values = Regex.pregMatchAll(htmlCode, regex: Regex.secondaryImageTagPattern, index: 1)
+                    if !values.isEmpty {
+                        result.images = values
+                        result.image = values.first
+                    }
+                }
             }
         } else {
-            result.images = [self.addImagePrefixIfNeeded(mainImage ?? String(), result: result)]
+                let values = Regex.pregMatchAll(htmlCode, regex: Regex.secondaryImageTagPattern, index: 1)
+                if !values.isEmpty {
+                    result.images = values
+                    result.image = values.first
+                }
+                else{
+                    result.images = [self.addImagePrefixIfNeeded(mainImage ?? String(), result: result)]
+                }
         }
         return result
     }