port most routes

main.go

@@ -3,7 +3,9 @@ package main
 import (
 	"flag"
 	"fmt"
+	"io"
 	"net/http"
+	"strings"
 
 	"codeberg.org/rimgo/rimgo/pages"
 	"codeberg.org/rimgo/rimgo/render"
@@ -20,7 +22,8 @@ func wrapHandler(h handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		err := h(w, r)
 		if err != nil {
-			http.Error(w, "oop", 500)
+			fmt.Println(err)
+			http.Error(w, http.StatusText(500), 500)
 		}
 	})
 }
@@ -37,10 +40,63 @@ func main() {
 	render.Initialize(views)
 
 	app := http.NewServeMux()
-	app.Handle("/static/", http.StripPrefix("/static/", http.FileServerFS(static)))
+
-	app.Handle("GET /test-render", wrapHandler(func(w http.ResponseWriter, r *http.Request) error {
+	app.Handle("GET /static/", http.StripPrefix("/static/", http.FileServerFS(static)))
+	app.Handle("GET /robots.txt", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		file, _ := static.Open("robots.txt")
+		defer file.Close()
+		io.Copy(w, file)
+	}))
+	app.Handle("GET /favicon.ico", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		file, _ := static.Open("favicon/favicon.ico")
+		defer file.Close()
+		io.Copy(w, file)
+	}))
+
+	app.Handle("GET /{$}", wrapHandler(pages.HandleFrontpage))
+	// app.Handle("GET /{postID}/embed", wrapHandler(pages.HandleEmbed)) // fix this conflict
+	app.Handle("GET /a/{postID}", wrapHandler(pages.HandlePost))
+	app.Handle("GET /a/{postID}/embed", wrapHandler(pages.HandleEmbed))
+	// app.Handle("GET /t/:tag.:type", pages.HandleTagRSS)
+	app.Handle("GET /t/{tag}", wrapHandler(pages.HandleTag))
+	app.Handle("GET /t/{tag}/{postID}", wrapHandler(pages.HandlePost))
+	app.Handle("GET /r/{sub}/{postID}", wrapHandler(pages.HandlePost))
+	// app.Handle("GET /user/:userID.:type", pages.HandleUserRSS)
+	app.Handle("GET /user/{userID}", wrapHandler(pages.HandleUser))
+	app.Handle("GET /user/{userID}/favorites", wrapHandler(pages.HandleUserFavorites))
+	app.Handle("GET /user/{userID}/comments", wrapHandler(pages.HandleUserComments))
+	app.Handle("GET /user/{userID}/cover", wrapHandler(pages.HandleUserCover))
+	app.Handle("GET /user/{userID}/avatar", wrapHandler(pages.HandleUserAvatar))
+	app.Handle("GET /gallery/{postID}", wrapHandler(pages.HandlePost))
+	app.Handle("GET /gallery/{postID}/embed", wrapHandler(pages.HandleEmbed))
+	app.Handle("GET /{component}", wrapHandler(func(w http.ResponseWriter, r *http.Request) error {
+		component := r.PathValue("component")
+		switch {
+		case component == "about":
+			return pages.HandleAbout(w, r)
+		case component == "privacy":
+			return pages.HandlePrivacy(w, r)
+		case component == "search":
+			return pages.HandleSearch(w, r)
+		case component == "trending":
+			return pages.HandleTrending(w, r)
+		case strings.HasPrefix(component, "trending."):
+			// 	return pages.HandleTrendingRSS(w, r)
+		case strings.HasSuffix(component, ".gifv"):
+			r.SetPathValue("postID", component)
+			return pages.HandleGifv(w, r)
+		case strings.Contains(component, "."):
+			return pages.HandleMedia(w, r)
+		default:
+			r.SetPathValue("postID", component)
+			return pages.HandlePost(w, r)
+		}
+		return nil
+	}))
+	app.Handle("GET /stack/:baseName.:extension", wrapHandler(pages.HandleMedia))
+	// matches anything with no more specific route
+	app.Handle("GET /", wrapHandler(func(w http.ResponseWriter, r *http.Request) error {
 		err := render.Render(w, "errors/404", nil)
-		fmt.Println(err)
 		return err
 	}))
 

