From d4096f3dcc8dc7ba5c4c290d71cb825c81d0885a Mon Sep 17 00:00:00 2001
From: Andros Fenollosa <tanrax@users.noreply.github.com>
Date: Sat, 31 Jul 2021 11:56:47 +0200
Subject: [PATCH] Update feeds.clj

---
 src/rsspaper/feeds.clj | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/rsspaper/feeds.clj b/src/rsspaper/feeds.clj
index 9db6456..4bca700 100644
--- a/src/rsspaper/feeds.clj
+++ b/src/rsspaper/feeds.clj
@@ -42,12 +42,11 @@
   (map (fn [article]
          (let [url-article (get-in article [:feed :link])
                html (:body (client/get url-article {:insecure? true}))
-               first-content (second (re-find #"<meta.*content=\"([^\">]+)\"[^>].*property=\"og:image(?::url)?\".*>" html))
-               second-content (second (re-find #"<meta.*property=\"og:image(?::url)?\"[^>].*content=\"([^\">]+)\".*>" html))
-               first-image (second (re-find #"(<main|id=\".*main.*\"|class=\".*main.*\").*<img[^>]+src=\"([^\">]+)\"" html))
-               images [first-content second-content first-image]
-               final-image (first (filter (fn [item] (not (nil? item))) images))]
-           (assoc article :cover final-image))) articles))
+               url-og-image (second (re-find #"<meta[^>].*?[^>]property=\"og:image(?::url)?\".*?[^>]content=\"(.*?)\".*?>|<meta[^>].*?[^>]content=\"(.*?)\".*?[^>]property=\"og:image(?::url)?\".*?>" html))
+               url-first-image (second (re-find #"(<main|id=\".*main.*\"|class=\".*main.*\").*<img[^>]+src=\"([^\">]+)\"" html))
+               images [url-og-image url-first-image]
+               url-final-image (first (filter (fn [item] (not (nil? item))) images))]
+           (assoc article :cover url-final-image))) articles))
 
 (defn order-published
   [articles]