From dd952a1f39e0aa78efb59ed564216a122ff6f759 Mon Sep 17 00:00:00 2001 From: Teajey <21069848+Teajey@users.noreply.github.com> Date: Sun, 29 Dec 2024 20:41:21 +1300 Subject: [PATCH 1/3] fix: check if flash field exists --- server/rsvp/session.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/rsvp/session.go b/server/rsvp/session.go index 4389d5a..4da6ed0 100644 --- a/server/rsvp/session.go +++ b/server/rsvp/session.go @@ -18,7 +18,11 @@ func (s *Session) FlashGet() any { } func (s *Session) FlashPeek() any { - list, _ := s.inner.Values["_flash"].([]any) + flash, ok := s.inner.Values["_flash"] + if !ok { + return nil + } + list := flash.([]any) if len(list) < 1 { return nil } else { -- 2.40.1 From ffd38905845684e5e3f86743c2da33a09aa81b40 Mon Sep 17 00:00:00 2001 From: Teajey <21069848+Teajey@users.noreply.github.com> Date: Sun, 29 Dec 2024 20:41:42 +1300 Subject: [PATCH 2/3] fix: check if session exists for see other --- server/rsvp/response.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server/rsvp/response.go b/server/rsvp/response.go index d5653db..c72536f 100644 --- a/server/rsvp/response.go +++ b/server/rsvp/response.go @@ -29,11 +29,13 @@ func (res *Response) Write(w http.ResponseWriter, r *http.Request) error { if res.SeeOther != "" { http.Redirect(w, r, res.SeeOther, http.StatusSeeOther) - flash := res.Session.FlashPeek() - if flash != nil { - err := json.NewEncoder(w).Encode(flash) - if err != nil { - return err + if res.Session != nil { + flash := res.Session.FlashPeek() + if flash != nil { + err := json.NewEncoder(w).Encode(flash) + if err != nil { + return err + } } } return nil -- 2.40.1 From 8a1fef487a150760b19c5ad251fe6c0765a70a11 Mon Sep 17 00:00:00 2001 From: Teajey <21069848+Teajey@users.noreply.github.com> Date: Sun, 29 Dec 2024 20:42:59 +1300 Subject: [PATCH 3/3] fix: only trim group name --- server/api/db/group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/api/db/group.go b/server/api/db/group.go index 615fa4c..b672c98 100644 --- a/server/api/db/group.go +++ b/server/api/db/group.go @@ -80,7 +80,7 @@ func GetAllGroups() ([]Group, error) { } func CreateGroup(name string, reference string) (*Group, error) { - name = normalize.Name(name) + name = normalize.Trim(name) stmt := "INSERT INTO [group] (name, reference) VALUES (?, ?)" result, err := database.Exec(stmt, name, reference) if err != nil { -- 2.40.1