Dependencies/micrach
1
0
Fork 1
mirror of https://github.com/yanislav-igonin/micrach synced 2026-07-27 05:14:17 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: migrate to Fiber v3

Browse Source
This commit is contained in:
Yanislav Igonin 2026-07-16 16:25:23 +04:00
parent 1194396029
commit e1e1de4fbb
10 changed files with 106 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/captcha_controller.go
View File

@ -5,10 +5,10 @@ import (
"log" "log"
"github.com/dchest/captcha" "github.com/dchest/captcha"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v3"
) )
func GetCaptcha(c *fiber.Ctx) error { func GetCaptcha(c fiber.Ctx) error {
ID := c.Params("captchaID") ID := c.Params("captchaID")
var content bytes.Buffer var content bytes.Buffer
err := captcha.WriteImage(&content, ID, captcha.StdWidth, captcha.StdHeight) err := captcha.WriteImage(&content, ID, captcha.StdWidth, captcha.StdHeight)
@ -17,6 +17,6 @@ func GetCaptcha(c *fiber.Ctx) error {
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
c.Context().SetContentType("image/png") c.RequestCtx().SetContentType("image/png")
return c.Send(content.Bytes()) return c.Send(content.Bytes())
} }

64
controllers/threads_controller.go
View File

@ -9,7 +9,7 @@ import (
"strings" "strings"
"github.com/dchest/captcha" "github.com/dchest/captcha"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v3"
"github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5"
"micrach/config" "micrach/config"
@ -18,8 +18,7 @@ import (
"micrach/utils" "micrach/utils"
) )
func GetThreads(c *fiber.Ctx) error { func GetThreads(c fiber.Ctx) error {
ctx := c.UserContext()
pageString := c.Query("page", "1") pageString := c.Query("page", "1")
page, err := strconv.Atoi(pageString) page, err := strconv.Atoi(pageString)
if err != nil { if err != nil {
@ -32,12 +31,12 @@ func GetThreads(c *fiber.Ctx) error {
limit := 10 limit := 10
offset := limit * (page - 1) offset := limit * (page - 1)
threads, err := repositories.Posts.Get(ctx, limit, offset) threads, err := repositories.Posts.Get(c, limit, offset)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
count, err := repositories.Posts.GetThreadsCount(ctx) count, err := repositories.Posts.GetThreadsCount(c)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
@ -63,13 +62,12 @@ func GetThreads(c *fiber.Ctx) error {
return c.Render("pages/index", htmlData) return c.Render("pages/index", htmlData)
} }
func GetThread(c *fiber.Ctx) error { func GetThread(c fiber.Ctx) error {
ctx := c.UserContext() threadID, err := strconv.Atoi(c.Params("threadID"))
threadID, err := c.ParamsInt("threadID")
if err != nil { if err != nil {
return c.Status(fiber.StatusNotFound).Render("pages/404", nil) return c.Status(fiber.StatusNotFound).Render("pages/404", nil)
} }
thread, err := repositories.Posts.GetThreadByPostID(ctx, threadID) thread, err := repositories.Posts.GetThreadByPostID(c, threadID)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
@ -91,8 +89,7 @@ func GetThread(c *fiber.Ctx) error {
return c.Render("pages/thread", htmlData) return c.Render("pages/thread", htmlData)
} }
func CreateThread(c *fiber.Ctx) error { func CreateThread(c fiber.Ctx) error {
ctx := c.UserContext()
form, err := c.MultipartForm() form, err := c.MultipartForm()
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
@ -123,39 +120,39 @@ func CreateThread(c *fiber.Ctx) error {
} }
} }
conn, err := db.Pool.Acquire(ctx) conn, err := db.Pool.Acquire(c)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
defer conn.Release() defer conn.Release()
threadsCount, err := repositories.Posts.GetThreadsCount(ctx) threadsCount, err := repositories.Posts.GetThreadsCount(c)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
if threadsCount >= config.App.ThreadsMaxCount { if threadsCount >= config.App.ThreadsMaxCount {
oldestThreadUpdatedAt, err := repositories.Posts.GetOldestThreadUpdatedAt(ctx) oldestThreadUpdatedAt, err := repositories.Posts.GetOldestThreadUpdatedAt(c)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
err = repositories.Posts.ArchiveThreadsFrom(ctx, oldestThreadUpdatedAt) err = repositories.Posts.ArchiveThreadsFrom(c, oldestThreadUpdatedAt)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
} }
tx, err := conn.Begin(ctx) tx, err := conn.Begin(c)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
defer func() { defer func() {
rollbackErr := tx.Rollback(ctx) rollbackErr := tx.Rollback(c)
if rollbackErr != nil && !errors.Is(rollbackErr, pgx.ErrTxClosed) { if rollbackErr != nil && !errors.Is(rollbackErr, pgx.ErrTxClosed) {
log.Println("error:", rollbackErr) log.Println("error:", rollbackErr)
} }
@ -167,7 +164,7 @@ func CreateThread(c *fiber.Ctx) error {
Text: text, Text: text,
IsSage: false, IsSage: false,
} }
threadID, err := repositories.Posts.CreateInTx(ctx, tx, post) threadID, err := repositories.Posts.CreateInTx(c, tx, post)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
@ -188,7 +185,7 @@ func CreateThread(c *fiber.Ctx) error {
Size: int(fileInRequest.Size), Size: int(fileInRequest.Size),
} }
fileID, err := repositories.Files.CreateInTx(ctx, tx, file) fileID, err := repositories.Files.CreateInTx(c, tx, file)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
@ -219,24 +216,23 @@ func CreateThread(c *fiber.Ctx) error {
} }
} }
if err := tx.Commit(ctx); err != nil { if err := tx.Commit(c); err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
path := "/" + strconv.Itoa(threadID) path := "/" + strconv.Itoa(threadID)
return c.Redirect(path, fiber.StatusFound) return c.Redirect().Status(fiber.StatusFound).To(path)
} }
// Add new post in thread // Add new post in thread
func UpdateThread(c *fiber.Ctx) error { func UpdateThread(c fiber.Ctx) error {
ctx := c.UserContext() threadID, err := strconv.Atoi(c.Params("threadID"))
threadID, err := c.ParamsInt("threadID")
if err != nil { if err != nil {
return c.Status(fiber.StatusNotFound).Render("pages/404", nil) return c.Status(fiber.StatusNotFound).Render("pages/404", nil)
} }
isArchived, err := repositories.Posts.GetIfThreadIsArchived(ctx, threadID) isArchived, err := repositories.Posts.GetIfThreadIsArchived(c, threadID)
if isArchived { if isArchived {
errorHtmlData := repositories.BadRequestHtmlData{ errorHtmlData := repositories.BadRequestHtmlData{
Message: repositories.ThreadIsArchivedErrorMessage, Message: repositories.ThreadIsArchivedErrorMessage,
@ -284,7 +280,7 @@ func UpdateThread(c *fiber.Ctx) error {
} }
isSage := isSageString == "on" isSage := isSageString == "on"
conn, err := db.Pool.Acquire(ctx) conn, err := db.Pool.Acquire(c)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
@ -292,14 +288,14 @@ func UpdateThread(c *fiber.Ctx) error {
} }
defer conn.Release() defer conn.Release()
tx, err := conn.Begin(ctx) tx, err := conn.Begin(c)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
defer func() { defer func() {
rollbackErr := tx.Rollback(ctx) rollbackErr := tx.Rollback(c)
if rollbackErr != nil && !errors.Is(rollbackErr, pgx.ErrTxClosed) { if rollbackErr != nil && !errors.Is(rollbackErr, pgx.ErrTxClosed) {
log.Println("error:", rollbackErr) log.Println("error:", rollbackErr)
} }
@ -312,14 +308,14 @@ func UpdateThread(c *fiber.Ctx) error {
Text: text, Text: text,
IsSage: isSage, IsSage: isSage,
} }
postID, err := repositories.Posts.CreateInTx(ctx, tx, post) postID, err := repositories.Posts.CreateInTx(c, tx, post)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
postsCountInThread, err := repositories.Posts.GetThreadPostsCount(ctx, threadID) postsCountInThread, err := repositories.Posts.GetThreadPostsCount(c, threadID)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
@ -328,7 +324,7 @@ func UpdateThread(c *fiber.Ctx) error {
isBumpLimit := postsCountInThread >= config.App.ThreadBumpLimit isBumpLimit := postsCountInThread >= config.App.ThreadBumpLimit
isThreadBumped := !isBumpLimit && !isSage && !post.IsParent isThreadBumped := !isBumpLimit && !isSage && !post.IsParent
if isThreadBumped { if isThreadBumped {
err = repositories.Posts.BumpThreadInTx(ctx, tx, threadID) err = repositories.Posts.BumpThreadInTx(c, tx, threadID)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
@ -345,7 +341,7 @@ func UpdateThread(c *fiber.Ctx) error {
Size: int(fileInRequest.Size), Size: int(fileInRequest.Size),
} }
fileID, err := repositories.Files.CreateInTx(ctx, tx, file) fileID, err := repositories.Files.CreateInTx(c, tx, file)
if err != nil { if err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
@ -380,11 +376,11 @@ func UpdateThread(c *fiber.Ctx) error {
} }
} }
if err := tx.Commit(ctx); err != nil { if err := tx.Commit(c); err != nil {
log.Println("error:", err) log.Println("error:", err)
return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil) return c.Status(fiber.StatusInternalServerError).Render("pages/500", nil)
} }
path := "/" + strconv.Itoa(threadID) + "#" + strconv.Itoa(postID) path := "/" + strconv.Itoa(threadID) + "#" + strconv.Itoa(postID)
return c.Redirect(path) return c.Redirect().Status(fiber.StatusFound).To(path)
} }

4
controllers/threads_controller_test.go
View File

@ -8,7 +8,7 @@ import (
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v3"
"micrach/config" "micrach/config"
) )
@ -17,7 +17,7 @@ type testViews struct{}
func (testViews) Load() error { return nil } func (testViews) Load() error { return nil }
func (testViews) Render(out io.Writer, name string, _ interface{}, _ ...string) error { func (testViews) Render(out io.Writer, name string, _ any, _ ...string) error {
_, err := io.WriteString(out, name) _, err := io.WriteString(out, name)
return err return err
} }

4
gateway/controllers.go
View File

@ -3,10 +3,10 @@ package gateway
import ( import (
"micrach/config" "micrach/config"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v3"
) )
func Ping(c *fiber.Ctx) error { func Ping(c fiber.Ctx) error {
headerValues := c.GetReqHeaders()["Authorization"] headerValues := c.GetReqHeaders()["Authorization"]
headerKey := "" headerKey := ""
if len(headerValues) > 0 { if len(headerValues) > 0 {

2
gateway/controllers_test.go
View File

@ -4,7 +4,7 @@ import (
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v3"
"micrach/config" "micrach/config"
) )

30
go.mod
View File

@ -7,32 +7,32 @@ toolchain go1.26.5
require ( require (
github.com/dchest/captcha v1.1.0 github.com/dchest/captcha v1.1.0
github.com/disintegration/imaging v1.6.2 github.com/disintegration/imaging v1.6.2
github.com/gofiber/fiber/v2 v2.52.14 github.com/gofiber/fiber/v3 v3.4.0
github.com/gofiber/template/html/v2 v2.1.3 github.com/gofiber/template/html/v3 v3.0.6
github.com/jackc/pgx/v5 v5.10.0 github.com/jackc/pgx/v5 v5.10.0
github.com/joho/godotenv v1.5.1 github.com/joho/godotenv v1.5.1
) )
require ( require (
github.com/andybalholm/brotli v1.1.0 // indirect github.com/andybalholm/brotli v1.2.2 // indirect
github.com/gofiber/template v1.8.3 // indirect github.com/gofiber/schema v1.8.0 // indirect
github.com/gofiber/utils v1.2.0 // indirect github.com/gofiber/template/v2 v2.1.0 // indirect
github.com/gofiber/utils/v2 v2.1.1 // indirect
github.com/google/uuid v1.6.0 // indirect github.com/google/uuid v1.6.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/compress v1.19.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-colorable v0.1.15 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-isatty v0.0.22 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect github.com/philhofer/fwd v1.2.0 // indirect
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect github.com/tinylib/msgp v1.6.4 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/tinylib/msgp v1.2.5 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.51.0 // indirect github.com/valyala/fasthttp v1.72.0 // indirect
github.com/valyala/tcplisten v1.0.0 // indirect golang.org/x/crypto v0.53.0 // indirect
golang.org/x/image v0.44.0 // indirect golang.org/x/image v0.44.0 // indirect
golang.org/x/net v0.56.0 // indirect
golang.org/x/sync v0.22.0 // indirect golang.org/x/sync v0.22.0 // indirect
golang.org/x/sys v0.28.0 // indirect golang.org/x/sys v0.46.0 // indirect
golang.org/x/text v0.40.0 // indirect golang.org/x/text v0.40.0 // indirect
) )

71
go.sum
View File

@ -1,5 +1,5 @@
github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.2.2 h1:HzTuoo2ErYQqf5qvcJInB8uvqSVxRttzkFexPWtnceM=
github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/andybalholm/brotli v1.2.2/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -7,14 +7,18 @@ github.com/dchest/captcha v1.1.0 h1:2kt47EoYUUkaISobUdTbqwx55xvKOJxyScVfw25xzhQ=
github.com/dchest/captcha v1.1.0/go.mod h1:7zoElIawLp7GUMLcj54K9kbw+jEyvz2K0FDdRRYhvWo= github.com/dchest/captcha v1.1.0/go.mod h1:7zoElIawLp7GUMLcj54K9kbw+jEyvz2K0FDdRRYhvWo=
github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
github.com/gofiber/fiber/v2 v2.52.14 h1:Of3L+9qVFaQNwPlcmEdl5IIodHz8BSE0j37R7rWu4pE= github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78=
github.com/gofiber/fiber/v2 v2.52.14/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw= github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
github.com/gofiber/template v1.8.3 h1:hzHdvMwMo/T2kouz2pPCA0zGiLCeMnoGsQZBTSYgZxc= github.com/gofiber/fiber/v3 v3.4.0 h1:F0aND4vwZF7dR7cbvSwFQQEpBU902XHKWxrLsFBkVqw=
github.com/gofiber/template v1.8.3/go.mod h1:bs/2n0pSNPOkRa5VJ8zTIvedcI/lEYxzV3+YPXdBvq8= github.com/gofiber/fiber/v3 v3.4.0/go.mod h1:nAhJfdxUIJJph2tPWPmqWf8QDIN2iiqQiQf3lENZpdk=
github.com/gofiber/template/html/v2 v2.1.3 h1:n1LYBtmr9C0V/k/3qBblXyMxV5B0o/gpb6dFLp8ea+o= github.com/gofiber/schema v1.8.0 h1:NGsC9toPHmj8Xg4KpznuXBzNmHG6V5YV0tXKpKMcmis=
github.com/gofiber/template/html/v2 v2.1.3/go.mod h1:U5Fxgc5KpyujU9OqKzy6Kn6Qup6Tm7zdsISR+VpnHRE= github.com/gofiber/schema v1.8.0/go.mod h1:lmbXPQ8hvzXSLkdS2DS7pb4kpunC2Roh7Sj3HMjGfzA=
github.com/gofiber/utils v1.2.0 h1:NCaqd+Efg3khhN++eeUUTyBz+byIxAsmIjpl8kKOMIc= github.com/gofiber/template/html/v3 v3.0.6 h1:Vl/rOaz4MddT2yn2x60nvAjCVL1D59Av7CYxxd5NuHg=
github.com/gofiber/utils v1.2.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0= github.com/gofiber/template/html/v3 v3.0.6/go.mod h1:5WB97oy0WhJ8OpGfIu+kbPOavWFrOrSJcpAx6rxgJlk=
github.com/gofiber/template/v2 v2.1.0 h1:vrLY6uEW2HdioJm6J5FGUpYZuapVQhHciNz21XQjR/4=
github.com/gofiber/template/v2 v2.1.0/go.mod h1:ohgpR/Ng90nJbK+IyNzrgR/XpnBNt862/oTF5G7SAmE=
github.com/gofiber/utils/v2 v2.1.1 h1:kGnoGjwEnFW6w0x45W+kLlmMJvqBGkuUA4oMWKn/T/I=
github.com/gofiber/utils/v2 v2.1.1/go.mod h1:DdOgEVwQTi8cou/AKWPqhXOR4fHGRVhA/rEWL3IXG7Q=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
@ -27,43 +31,44 @@ github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.19.0 h1:sXLILfc9jV2QYWkzFOPWStmcUVH2RHEB1JCdY2oVvCQ=
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/compress v1.19.0/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM=
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c h1:dAMKvw0MlJT1GshSTtih8C2gDs04w8dReiOGXrGLNoY=
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/shamaton/msgpack/v3 v3.1.2 h1:d5gWAIyMU4M0WgDjz6IFSCuXJUA2dFwRHBpDclE8CLw=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/shamaton/msgpack/v3 v3.1.2/go.mod h1:DcQG8jrdrQCIxr3HlMYkiXdMhK+KfN2CitkyzsQV4uc=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/tinylib/msgp v1.2.5 h1:WeQg1whrXRFiZusidTQqzETkRpGjFjcIhW6uqWH09po= github.com/tinylib/msgp v1.6.4 h1:mOwYbyYDLPj35mkA2BjjYejgJk9BuHxDdvRnb6v2ZcQ=
github.com/tinylib/msgp v1.2.5/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= github.com/tinylib/msgp v1.6.4/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA= github.com/valyala/fasthttp v1.72.0 h1:R7kYdoWhn1ye1fVpP+cDHDJwYm3NkwLliwgzJ/Abg7M=
github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= github.com/valyala/fasthttp v1.72.0/go.mod h1:zsbLTYqcpIktdQytlVBwIjY9La5d6bs990nBxWg8efk=
github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.44.0 h1:+tDekMZED9+LrtB3G5xzRggpVh9CARjZqROla3R3R+I= golang.org/x/image v0.44.0 h1:+tDekMZED9+LrtB3G5xzRggpVh9CARjZqROla3R3R+I=
golang.org/x/image v0.44.0/go.mod h1:V8K3KE9KKKE+pLpQDOeN18w9oacNSvy1tDOirTu4xtY= golang.org/x/image v0.44.0/go.mod h1:V8K3KE9KKKE+pLpQDOeN18w9oacNSvy1tDOirTu4xtY=
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=

17
main.go
View File

@ -8,11 +8,12 @@ import (
_ "github.com/joho/godotenv/autoload" _ "github.com/joho/godotenv/autoload"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v3"
"github.com/gofiber/fiber/v2/middleware/compress" "github.com/gofiber/fiber/v3/middleware/compress"
"github.com/gofiber/fiber/v2/middleware/limiter" "github.com/gofiber/fiber/v3/middleware/limiter"
"github.com/gofiber/fiber/v2/middleware/recover" "github.com/gofiber/fiber/v3/middleware/recover"
"github.com/gofiber/template/html/v2" "github.com/gofiber/fiber/v3/middleware/static"
"github.com/gofiber/template/html/v3"
"micrach/build" "micrach/build"
"micrach/config" "micrach/config"
@ -32,8 +33,8 @@ func skipRateLimit(isLocal bool, path string) bool {
} }
func registerStaticRoutes(app *fiber.App) { func registerStaticRoutes(app *fiber.App) {
app.Static("/uploads", "./uploads") app.Get("/uploads/*", static.New("./uploads"))
app.Static("/static", "./static") app.Get("/static/*", static.New("./static"))
} }
func main() { func main() {
@ -65,7 +66,7 @@ func main() {
app.Use(recover.New()) app.Use(recover.New())
if config.App.IsRateLimiterEnabled { if config.App.IsRateLimiterEnabled {
app.Use(limiter.New(limiter.Config{ app.Use(limiter.New(limiter.Config{
Next: func(c *fiber.Ctx) bool { Next: func(c fiber.Ctx) bool {
return skipRateLimit(c.IsFromLocal(), c.Path()) return skipRateLimit(c.IsFromLocal(), c.Path())
}, },
Max: 50, Max: 50,

10
main_test.go
View File

@ -8,8 +8,8 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v3"
"github.com/gofiber/fiber/v2/middleware/limiter" "github.com/gofiber/fiber/v3/middleware/limiter"
) )
func TestRegisterStaticRoutes(t *testing.T) { func TestRegisterStaticRoutes(t *testing.T) {
@ -30,7 +30,7 @@ func TestRegisterStaticRoutes(t *testing.T) {
app := fiber.New() app := fiber.New()
registerStaticRoutes(app) registerStaticRoutes(app)
app.Get("/static/fallback", func(c *fiber.Ctx) error { app.Get("/static/fallback", func(c fiber.Ctx) error {
return c.SendString("fallback") return c.SendString("fallback")
}) })
@ -89,12 +89,12 @@ func TestSkipRateLimit(t *testing.T) {
func TestLimiterRejectsOrdinaryRemoteRequests(t *testing.T) { func TestLimiterRejectsOrdinaryRemoteRequests(t *testing.T) {
app := fiber.New() app := fiber.New()
app.Use(limiter.New(limiter.Config{ app.Use(limiter.New(limiter.Config{
Next: func(c *fiber.Ctx) bool { Next: func(c fiber.Ctx) bool {
return skipRateLimit(c.IsFromLocal(), c.Path()) return skipRateLimit(c.IsFromLocal(), c.Path())
}, },
Max: 2, Max: 2,
})) }))
app.Get("/", func(c *fiber.Ctx) error { app.Get("/", func(c fiber.Ctx) error {
return c.SendStatus(fiber.StatusOK) return c.SendStatus(fiber.StatusOK)
}) })

2
templates/templates_test.go
View File

@ -5,7 +5,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/gofiber/template/html/v2" "github.com/gofiber/template/html/v3"
"micrach/repositories" "micrach/repositories"
) )