feat(SEO): correct canonical for public pages

userstyles-world · Jul 19, 2021 · 4729b35 · 4729b35
1 parent 1bd76b9
commit 4729b35
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 30 deletions.
diff --git a/handlers/core/docs.go b/handlers/core/docs.go
@@ -44,8 +44,9 @@ func GetDocs(c *fiber.Ctx) error {
 	}
 
 	return c.Render("core/docs", fiber.Map{
-		"Title":   title,
-		"User":    u,
-		"content": content,
+		"Title":     title,
+		"User":      u,
+		"content":   content,
+		"Canonical": "docs",
 	})
 }
diff --git a/handlers/core/errors.go b/handlers/core/errors.go
@@ -18,7 +18,8 @@ func NotFound(c *fiber.Ctx) error {
 		})
 	}
 	return c.Render("err", fiber.Map{
-		"User":  u,
-		"Title": "Page not found",
+		"User":      u,
+		"Title":     "Page not found",
+		"Canonical": "404",
 	})
 }
diff --git a/handlers/core/modlog.go b/handlers/core/modlog.go
@@ -33,5 +33,6 @@ func GetModLog(c *fiber.Ctx) error {
 		"RemovedStyles": removedStyles,
 		"User":          u,
 		"Title":         "Mod Log",
+		"Canonical":     "modlog",
 	})
 }
diff --git a/handlers/core/search.go b/handlers/core/search.go
@@ -41,11 +41,12 @@ func Search(c *fiber.Ctx) error {
 	}
 
 	return c.Render("core/search", fiber.Map{
-		"Title":  "Search",
-		"User":   u,
-		"Styles": s,
-		"Value":  q,
-		"Root":   c.OriginalURL() == "/search",
-		"Sort":   fv,
+		"Title":     "Search",
+		"User":      u,
+		"Styles":    s,
+		"Value":     q,
+		"Root":      c.OriginalURL() == "/search",
+		"Sort":      fv,
+		"Canonical": "search",
 	})
 }
diff --git a/handlers/style/explore.go b/handlers/style/explore.go
@@ -83,13 +83,14 @@ func GetExplore(c *fiber.Ctx) error {
 	}
 
 	return c.Render("core/explore", fiber.Map{
-		"Title":    "Explore",
-		"User":     u,
-		"Styles":   s,
-		"Sort":     fv,
-		"PageMax":  maxPages,
-		"PageNow":  pageNow,
-		"PageBack": pageNow - 1,
-		"PageNext": pageNow + 1,
+		"Title":     "Explore",
+		"User":      u,
+		"Styles":    s,
+		"Sort":      fv,
+		"PageMax":   maxPages,
+		"PageNow":   pageNow,
+		"PageBack":  pageNow - 1,
+		"PageNext":  pageNow + 1,
+		"Canonical": "explore",
 	})
 }
diff --git a/handlers/style/view.go b/handlers/style/view.go
@@ -76,5 +76,6 @@ func GetStylePage(c *fiber.Ctx) error {
 		"DailyHistory":   dailyHistory,
 		"TotalHistory":   totalHistory,
 		"Reviews":        reviews,
+		"Canonical":      "style/" + id,
 	})
 }
diff --git a/handlers/user/login.go b/handlers/user/login.go
@@ -21,7 +21,8 @@ func LoginGet(c *fiber.Ctx) error {
 		return c.Redirect("/account", fiber.StatusSeeOther)
 	}
 	arguments := fiber.Map{
-		"Title": "Login",
+		"Title":     "Login",
+		"Canonical": "login",
 	}
 
 	if r := c.Query("r"); r != "" {

diff --git a/handlers/user/profile.go b/handlers/user/profile.go
@@ -44,9 +44,10 @@ func Profile(c *fiber.Ctx) error {
 	}*/
 
 	return c.Render("user/profile", fiber.Map{
-		"Title":   profile.Name() + "'s profile",
-		"User":    u,
-		"Profile": profile,
-		"Styles":  styles,
+		"Title":     profile.Name() + "'s profile",
+		"User":      u,
+		"Profile":   profile,
+		"Styles":    styles,
+		"Canonical": "user/" + p,
 	})
 }
diff --git a/handlers/user/register.go b/handlers/user/register.go
@@ -22,7 +22,8 @@ func RegisterGet(c *fiber.Ctx) error {
 	}
 
 	return c.Render("user/register", fiber.Map{
-		"Title": "Register",
+		"Title":     "Register",
+		"Canonical": "register",
 	})
 }
 

diff --git a/handlers/user/reset.go b/handlers/user/reset.go
@@ -22,7 +22,8 @@ func RecoverGet(c *fiber.Ctx) error {
 		return c.Redirect("/account", fiber.StatusSeeOther)
 	}
 	return c.Render("user/recover", fiber.Map{
-		"Title": "Reset",
+		"Title":     "Reset",
+		"Canonical": "recover",
 	})
 }
 

diff --git a/modules/config/config.go b/modules/config/config.go
@@ -77,9 +77,13 @@ func getEnv(name, fallback string) string {
 
 // OAuthURL returns the proper callback URL depending on the environment.
 func OAuthURL() string {
+	return BaseURL() + "/api/callback/"
+}
+
+// BaseURL returns the proper BaseURL.
+func BaseURL() string {
 	if Production {
-		return "https://userstyles.world/api/callback/"
+		return "https://userstyles.world"
 	}
-
-	return "http://localhost" + Port + "/api/callback/"
+	return "http://localhost" + Port
 }
diff --git a/modules/templates/templates.go b/modules/templates/templates.go
@@ -95,6 +95,13 @@ func New() *html.Engine {
 }`
 	})
 
+	engine.AddFunc("canonical", func(url interface{}) template.HTML {
+		if url == nil {
+			return template.HTML(config.BaseURL())
+		}
+		return template.HTML(config.BaseURL() + "/" + url.(string))
+	})
+
 	if !config.Production {
 		engine.Reload(true)
 	}

diff --git a/views/partials/head.html b/views/partials/head.html
@@ -5,7 +5,7 @@
 <meta name="color-scheme" content="dark light">
 <meta name="description" content="A new site to explore userstyles.">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="canonical" href="https://userstyles.world">
+<link rel="canonical" href="{{ canonical .Canonical }}">
 <link rel="stylesheet" href="/css/main.css?v={{ $commit }}" type="text/css" media="screen">
 <link rel="mask-icon" href="/mascot.svg" color="blue">
 <link rel="icon" href="/favicon.ico">