pages/about.go

@@ -1,19 +1,21 @@
 package pages
 
 import (
+	"net/http"
+
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
 )
 
-func HandleAbout(c *fiber.Ctx) error {
+func HandleAbout(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
-	c.Set("Cache-Control", "public,max-age=31557600")
+	w.Header().Set("Cache-Control", "public,max-age=31557600")
-	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	return c.Render("about", fiber.Map{
+	return render.Render(w, "about", map[string]any{
-		"proto":      c.Protocol(),
+		"proto":      r.Proto,
-		"domain":     c.Hostname(),
+		"domain":     r.Host,
 		"force_webp": utils.Config.ForceWebp,
 	})
 }

pages/embed.go

@@ -1,48 +1,49 @@
 package pages
 
 import (
+	"net/http"
 	"strings"
 
 	"codeberg.org/rimgo/rimgo/api"
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
 )
 
-func HandleEmbed(c *fiber.Ctx) error {
+func HandleEmbed(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("Cache-Control", "public,max-age=31557600")
+	w.Header().Set("Cache-Control", "public,max-age=31557600")
-	c.Set("Content-Security-Policy", "default-src 'none'; base-uri 'none'; form-action 'none'; media-src 'self'; style-src 'self'; img-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; base-uri 'none'; form-action 'none'; media-src 'self'; style-src 'self'; img-src 'self'; block-all-mixed-content")
 
 	post, err := api.Album{}, error(nil)
 	switch {
-	case strings.HasPrefix(c.Path(), "/a"):
+	case strings.HasPrefix(r.URL.Path, "/a"):
-		post, err = ApiClient.FetchAlbum(c.Params("postID"))
+		post, err = ApiClient.FetchAlbum(r.PathValue("postID"))
-	case strings.HasPrefix(c.Path(), "/gallery"):
+	case strings.HasPrefix(r.URL.Path, "/gallery"):
-		post, err = ApiClient.FetchPosts(c.Params("postID"))
+		post, err = ApiClient.FetchPosts(r.PathValue("postID"))
 	default:
-		post, err = ApiClient.FetchMedia(c.Params("postID"))
+		post, err = ApiClient.FetchMedia(r.PathValue("postID"))
 	}
 	if err != nil && err.Error() == "ratelimited by imgur" {
-		return utils.RenderError(c, 429)
+		return utils.RenderError(w, r, 429)
 	}
 	if err != nil && post.Id == "" && strings.Contains(err.Error(), "404") {
-		return utils.RenderError(c, 404)
+		return utils.RenderError(w, r, 404)
 	}
 	if err != nil {
 		return err
 	}
 
-	return c.Render("embed", fiber.Map{
+	return render.Render(w, "embed", map[string]any{
 		"post": post,
 	})
 }
 
-func HandleGifv(c *fiber.Ctx) error {
+func HandleGifv(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("Cache-Control", "public,max-age=31557600")
+	w.Header().Set("Cache-Control", "public,max-age=31557600")
-	c.Set("Content-Security-Policy", "default-src 'none'; base-uri 'none'; form-action 'none'; media-src 'self'; style-src 'self'; img-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; base-uri 'none'; form-action 'none'; media-src 'self'; style-src 'self'; img-src 'self'; block-all-mixed-content")
 
-	return c.Render("gifv", fiber.Map{
+	return render.Render(w, "gifv", map[string]any{
-		"id": c.Params("postID"),
+		"id": r.PathValue("postID"),
 	})
 }

pages/frontpage.go

@@ -1,19 +1,21 @@
 package pages
 
 import (
+	"net/http"
+
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
 )
 
 var VersionInfo string
 
-func HandleFrontpage(c *fiber.Ctx) error {
+func HandleFrontpage(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
-	c.Set("Cache-Control", "public,max-age=31557600")
+	w.Header().Set("Cache-Control", "public,max-age=31557600")
-	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	return c.Render("frontpage", fiber.Map{
+	return render.Render(w, "frontpage", map[string]any{
 		"config":  utils.Config,
 		"version": VersionInfo,
 	})

pages/media.go

@@ -1,54 +1,58 @@
 package pages
 
 import (
+	"io"
 	"mime"
 	"net/http"
 	"strings"
 
 	"codeberg.org/rimgo/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
 )
 
-func HandleMedia(c *fiber.Ctx) error {
+func HandleMedia(w http.ResponseWriter, r *http.Request) error {
-	c.Set("Cache-Control", "public,max-age=31557600")
+	w.Header().Set("Cache-Control", "public,max-age=31557600")
-	c.Set("Content-Security-Policy", "default-src 'none'; style-src 'self'; img-src 'self'")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'self'; img-src 'self'")
-	if strings.HasPrefix(c.Path(), "/stack") {
+	splitName := strings.SplitN(r.PathValue("component"), ".", 2)
-		return handleMedia(c, "https://i.stack.imgur.com/"+strings.ReplaceAll(c.Params("baseName"), "stack/", "")+"."+c.Params("extension"))
+	baseName, extension := splitName[0], splitName[1]
+	if strings.HasPrefix(r.URL.Path, "/stack") {
+		return handleMedia(w, r, "https://i.stack.imgur.com/"+strings.ReplaceAll(baseName, "stack/", "")+"."+extension)
 	} else {
-		return handleMedia(c, "https://i.imgur.com/"+c.Params("baseName")+"."+c.Params("extension"))
+		return handleMedia(w, r, "https://i.imgur.com/"+baseName+"."+extension)
 	}
 }
 
-func HandleUserCover(c *fiber.Ctx) error {
+func HandleUserCover(w http.ResponseWriter, r *http.Request) error {
-	c.Set("Cache-Control", "public,max-age=604800")
+	w.Header().Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'")
-	return handleMedia(c, "https://imgur.com/user/"+c.Params("userID")+"/cover?maxwidth=2560")
+	return handleMedia(w, r, "https://imgur.com/user/"+r.PathValue("userID")+"/cover?maxwidth=2560")
 }
 
-func HandleUserAvatar(c *fiber.Ctx) error {
+func HandleUserAvatar(w http.ResponseWriter, r *http.Request) error {
-	c.Set("Cache-Control", "public,max-age=604800")
+	w.Header().Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'")
-	return handleMedia(c, "https://imgur.com/user/"+c.Params("userID")+"/avatar")
+	return handleMedia(w, r, "https://imgur.com/user/"+r.PathValue("userID")+"/avatar")
 }
 
-func handleMedia(c *fiber.Ctx, url string) error {
+func handleMedia(w http.ResponseWriter, r *http.Request, url string) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
+	path := r.URL.Path
 
 	if utils.Config.ForceWebp &&
-		!strings.HasSuffix(c.Path(), ".webp") &&
+		!strings.HasSuffix(path, ".webp") &&
-		c.Get("Sec-Fetch-Dest") == "image" &&
+		r.Header.Get("Sec-Fetch-Dest") == "image" &&
-		c.Query("no_webp") == "" &&
+		r.URL.Query().Get("no_webp") == "" &&
-		c.Accepts("image/webp") == "image/webp" &&
+		utils.Accepts(r, "image/webp") &&
-		!strings.HasPrefix(c.Path(), "/stack") {
+		!strings.HasPrefix(path, "/stack") {
 		url = strings.ReplaceAll(url, ".png", ".webp")
 		url = strings.ReplaceAll(url, ".jpg", ".webp")
 		url = strings.ReplaceAll(url, ".jpeg", ".webp")
-		filename := strings.TrimPrefix(c.Path(), "/")
+		filename := strings.TrimPrefix(path, "/")
-		c.Set("Content-Disposition", mime.FormatMediaType("attachment", map[string]string{"filename*": filename}))
+		w.Header().Set("Content-Disposition", mime.FormatMediaType("attachment", map[string]string{"filename*": filename}))
 	}
 
-	if strings.HasPrefix(c.Path(), "/stack") && strings.Contains(c.OriginalURL(), "?") {
+	queryStr := r.URL.Query().Encode()
-		url = url + "?" + strings.Split(c.OriginalURL(), "?")[1]
+	if strings.HasPrefix(path, "/stack") && queryStr != "" {
+		url = url + "?" + queryStr
 	}
 
 	req, err := http.NewRequest("GET", url, nil)
@@ -58,8 +62,9 @@ func handleMedia(c *fiber.Ctx, url string) error {
 
 	utils.SetReqHeaders(req)
 
-	if c.Get("Range") != "" {
+	rng := r.URL.Query().Get("Range")
-		req.Header.Set("Range", c.Get("Range"))
+	if rng != "" {
+		req.Header.Set("Range", rng)
 	}
 
 	res, err := http.DefaultClient.Do(req)
@@ -68,17 +73,18 @@ func handleMedia(c *fiber.Ctx, url string) error {
 	}
 
 	if res.StatusCode == 404 || strings.Contains(res.Request.URL.String(), "error/404") {
-		return utils.RenderError(c, 404)
+		return utils.RenderError(w, r, 404)
 	} else if res.StatusCode == 429 {
-		return utils.RenderError(c, 429)
+		return utils.RenderError(w, r, 429)
 	}
 
-	c.Set("Accept-Ranges", "bytes")
+	w.Header().Set("Accept-Ranges", "bytes")
-	c.Set("Content-Type", res.Header.Get("Content-Type"))
+	w.Header().Set("Content-Type", res.Header.Get("Content-Type"))
-	c.Set("Content-Length", res.Header.Get("Content-Length"))
+	w.Header().Set("Content-Length", res.Header.Get("Content-Length"))
 	if res.Header.Get("Content-Range") != "" {
-		c.Set("Content-Range", res.Header.Get("Content-Range"))
+		w.Header().Set("Content-Range", res.Header.Get("Content-Range"))
 	}
 
-	return c.SendStream(res.Body)
+	_, err = io.Copy(w, res.Body)
+	return err
 }

pages/post.go

@@ -3,12 +3,13 @@ package pages
 import (
 	"crypto/rand"
 	"fmt"
+	"net/http"
 	"strconv"
 	"strings"
 
 	"codeberg.org/rimgo/rimgo/api"
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
 )
 
 // Cursed function
@@ -33,31 +34,31 @@ func nextInTag(client *api.Client, tagname, sort, page, I string) string {
 	return tag.Posts[i+1].Link
 }
 
-func HandlePost(c *fiber.Ctx) error {
+func HandlePost(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
 
-	postId := c.Params("postID")
+	postId := r.PathValue("postID")
 	if strings.Contains(postId, "-") {
 		postId = postId[len(postId)-7:]
 	}
 
 	post, err := api.Album{}, error(nil)
 	switch {
-	case strings.HasPrefix(c.Path(), "/a"):
+	case strings.HasPrefix(r.URL.Path, "/a"):
 		post, err = ApiClient.FetchAlbum(postId)
-	case strings.HasPrefix(c.Path(), "/gallery"):
+	case strings.HasPrefix(r.URL.Path, "/gallery"):
 		post, err = ApiClient.FetchPosts(postId)
-	case strings.HasPrefix(c.Path(), "/t"):
+	case strings.HasPrefix(r.URL.Path, "/t"):
 		post, err = ApiClient.FetchPosts(postId)
 	default:
 		post, err = ApiClient.FetchMedia(postId)
 	}
 	if err != nil && err.Error() == "ratelimited by imgur" {
-		return utils.RenderError(c, 429)
+		return utils.RenderError(w, r, 429)
 	}
 	if err != nil && post.Id == "" && strings.Contains(err.Error(), "404") {
-		return utils.RenderError(c, 404)
+		return utils.RenderError(w, r, 404)
 	}
 	if err != nil {
 		return err
@@ -65,13 +66,13 @@ func HandlePost(c *fiber.Ctx) error {
 
 	comments := []api.Comment{}
 	if post.SharedWithCommunity {
-		c.Set("Cache-Control", "public,max-age=604800")
+		w.Header().Set("Cache-Control", "public,max-age=604800")
 		comments, err = ApiClient.FetchComments(postId)
 		if err != nil {
 			return err
 		}
 	} else {
-		c.Set("Cache-Control", "public,max-age=31557600")
+		w.Header().Set("Cache-Control", "public,max-age=31557600")
 	}
 
 	nonce := ""
@@ -82,16 +83,16 @@ func HandlePost(c *fiber.Ctx) error {
 		nonce = fmt.Sprintf("%x", b)
 		csp = csp + " 'nonce-" + nonce + "'"
 	}
-	c.Set("Content-Security-Policy", csp)
+	w.Header().Set("Content-Security-Policy", csp)
 
 	var next string
-	tagParam := strings.Split(c.Query("tag"), ".")
+	tagParam := strings.Split(r.URL.Query().Get("tag"), ".")
 	if len(tagParam) == 4 {
 		tag, sort, page, index := tagParam[0], tagParam[1], tagParam[2], tagParam[3]
 		next = nextInTag(ApiClient, tag, sort, page, index)
 	}
 
-	return c.Render("post", fiber.Map{
+	return render.Render(w, "post", map[string]any{
 		"post":     post,
 		"next":     next,
 		"comments": comments,

pages/privacy.go

@@ -1,17 +1,18 @@
 package pages
 
 import (
-	"github.com/gofiber/fiber/v2"
+	"net/http"
 
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/utils"
 )
 
-func HandlePrivacy(c *fiber.Ctx) error {
+func HandlePrivacy(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
-	c.Set("Content-Security-Policy", "default-src 'none'; form-action 'self'; style-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; form-action 'self'; style-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	return c.Render("privacy", fiber.Map{
+	return render.Render(w, "privacy", map[string]any{
 		"config":  utils.Config,
 		"version": VersionInfo,
 	})

pages/rss.go

@@ -1,3 +1,5 @@
+//go:build fiber
+
 package pages
 
 import (

pages/search.go

@@ -1,30 +1,33 @@
 package pages
 
 import (
+	"net/http"
 	"strconv"
 
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
 )
 
-func HandleSearch(c *fiber.Ctx) error {
+func HandleSearch(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
-	c.Set("Cache-Control", "public,max-age=604800")
+	w.Header().Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'unsafe-inline' 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'unsafe-inline' 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	query := c.Query("q")
+	query := r.URL.Query().Get("q")
 
 	if utils.ImgurRe.MatchString(query) {
-		return c.Redirect(utils.ImgurRe.ReplaceAllString(query, ""))
+		w.Header().Set("Location", utils.ImgurRe.ReplaceAllString(query, ""))
+		w.WriteHeader(302)
+		return nil
 	}
 
-	page := "0"
+	page := r.URL.Query().Get("page")
-	if c.Query("page") != "" {
+	if page == "" {
-		page = c.Query("page")
+		page = "0"
 	}
 
-	pageNumber, err := strconv.Atoi(c.Query("page"))
+	pageNumber, err := strconv.Atoi(page)
 	if err != nil {
 		pageNumber = 0
 	}
@@ -34,7 +37,7 @@ func HandleSearch(c *fiber.Ctx) error {
 		return err
 	}
 
-	return c.Render("search", fiber.Map{
+	return render.Render(w, "search", map[string]any{
 		"query":    query,
 		"results":  results,
 		"page":     pageNumber,

pages/tag.go

@@ -1,40 +1,41 @@
 package pages
 
 import (
+	"net/http"
 	"strconv"
 
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
 )
 
-func HandleTag(c *fiber.Ctx) error {
+func HandleTag(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
-	c.Set("Cache-Control", "public,max-age=604800")
+	w.Header().Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'unsafe-inline' 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'unsafe-inline' 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	page := "1"
+	page := r.URL.Query().Get("page")
-	if c.Query("page") != "" {
+	if page == "" {
-		page = c.Query("page")
+		page = "1"
 	}
 
-	pageNumber, err := strconv.Atoi(c.Query("page"))
+	pageNumber, err := strconv.Atoi(page)
 	if err != nil {
 		pageNumber = 0
 	}
 
-	tag, err := ApiClient.FetchTag(c.Params("tag"), c.Query("sort"), page)
+	tag, err := ApiClient.FetchTag(r.PathValue("tag"), r.URL.Query().Get("sort"), page)
 	if err != nil && err.Error() == "ratelimited by imgur" {
-		return utils.RenderError(c, 429)
+		return utils.RenderError(w, r, 429)
 	}
 	if err != nil {
 		return err
 	}
 	if tag.Display == "" {
-		return utils.RenderError(c, 404)
+		return utils.RenderError(w, r, 404)
 	}
 
-	return c.Render("tag", fiber.Map{
+	return render.Render(w, "tag", map[string]any{
 		"tag":      tag,
 		"page":     page,
 		"nextPage": pageNumber + 1,

pages/trending.go

@@ -1,35 +1,36 @@
 package pages
 
 import (
+	"net/http"
 	"strconv"
 
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
 )
 
-func HandleTrending(c *fiber.Ctx) error {
+func HandleTrending(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
-	c.Set("Cache-Control", "public,max-age=604800")
+	w.Header().Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'unsafe-inline' 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'unsafe-inline' 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	page := "1"
+	page := r.URL.Query().Get("page")
-	if c.Query("page") != "" {
+	if page == "" {
-		page = c.Query("page")
+		page = "1"
 	}
 
-	pageNumber, err := strconv.Atoi(c.Query("page"))
+	pageNumber, err := strconv.Atoi(page)
 	if err != nil {
 		pageNumber = 1
 	}
 
-	section := c.Query("section")
+	section := r.URL.Query().Get("section")
 	switch section {
 	case "hot", "new", "top":
 	default:
 		section = "hot"
 	}
-	sort := c.Query("sort")
+	sort := r.URL.Query().Get("sort")
 	switch sort {
 	case "newest", "best", "popular":
 	default:
@@ -41,7 +42,7 @@ func HandleTrending(c *fiber.Ctx) error {
 		return err
 	}
 
-	return c.Render("trending", fiber.Map{
+	return render.Render(w, "trending", map[string]any{
 		"results":  results,
 		"section":  section,
 		"sort":     sort,

pages/user.go

@@ -1,49 +1,49 @@
 package pages
 
 import (
+	"net/http"
 	"strconv"
 
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
 )
 
-func HandleUser(c *fiber.Ctx) error {
+func HandleUser(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
-	c.Set("Cache-Control", "public,max-age=604800")
+	w.Header().Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	page := "0"
+	page := r.URL.Query().Get("page")
-	if c.Query("page") != "" {
+	if page == "" {
-		page = c.Query("page")
+		page = "0"
 	}
 
-	pageNumber, err := strconv.Atoi(c.Query("page"))
+	pageNumber, err := strconv.Atoi(page)
 	if err != nil {
 		pageNumber = 0
 	}
 
-	user, err := ApiClient.FetchUser(c.Params("userID"))
+	user, err := ApiClient.FetchUser(r.PathValue("userID"))
 	if err != nil && err.Error() == "ratelimited by imgur" {
-		return utils.RenderError(c, 429)
+		return utils.RenderError(w, r, 429)
 	}
 	if err != nil {
 		return err
 	}
 	if user.Username == "" {
-		return utils.RenderError(c, 404)
+		return utils.RenderError(w, r, 404)
 	}
 
-	submissions, err := ApiClient.FetchSubmissions(c.Params("userID"), "newest", page)
+	submissions, err := ApiClient.FetchSubmissions(r.PathValue("userID"), "newest", page)
 	if err != nil && err.Error() == "ratelimited by imgur" {
-		c.Status(429)
+		return utils.RenderError(w, r, 429)
-		return utils.RenderError(c, 429)
 	}
 	if err != nil {
 		return err
 	}
 
-	return c.Render("user", fiber.Map{
+	return render.Render(w, "user", map[string]any{
 		"user":        user,
 		"submissions": submissions,
 		"page":        page,
@@ -52,74 +52,73 @@ func HandleUser(c *fiber.Ctx) error {
 	})
 }
 
-func HandleUserComments(c *fiber.Ctx) error {
+func HandleUserComments(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
-	c.Set("Cache-Control", "public,max-age=604800")
+	w.Header().Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	user, err := ApiClient.FetchUser(c.Params("userID"))
+	user, err := ApiClient.FetchUser(r.PathValue("userID"))
 	if err != nil && err.Error() == "ratelimited by imgur" {
-		return utils.RenderError(c, 429)
+		return utils.RenderError(w, r, 429)
 	}
 	if err != nil {
 		return err
 	}
 	if user.Username == "" {
-		return utils.RenderError(c, 404)
+		return utils.RenderError(w, r, 404)
 	}
 
-	comments, err := ApiClient.FetchUserComments(c.Params("userID"))
+	comments, err := ApiClient.FetchUserComments(r.PathValue("userID"))
 	if err != nil && err.Error() == "ratelimited by imgur" {
-		c.Status(429)
+		return utils.RenderError(w, r, 429)
-		return utils.RenderError(c, 429)
 	}
 	if err != nil {
 		return err
 	}
 
-	return c.Render("userComments", fiber.Map{
+	return render.Render(w, "userComments", map[string]any{
 		"user":     user,
 		"comments": comments,
 	})
 }
 
-func HandleUserFavorites(c *fiber.Ctx) error {
+func HandleUserFavorites(w http.ResponseWriter, r *http.Request) error {
-	utils.SetHeaders(c)
+	utils.SetHeaders(w)
-	c.Set("X-Frame-Options", "DENY")
+	w.Header().Set("X-Frame-Options", "DENY")
-	c.Set("Cache-Control", "public,max-age=604800")
+	w.Header().Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	page := "0"
+	page := r.URL.Query().Get("page")
-	if c.Query("page") != "" {
+	if page == "" {
-		page = c.Query("page")
+		page = "0"
 	}
 
-	pageNumber, err := strconv.Atoi(c.Query("page"))
+	pageNumber, err := strconv.Atoi(page)
 	if err != nil {
 		pageNumber = 0
 	}
 
-	user, err := ApiClient.FetchUser(c.Params("userID"))
+	user, err := ApiClient.FetchUser(r.PathValue("userID"))
 	if err != nil && err.Error() == "ratelimited by imgur" {
-		return utils.RenderError(c, 429)
+		return utils.RenderError(w, r, 429)
 	}
 	if err != nil {
 		return err
 	}
 	if user.Username == "" {
-		return utils.RenderError(c, 404)
+		return utils.RenderError(w, r, 404)
 	}
 
-	favorites, err := ApiClient.FetchUserFavorites(c.Params("userID"), "newest", page)
+	favorites, err := ApiClient.FetchUserFavorites(r.PathValue("userID"), "newest", page)
 	if err != nil && err.Error() == "ratelimited by imgur" {
-		return utils.RenderError(c, 429)
+		return utils.RenderError(w, r, 429)
 	}
 	if err != nil {
 		return err
 	}
 
-	return c.Render("userFavorites", fiber.Map{
+	return render.Render(w, "userFavorites", map[string]any{
 		"user":      user,
 		"favorites": favorites,
 		"page":      page,

render/render.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"codeberg.org/rimgo/rimgo/utils"
 	"github.com/mailgun/raymond/v2"
 )
 
@@ -37,7 +36,12 @@ func Initialize(views fs.FS) {
 			return nil
 		}
 		path = filepath.ToSlash(path)
-		buf, err := utils.ReadFile(path, views)
+		file, err := views.Open(path)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+		buf, err := io.ReadAll(file)
 		if err != nil {
 			return err
 		}

utils/accepts.go

@@ -0,0 +1,22 @@
+package utils
+
+import (
+	"net/http"
+	"strings"
+)
+
+func Accepts(r *http.Request, format string) bool {
+	format = strings.ToLower(format)
+	group := strings.Split(format, "/")[0] + "/*"
+	header := r.Header.Get("Accept")
+	if header == "" {
+		return false
+	}
+	for _, mime := range strings.Split(header, ",") {
+		mime = strings.ToLower(strings.TrimSpace(strings.SplitN(mime, ";", 2)[0]))
+		if mime == "*/*" || mime == format || mime == group {
+			return true
+		}
+	}
+	return false
+}

utils/error.go

@@ -1,25 +1,38 @@
 package utils
 
 import (
+	"io"
+	"net/http"
 	"strconv"
-	"strings"
 
+	"codeberg.org/rimgo/rimgo/render"
 	"codeberg.org/rimgo/rimgo/static"
-	"github.com/gofiber/fiber/v2"
 )
 
-func RenderError(c *fiber.Ctx, code int) error {
+func RenderError(w http.ResponseWriter, r *http.Request, code int) error {
-	if !strings.Contains(c.Get("Accept"), "html") && c.Params("extension") != "" {
+	if !Accepts(r, "text/html") && r.PathValue("extension") != "" {
 		codeStr := "generic"
 		if code != 0 {
 			codeStr = strconv.Itoa(code)
 		}
-		img, _ := ReadFile("img/error-"+codeStr+".png", static.GetFiles())
+		w.Header().Set("Content-Type", "image/png")
-		c.Set("Content-Type", "image/png")
+		w.WriteHeader(code)
-		return c.Status(code).Send(img)
+		file, _ := static.GetFiles().Open("img/error-" + codeStr + ".png")
+		defer file.Close()
+		_, err := io.Copy(w, file)
+		if err != nil {
+			// panic on error to avoid a loop
+			panic(err)
+		}
 	} else {
-		return c.Status(code).Render("errors/"+strconv.Itoa(code), fiber.Map{
+		w.WriteHeader(code)
-			"path": c.Path(),
+		err := render.Render(w, "errors/"+strconv.Itoa(code), map[string]any{
+			"path": r.URL.Path,
 		})
+		if err != nil {
+			// panic on error to avoid a loop
+			panic(err)
+		}
 	}
+	return nil
 }

utils/readFile.go

@@ -1,15 +0,0 @@
-package utils
-
-import (
-	"io"
-	"io/fs"
-)
-
-func ReadFile(path string, fs fs.FS) ([]byte, error) {
-	file, err := fs.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	return io.ReadAll(file)
-}

utils/setHeaders.go

@@ -2,16 +2,14 @@ package utils
 
 import (
 	"net/http"
-
-	"github.com/gofiber/fiber/v2"
 )
 
-func SetHeaders(c *fiber.Ctx) {
+func SetHeaders(w http.ResponseWriter) {
-	c.Set("Referrer-Policy", "no-referrer")
+	w.Header().Set("Referrer-Policy", "no-referrer")
-	c.Set("X-Content-Type-Options", "nosniff")
+	w.Header().Set("X-Content-Type-Options", "nosniff")
-	c.Set("X-Robots-Tag", "noindex, noimageindex, nofollow")
+	w.Header().Set("X-Robots-Tag", "noindex, noimageindex, nofollow")
-	c.Set("Strict-Transport-Security", "max-age=31557600")
+	w.Header().Set("Strict-Transport-Security", "max-age=31557600")
-	c.Set("Permissions-Policy", "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), cross-origin-isolated=(), display-capture=(), document-domain=(), encrypted-media=(), execution-while-not-rendered=(), execution-while-out-of-viewport=(), fullscreen=(self), geolocation=(), gyroscope=(), interest-cohort=(), magnetometer=(), microphone=(), midi=(), navigation-override=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(), usb=(), web-share=(), xr-spatial-tracking=()")
+	w.Header().Set("Permissions-Policy", "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), cross-origin-isolated=(), display-capture=(), document-domain=(), encrypted-media=(), execution-while-not-rendered=(), execution-while-out-of-viewport=(), fullscreen=(self), geolocation=(), gyroscope=(), interest-cohort=(), magnetometer=(), microphone=(), midi=(), navigation-override=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(), usb=(), web-share=(), xr-spatial-tracking=()")
 }
 
 func SetReqHeaders(req *http.Request) {