make switchlanguage work with POST
This commit is contained in:
parent
d4d45832c8
commit
99a4eca07b
4 changed files with 28 additions and 23 deletions
|
@ -75,10 +75,10 @@ func HandleTTS(c *fiber.Ctx) error {
|
|||
// @Success 200 {object} libmozhi.LangOut
|
||||
// @Router /api/translate [get]
|
||||
func HandleTranslate(c *fiber.Ctx) error {
|
||||
engine := utils.Sanitize(getQueryOrFormValue(c, "engine"), "alpha")
|
||||
from := utils.Sanitize(getQueryOrFormValue(c, "from"), "alpha")
|
||||
to := utils.Sanitize(getQueryOrFormValue(c, "to"), "alpha")
|
||||
text := getQueryOrFormValue(c, "text")
|
||||
engine := utils.Sanitize(utils.GetQueryOrFormValue(c, "engine"), "alpha")
|
||||
from := utils.Sanitize(utils.GetQueryOrFormValue(c, "from"), "alpha")
|
||||
to := utils.Sanitize(utils.GetQueryOrFormValue(c, "to"), "alpha")
|
||||
text := utils.GetQueryOrFormValue(c, "text")
|
||||
if engine == "" || from == "" || to == "" || text == "" {
|
||||
return fiber.NewError(fiber.StatusBadRequest, "from, to, engine, text are required query strings.")
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@ import (
|
|||
"slices"
|
||||
|
||||
"codeberg.org/aryak/libmozhi"
|
||||
"codeberg.org/aryak/mozhi/utils"
|
||||
"github.com/gofiber/fiber/v2"
|
||||
)
|
||||
|
||||
|
@ -68,14 +69,6 @@ func langListMerge(engines map[string]string) ([]libmozhi.List, []libmozhi.List)
|
|||
return deDuplicateLists(sl), deDuplicateLists(tl)
|
||||
}
|
||||
|
||||
func getQueryOrFormValue(c *fiber.Ctx, key string) string {
|
||||
if c.Method() == "POST" {
|
||||
return c.FormValue(key)
|
||||
} else {
|
||||
return c.Query(key)
|
||||
}
|
||||
}
|
||||
|
||||
func HandleIndex(c *fiber.Ctx) error {
|
||||
engines := engineList()
|
||||
var enginesAsArray []string
|
||||
|
@ -83,7 +76,7 @@ func HandleIndex(c *fiber.Ctx) error {
|
|||
enginesAsArray = append(enginesAsArray, engine)
|
||||
}
|
||||
|
||||
var engine = getQueryOrFormValue(c, "engine")
|
||||
var engine = utils.GetQueryOrFormValue(c, "engine")
|
||||
if engine == "" || !slices.Contains(enginesAsArray, engine) {
|
||||
engine = "google"
|
||||
}
|
||||
|
@ -97,9 +90,9 @@ func HandleIndex(c *fiber.Ctx) error {
|
|||
targetLanguages, _ = libmozhi.LangList(engine, "tl")
|
||||
}
|
||||
|
||||
originalText := getQueryOrFormValue(c, "text")
|
||||
to := getQueryOrFormValue(c, "to")
|
||||
from := getQueryOrFormValue(c, "from")
|
||||
originalText := utils.GetQueryOrFormValue(c, "text")
|
||||
to := utils.GetQueryOrFormValue(c, "to")
|
||||
from := utils.GetQueryOrFormValue(c, "from")
|
||||
|
||||
var translation libmozhi.LangOut
|
||||
var translationExists bool
|
||||
|
|
|
@ -11,6 +11,7 @@ import (
|
|||
"codeberg.org/aryak/mozhi/pages"
|
||||
"codeberg.org/aryak/mozhi/public"
|
||||
"codeberg.org/aryak/mozhi/views"
|
||||
"codeberg.org/aryak/mozhi/utils"
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"github.com/gofiber/fiber/v2/middleware/compress"
|
||||
"github.com/gofiber/fiber/v2/middleware/filesystem"
|
||||
|
@ -97,14 +98,14 @@ func Serve(port string) {
|
|||
api.Get("/swagger/*", swagger.HandlerDefault) // default
|
||||
|
||||
app.All("/", pages.HandleIndex)
|
||||
app.Get("/about", pages.HandleAbout)
|
||||
app.Get("/switchlanguages", func(c *fiber.Ctx) error {
|
||||
engine := c.Query("engine")
|
||||
from := c.Query("from")
|
||||
to := c.Query("to")
|
||||
text := c.Query("text")
|
||||
app.All("/switchlanguages", func(c *fiber.Ctx) error {
|
||||
engine := utils.Sanitize(utils.GetQueryOrFormValue(c, "engine"), "alpha")
|
||||
from := utils.Sanitize(utils.GetQueryOrFormValue(c, "from"), "alpha")
|
||||
to := utils.Sanitize(utils.GetQueryOrFormValue(c, "to"), "alpha")
|
||||
text := utils.Sanitize(utils.GetQueryOrFormValue(c, "text"), "alpha")
|
||||
return c.Redirect("/?engine="+engine+"&from="+to+"&to="+from+"&text="+text+"&redirected=true", 301)
|
||||
})
|
||||
app.Get("/about", pages.HandleAbout)
|
||||
app.Use("/", filesystem.New(filesystem.Config{
|
||||
MaxAge: 2592000,
|
||||
Root: http.FS(public.GetFiles()),
|
||||
|
|
|
@ -1,6 +1,17 @@
|
|||
package utils
|
||||
|
||||
import "regexp"
|
||||
import (
|
||||
"regexp"
|
||||
"github.com/gofiber/fiber/v2"
|
||||
)
|
||||
|
||||
func GetQueryOrFormValue(c *fiber.Ctx, key string) string {
|
||||
if c.Method() == "POST" {
|
||||
return c.FormValue(key)
|
||||
} else {
|
||||
return c.Query(key)
|
||||
}
|
||||
}
|
||||
|
||||
func Sanitize(str string, strip string) string {
|
||||
nonAlphanumericRegex := regexp.MustCompile(`[^a-zA-Z]+`)
|
Loading…
Reference in a new issue