From eb00a7e7333a88ec2416dffc9dd76c5777405036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Gir=C3=A3o?= Date: Tue, 11 Jun 2024 18:49:23 +0000 Subject: [PATCH] Remove unused data from router MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: João Tiago --- routers/web/user/setting/notifications.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/routers/web/user/setting/notifications.go b/routers/web/user/setting/notifications.go index 1ef085997b..5227b3f406 100644 --- a/routers/web/user/setting/notifications.go +++ b/routers/web/user/setting/notifications.go @@ -6,7 +6,6 @@ package setting import ( "errors" "net/http" - "time" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" @@ -101,25 +100,17 @@ func loadNotificationsData(ctx *context.Context) { } type UserEmail struct { user_model.EmailAddress - CanBePrimary bool } - pendingActivation := ctx.Cache.IsExist("MailResendLimit_" + ctx.Doer.LowerName) emails := make([]*UserEmail, len(emlist)) for i, em := range emlist { + if !em.IsActivated { + continue + } var email UserEmail email.EmailAddress = *em - email.CanBePrimary = em.IsActivated emails[i] = &email } ctx.Data["Emails"] = emails ctx.Data["EmailNotificationsPreference"] = ctx.Doer.EmailNotificationsPreference ctx.Data["UINotificationsPreference"] = ctx.Doer.UINotificationsPreference - ctx.Data["ActivationsPending"] = pendingActivation - ctx.Data["CanAddEmails"] = !pendingActivation || !setting.Service.RegisterEmailConfirm - ctx.Data["UserDisabledFeatures"] = user_model.DisabledFeaturesWithLoginType(ctx.Doer) - - if setting.Service.UserDeleteWithCommentsMaxTime != 0 { - ctx.Data["UserDeleteWithCommentsMaxTime"] = setting.Service.UserDeleteWithCommentsMaxTime.String() - ctx.Data["UserDeleteWithComments"] = ctx.Doer.CreatedUnix.AsTime().Add(setting.Service.UserDeleteWithCommentsMaxTime).After(time.Now()) - } }