From 6a769b7b6047ef8ebda56b8f67ce911a7bd4c62d Mon Sep 17 00:00:00 2001
From: AKP <tom@tdpain.net>
Date: Tue, 5 Apr 2022 14:03:19 +0100
Subject: Add logo to email header

Signed-off-by: AKP <tom@tdpain.net>
---
 walrss/internal/http/views/page.qtpl.html    |  2 +-
 walrss/internal/http/views/page.qtpl.html.go | 18 ++++++++++++++----
 walrss/internal/rss/processor.go             |  2 ++
 walrss/internal/state/state.go               |  4 ++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/walrss/internal/http/views/page.qtpl.html b/walrss/internal/http/views/page.qtpl.html
index f7e7cba..719ec99 100644
--- a/walrss/internal/http/views/page.qtpl.html
+++ b/walrss/internal/http/views/page.qtpl.html
@@ -1,4 +1,4 @@
-{% import "github.com/walrss/walrss/internal/urls" %}
+{% import "github.com/codemicro/walrss/walrss/internal/urls" %}
 
 {% interface
 Page {
diff --git a/walrss/internal/http/views/page.qtpl.html.go b/walrss/internal/http/views/page.qtpl.html.go
index 1d66228..ee1e3e4 100644
--- a/walrss/internal/http/views/page.qtpl.html.go
+++ b/walrss/internal/http/views/page.qtpl.html.go
@@ -3,6 +3,8 @@
 
 package views
 
+import "github.com/codemicro/walrss/walrss/internal/urls"
+
 import (
 	qtio422016 "io"
 
@@ -37,10 +39,18 @@ func StreamRenderPage(qw422016 *qt422016.Writer, p Page) {
 	qw422016.N().S(makePageTitle(p))
 	qw422016.N().S(`</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://unpkg.com/htmx.org@1.7.0"></script>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
+    <script src="`)
+	qw422016.N().S(urls.Statics)
+	qw422016.N().S(`/htmx.min.js"></script>
+    <link href="`)
+	qw422016.N().S(urls.Statics)
+	qw422016.N().S(`/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <link rel="stylesheet" href="`)
+	qw422016.N().S(urls.Statics)
+	qw422016.N().S(`/bootstrap-icons.css">
+    <script src="`)
+	qw422016.N().S(urls.Statics)
+	qw422016.N().S(`/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
     <style>
         [disabled] {
             cursor: not-allowed;
diff --git a/walrss/internal/rss/processor.go b/walrss/internal/rss/processor.go
index 9db14ab..a6e1d54 100644
--- a/walrss/internal/rss/processor.go
+++ b/walrss/internal/rss/processor.go
@@ -9,6 +9,7 @@ import (
 	"github.com/codemicro/walrss/walrss/internal/core"
 	"github.com/codemicro/walrss/walrss/internal/db"
 	"github.com/codemicro/walrss/walrss/internal/state"
+	"github.com/codemicro/walrss/walrss/internal/urls"
 	"github.com/jordan-wright/email"
 	"github.com/matcornic/hermes"
 	"github.com/mmcdole/gofeed"
@@ -218,6 +219,7 @@ func generateEmail(st *state.State, processedItems []*processedFeed, interval, t
 		Product: hermes.Product{
 			Name:      "Walrss",
 			Link:      st.Config.Server.ExternalURL,
+			Logo:      st.Config.Server.ExternalURL + urls.Statics + "/logo_light.png",
 			Copyright: fmt.Sprintf("This email was generated in %.2f seconds by Walrss %s.", timeToGenerate.Seconds(), state.Version),
 		},
 		Theme: new(hermes.Flat),
diff --git a/walrss/internal/state/state.go b/walrss/internal/state/state.go
index 46c26cd..2977405 100644
--- a/walrss/internal/state/state.go
+++ b/walrss/internal/state/state.go
@@ -7,6 +7,7 @@ import (
 	bh "github.com/timshannon/bolthold"
 	"io/ioutil"
 	"os"
+	"strings"
 )
 
 type State struct {
@@ -53,6 +54,9 @@ func LoadConfig() (*Config, error) {
 	if err := fig.Load(cfg); err != nil {
 		return nil, err
 	}
+
+	cfg.Server.ExternalURL = strings.TrimSuffix(cfg.Server.ExternalURL, "/")
+
 	return cfg, nil
 }
 
-- 
cgit v1.2.3-70-g09d2