From 354e7aaea0e1b37011c2cc16c098f5c3d3851712 Mon Sep 17 00:00:00 2001 From: akuma06 Date: Sun, 21 May 2017 02:12:29 +0200 Subject: [PATCH] Better to check user.ID, to be sure not anon --- router/language_handler.go | 7 ++++--- util/languages/translation.go | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/router/language_handler.go b/router/language_handler.go index 8239c196..60df29f7 100644 --- a/router/language_handler.go +++ b/router/language_handler.go @@ -6,6 +6,7 @@ import ( "github.com/NyaaPantsu/nyaa/service/user" "github.com/NyaaPantsu/nyaa/util/languages" + "github.com/NyaaPantsu/nyaa/util/timeHelper" "github.com/gorilla/mux" ) @@ -55,13 +56,13 @@ func ChangeLanguageHandler(w http.ResponseWriter, r *http.Request) { } // If logged in, update user language; if not, set cookie. - user, err := userService.CurrentUser(r) - if err == nil { + user, _ := userService.CurrentUser(r) + if user.ID > 0 { user.Language = lang // I don't know if I should use this... userService.UpdateUserCore(&user) } - http.SetCookie(w, &http.Cookie{Name: "lang", Value: lang}) + http.SetCookie(w, &http.Cookie{Name: "lang", Value: lang, Expires: timeHelper.FewDaysLater(365)}) url, _ := Router.Get("home").URL() http.Redirect(w, r, url.String(), http.StatusSeeOther) diff --git a/util/languages/translation.go b/util/languages/translation.go index 257ec69f..432d4291 100644 --- a/util/languages/translation.go +++ b/util/languages/translation.go @@ -103,8 +103,8 @@ func GetDefaultTfunc() (i18n.TranslateFunc, error) { func GetTfuncAndLanguageFromRequest(r *http.Request) (T i18n.TranslateFunc, Tlang *language.Language) { userLanguage := "" - user, err := getCurrentUser(r) - if err == nil { + user, _ := getCurrentUser(r) + if user.ID > 0 { userLanguage = user.Language }