From e99a00e36967ea8c36be1bfd1db964b39a4c1785 Mon Sep 17 00:00:00 2001
From: Fornax <wim@fornaxian.tech>
Date: Wed, 10 Nov 2021 19:30:49 +0100
Subject: [PATCH] Fix opengraph icons

---
 res/template/file_viewer_svelte.html        |  4 ++--
 res/template/home.html                      |  4 ++--
 svelte/src/file_viewer/AdLeaderboard.svelte | 20 +++++++++-----------
 svelte/src/file_viewer/AdSkyscraper.svelte  |  2 ++
 webcontroller/opengraph.go                  |  2 ++
 webcontroller/user_style.go                 |  9 ---------
 6 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/res/template/file_viewer_svelte.html b/res/template/file_viewer_svelte.html
index 1401eea..c41d7aa 100644
--- a/res/template/file_viewer_svelte.html
+++ b/res/template/file_viewer_svelte.html
@@ -28,8 +28,8 @@
 			window.user_authenticated = {{.Authenticated}};
 		</script>
 
-		<link rel='stylesheet' href='/res/svelte/file_viewer.css?v1'>
-		<script defer src='/res/svelte/file_viewer.js?v1'></script>
+		<link rel='stylesheet' href='/res/svelte/file_viewer.css?v3'>
+		<script defer src='/res/svelte/file_viewer.js?v3'></script>
 
 		{{template "analytics"}}
 	</head>
diff --git a/res/template/home.html b/res/template/home.html
index b5c87d9..3a3d4e4 100644
--- a/res/template/home.html
+++ b/res/template/home.html
@@ -224,10 +224,10 @@
 				</div>
 				<div>
 					<div class="feat_label">
-						Bandwidth
+						Download speed
 					</div>
 					<div class="feat_normal">
-						Up to 8 MiB/s, may be slower during busy periods
+						Up to 4 MiB/s, may be slower during busy periods
 					</div>
 					<div class="feat_pro">
 						<span class="text_highlight">High priority</span>
diff --git a/svelte/src/file_viewer/AdLeaderboard.svelte b/svelte/src/file_viewer/AdLeaderboard.svelte
index 416be76..05c9c6f 100644
--- a/svelte/src/file_viewer/AdLeaderboard.svelte
+++ b/svelte/src/file_viewer/AdLeaderboard.svelte
@@ -13,6 +13,8 @@ let set_ad_type = (t) => {
 	} else if (ad_type === "adaround") {
 		adaround_load.set(true)
 	}
+
+	console.log("leaderboard ad is " + t)
 }
 
 onMount(() => {
@@ -24,27 +26,23 @@ onMount(() => {
 		}
 	}
 
-	switch (Math.floor(Math.random() * 10)) {
+	switch (Math.floor(Math.random() * 6)) {
 		case 0:
 			set_ad_type("publisherrest_1")
 			break
 		case 1:
-			set_ad_type("publisherrest_3")
-			break
-		case 2:
-		case 3:
 			set_ad_type("brave")
 			break
-		case 4:
-		case 5:
+		case 2:
+			set_ad_type("aads1")
+			break
+		case 3:
 			set_ad_type("ads.plus")
 			break
-		case 6:
-		case 7:
+		case 4:
 			set_ad_type("pixfuture")
 			break
-		case 8:
-		case 9:
+		case 5:
 			set_ad_type("adaround")
 			break
 	}
diff --git a/svelte/src/file_viewer/AdSkyscraper.svelte b/svelte/src/file_viewer/AdSkyscraper.svelte
index 93cc68f..a2d7b68 100644
--- a/svelte/src/file_viewer/AdSkyscraper.svelte
+++ b/svelte/src/file_viewer/AdSkyscraper.svelte
@@ -14,6 +14,8 @@ let set_ad_type = (t) => {
 	} else if (ad_type === "adaround") {
 		adaround_load.set(true)
 	}
+
+	console.log("skyscraper ad is " + t)
 }
 
 
diff --git a/webcontroller/opengraph.go b/webcontroller/opengraph.go
index 8bda206..72d9462 100644
--- a/webcontroller/opengraph.go
+++ b/webcontroller/opengraph.go
@@ -59,12 +59,14 @@ func (wc *WebController) metadataFromFile(f pixelapi.FileInfo) (og ogData) {
 		og.addLink("image_src", wc.websiteAddress+"/api/file/"+f.ID+"/thumbnail")
 	} else if strings.HasPrefix(f.MimeType, "audio") {
 		og.addProp("og:type", "music.song")
+		og.addProp("og:image", wc.websiteAddress+"/api/file/"+f.ID+"/thumbnail")
 		og.addProp("og:audio", wc.websiteAddress+"/api/file/"+f.ID)
 		og.addProp("og:audio:secure_url", wc.websiteAddress+"/api/file/"+f.ID)
 		og.addProp("og:audio:type", f.MimeType)
 		og.addLink("image_src", wc.websiteAddress+"/api/file/"+f.ID+"/thumbnail")
 	} else {
 		og.addProp("og:type", "website")
+		og.addProp("og:image", wc.websiteAddress+"/api/file/"+f.ID+"/thumbnail")
 		og.addLink("image_src", wc.websiteAddress+"/api/file/"+f.ID+"/thumbnail")
 	}
 	return og
diff --git a/webcontroller/user_style.go b/webcontroller/user_style.go
index 1dd192d..e3507eb 100644
--- a/webcontroller/user_style.go
+++ b/webcontroller/user_style.go
@@ -114,15 +114,6 @@ type hsl struct {
 	Lightness  float64
 }
 
-func (h hsl) cssString() string {
-	return fmt.Sprintf(
-		"hsl(%d, %.3f%%, %.3f%%)",
-		h.Hue,
-		h.Saturation*100,
-		h.Lightness*100,
-	)
-}
-
 func (orig hsl) RGB() string {
 	var r, g, b, q, p float64
 	var h, s, l = float64(orig.Hue) / 360, orig.Saturation, orig.Lightness