Merge pull request #280 from a0eoc/fixes1110

Some updates and fixes
userstyles-world · May 2, 2024 · 2399807 · 2399807
2 parents 6011def + 3ea3097
commit 2399807
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/handlers/style/add.go b/handlers/style/add.go
@@ -53,6 +53,10 @@ func CreatePost(c *fiber.Ctx) error {
 	}
 	c.Locals("Style", s)
 
+	// Get previewURL
+	preview := c.FormValue("previewURL")
+	c.Locals("PreviewURL", preview)
+
 	m, err := s.Validate(validator.V, true)
 	if err != nil {
 		c.Locals("err", m)
@@ -82,7 +86,6 @@ func CreatePost(c *fiber.Ctx) error {
 
 	// Check preview image.
 	file, _ := c.FormFile("preview")
-	preview := c.FormValue("previewURL")
 	styleID := strconv.FormatUint(uint64(s.ID), 10)
 	if file != nil || preview != "" {
 		if err = images.Generate(file, styleID, "0", "", preview); err != nil {

diff --git a/handlers/style/import.go b/handlers/style/import.go
@@ -102,14 +102,18 @@ func ImportPost(c *fiber.Ctx) error {
 	s.MirrorCode = c.FormValue("mirrorCode") == "on"
 	s.MirrorMeta = c.FormValue("mirrorMeta") == "on"
 
+	// Get previewURL
+	preview := c.FormValue("previewURL", s.Preview)
+
 	m, err := s.Validate(validator.V, true)
 	if err != nil {
 		return c.Render("style/import", fiber.Map{
-			"Title": "Import userstyle",
-			"User":  u,
-			"Style": s,
-			"err":   m,
-			"Error": "Incorrect userstyle data was entered. Please review the fields bellow.",
+			"Title":      "Import userstyle",
+			"User":       u,
+			"Style":      s,
+			"PreviewURL": preview,
+			"err":        m,
+			"Error":      "Incorrect userstyle data was entered. Please review the fields bellow.",
 		})
 	}
 
@@ -140,7 +144,6 @@ func ImportPost(c *fiber.Ctx) error {
 
 	// Check preview image.
 	file, _ := c.FormFile("preview")
-	preview := c.FormValue("previewURL", s.Preview)
 	styleID := strconv.FormatUint(uint64(s.ID), 10)
 	if file != nil || preview != "" {
 		if err := images.Generate(file, styleID, "0", "", preview); err != nil {

diff --git a/web/views/core/dashboard.tmpl b/web/views/core/dashboard.tmpl
@@ -93,7 +93,7 @@
 {{ if or .DailyHistory .TotalHiistory .UserHistory .StyleHistory }}
 	<section class="history">
 		<h2 class="td:d">History</h2>
-		<p>Learn more about style statistics <a href="/docs/faq#how-do-view-install-update-statistics-work">in the FAQ</a>.</p>
+		<p>Learn more about style statistics <a href="/docs/faq#how-do-viewinstallupdate-statistics-work">in the FAQ</a>.</p>
 		{{ if not (or .DailyHistory .TotalHistory) }}
 			<i>No style history. Come back in a couple of days.</i>
 		{{ end }}

diff --git a/web/views/core/search.tmpl b/web/views/core/search.tmpl
@@ -113,7 +113,7 @@
 			</ul>
 			<ul class="List-unstyled">
 				<li><a href="/search?q=ChatGPT">ChatGPT</a></li>
-				<li><a href="/search?category=Gmail">Gmail</a></li>
+				<li><a href="/search?q=Gmail">Gmail</a></li>
 				<li><a href="/search?q=Google+Docs">Google Docs</a></li>
 				<li><a href="/search?category=Roblox">Roblox</a></li>
 				<li><a href="/search?q=Lichess">Lichess</a></li>

diff --git a/web/views/style/add.tmpl b/web/views/style/add.tmpl
@@ -73,7 +73,7 @@
 	<input
 		type="url" name="previewURL" id="previewURL"
 		aria-describedby="previewURL-hint"
-		value="{{ .Style.Preview }}"
+		value="{{ .PreviewURL }}"
 		placeholder="Link to userstyle's preview image (jpg, jpeg, png, avif, and webp formats only)">
 
 	<label for="preview">Upload preview image</label>

diff --git a/web/views/style/import.tmpl b/web/views/style/import.tmpl
@@ -69,7 +69,7 @@
 		<input
 			type="url" name="previewURL" id="previewURL"
 			aria-describedby="previewURL-hint"
-			value="{{ .Style.Preview }}"
+			value="{{ .PreviewURL }}"
 			placeholder="Link to userstyle's preview image (jpg, jpeg, png, avif, and webp formats only)">
 
 		<label for="preview">Upload preview image</label>

diff --git a/web/views/style/view.tmpl b/web/views/style/view.tmpl
@@ -154,7 +154,7 @@
 
 <section id="stats">
 	<h2 class="td:d">Statistics</h2>
-	<p class="mb:s">Learn how we calculate statistics <a href="/docs/faq#how-do-view-install-update-statistics-work">in the FAQ</a>.</p>
+	<p class="mb:s">Learn how we calculate statistics <a href="/docs/faq#how-do-viewinstallupdate-statistics-work">in the FAQ</a>.</p>
 	{{ with .Stats }}
 		<p class="total-views"><span class="minw">Total views</span>{{ .TotalViews }}</p>
 		<p class="total-installs"><span class="minw">Total installs</span>{{ .TotalInstalls }}</p>
@@ -194,7 +194,7 @@
 {{/*
 <section class="history">
 	<h2 class="td:d">History</h2>
-	<p>Daily snapshots of <a href="/docs/faq#how-do-view-install-update-statistics-work">style statistics</a>.</p>
+	<p>Daily snapshots of <a href="/docs/faq#how-do-viewinstallupdate-statistics-work">style statistics</a>.</p>
 	{{ if not (or .DailyHistory .TotalHistory) }}
 		<i>No style history. Come back in a couple of days.</i>
 	{{ end }}