From 3e219c232c0bb4a64f615c599473c959691e6319 Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.eu>
Date: Sat, 2 May 2020 02:26:54 +0200
Subject: Improved image support

---
 internal/feed/mail.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'internal/feed')

diff --git a/internal/feed/mail.go b/internal/feed/mail.go
index 5f543e4..297aeff 100644
--- a/internal/feed/mail.go
+++ b/internal/feed/mail.go
@@ -14,6 +14,7 @@ import (
 	"github.com/PuerkitoBio/goquery"
 	"github.com/emersion/go-message"
 	"github.com/emersion/go-message/mail"
+	"github.com/gabriel-vasile/mimetype"
 
 	"github.com/Necoro/feed2imap-go/internal/feed/template"
 	"github.com/Necoro/feed2imap-go/pkg/config"
@@ -177,6 +178,10 @@ func (feed *Feed) ToMails(cfg *config.Config) ([]string, error) {
 }
 
 func getImage(src string) ([]byte, string) {
+	if strings.HasPrefix(src, "//") {
+		src = "https:" + src
+	}
+
 	resp, err := stdHTTPClient.Get(src)
 	if err != nil {
 		log.Errorf("Error fetching from '%s': %s", src, err)
@@ -190,14 +195,14 @@ func getImage(src string) ([]byte, string) {
 		return nil, ""
 	}
 
+	var mimeStr string
 	ext := path.Ext(src)
 	if ext == "" {
-		log.Warnf("Cannot determine extension from '%s', skipping.", src)
-		return nil, ""
+		mimeStr = mimetype.Detect(img).String()
+	} else {
+		mimeStr = mime.TypeByExtension(ext)
 	}
-
-	mime := mime.TypeByExtension(ext)
-	return img, mime
+	return img, mimeStr
 }
 
 func cidNr(idx int) string {
-- 
cgit v1.2.3-70-g09d2