From c502dc6ed888a4cf2c8b36176585f4166536ab6d Mon Sep 17 00:00:00 2001 From: Joe Chen Date: Sat, 22 Oct 2022 14:41:40 +0800 Subject: refactor(db): move some methods from `user.go` to `users.go` (#7195) --- internal/db/issue_mail.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'internal/db/issue_mail.go') diff --git a/internal/db/issue_mail.go b/internal/db/issue_mail.go index c9b5471a..91d89a41 100644 --- a/internal/db/issue_mail.go +++ b/internal/db/issue_mail.go @@ -13,6 +13,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/markup" + "gogs.io/gogs/internal/userutil" ) func (issue *Issue) MailSubject() string { @@ -36,12 +37,14 @@ func (this mailerUser) Email() string { return this.user.Email } -func (this mailerUser) GenerateActivateCode() string { - return this.user.GenerateActivateCode() -} - func (this mailerUser) GenerateEmailActivateCode(email string) string { - return this.user.GenerateEmailActivateCode(email) + return userutil.GenerateActivateCode( + this.user.ID, + email, + this.user.Name, + this.user.Passwd, + this.user.Rands, + ) } func NewMailerUser(u *User) email.User { -- cgit v1.2.3