Arav/justcaptcha
1
0
Fork 0
Code Issues Releases 6 Activity

getURLParam() was made into a private module func.

Browse Source
This commit is contained in:
Alexander Andreev 2023-01-08 17:53:13 +04:00
parent ea9877f6c4
commit 6ab62fc43b
Signed by: Arav
GPG Key ID: 0388CC8FAA51063F
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/http/handlers.go
View File

@ -30,7 +30,7 @@ func (h *CaptchaHandlers) New(w http.ResponseWriter, r *http.Request) {
} }
func (h *CaptchaHandlers) Image(w http.ResponseWriter, r *http.Request) { func (h *CaptchaHandlers) Image(w http.ResponseWriter, r *http.Request) {
captchaID := captcha.ID(GetURLParam(r, "captcha")) captchaID := captcha.ID(getURLParam(r, "captcha"))
captchaStyle := r.URL.Query().Get("style") captchaStyle := r.URL.Query().Get("style")
captchaImage := inmemdb.Image(captchaID, captchaStyle) captchaImage := inmemdb.Image(captchaID, captchaStyle)
@ -45,7 +45,7 @@ func (h *CaptchaHandlers) Image(w http.ResponseWriter, r *http.Request) {
} }
func (h *CaptchaHandlers) Solve(w http.ResponseWriter, r *http.Request) { func (h *CaptchaHandlers) Solve(w http.ResponseWriter, r *http.Request) {
captchaID := captcha.ID(GetURLParam(r, "captcha")) captchaID := captcha.ID(getURLParam(r, "captcha"))
r.ParseForm() r.ParseForm()
answer := captcha.Answer(r.FormValue("answer")) answer := captcha.Answer(r.FormValue("answer"))
@ -59,7 +59,7 @@ func (h *CaptchaHandlers) Solve(w http.ResponseWriter, r *http.Request) {
} }
func (h *CaptchaHandlers) IsSolved(w http.ResponseWriter, r *http.Request) { func (h *CaptchaHandlers) IsSolved(w http.ResponseWriter, r *http.Request) {
captchaID := captcha.ID(GetURLParam(r, "captcha")) captchaID := captcha.ID(getURLParam(r, "captcha"))
isJustRemove := r.URL.Query().Has("remove") isJustRemove := r.URL.Query().Has("remove")
if isJustRemove { if isJustRemove {

4
internal/http/server.go
View File

@ -40,8 +40,8 @@ func (s *HttpServer) SetNotFoundHandler(handler http.HandlerFunc) {
s.router.NotFound = handler s.router.NotFound = handler
} }
// GetURLParam wrapper around underlying router for getting URL parameters. // getURLParam wrapper around underlying router for getting URL parameters.
func GetURLParam(r *http.Request, param string) string { func getURLParam(r *http.Request, param string) string {
return httprouter.ParamsFromContext(r.Context()).ByName(param) return httprouter.ParamsFromContext(r.Context()).ByName(param)
} }