forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
fix email-resend timer
+19
-34
+17
-32
appview/db/email.go
+17
-32
appview/db/email.go
···
24
24
`
25
25
var email Email
26
26
var createdStr string
27
-
var lastSent *string
27
+
var lastSent string
28
28
err := e.QueryRow(query, did).Scan(&email.ID, &email.Did, &email.Address, &email.Verified, &email.Primary, &email.VerificationCode, &lastSent, &createdStr)
29
29
if err != nil {
30
30
return Email{}, err
···
33
33
if err != nil {
34
34
return Email{}, err
35
35
}
36
-
if lastSent != nil {
37
-
parsedTime, err := time.Parse(time.RFC3339, *lastSent)
38
-
if err != nil {
39
-
return Email{}, err
40
-
}
41
-
email.LastSent = &parsedTime
36
+
parsedTime, err := time.Parse(time.RFC3339, lastSent)
37
+
if err != nil {
38
+
return Email{}, err
42
39
}
40
+
email.LastSent = &parsedTime
43
41
return email, nil
44
42
}
45
43
···
49
51
`
50
52
var email Email
51
53
var createdStr string
52
-
var lastSent *string
54
+
var lastSent string
53
55
err := e.QueryRow(query, did, em).Scan(&email.ID, &email.Did, &email.Address, &email.Verified, &email.Primary, &email.VerificationCode, &lastSent, &createdStr)
54
56
if err != nil {
55
57
return Email{}, err
···
58
60
if err != nil {
59
61
return Email{}, err
60
62
}
61
-
if lastSent != nil {
62
-
parsedTime, err := time.Parse(time.RFC3339, *lastSent)
63
-
if err != nil {
64
-
return Email{}, err
65
-
}
66
-
email.LastSent = &parsedTime
63
+
parsedTime, err := time.Parse(time.RFC3339, lastSent)
64
+
if err != nil {
65
+
return Email{}, err
67
66
}
67
+
email.LastSent = &parsedTime
68
68
return email, nil
69
69
}
70
70
···
256
260
for rows.Next() {
257
261
var email Email
258
262
var createdStr string
259
-
var lastSent *string
263
+
var lastSent string
260
264
err := rows.Scan(&email.Did, &email.Address, &email.Verified, &email.Primary, &email.VerificationCode, &lastSent, &createdStr)
261
265
if err != nil {
262
266
return nil, err
···
265
269
if err != nil {
266
270
return nil, err
267
271
}
268
-
if lastSent != nil {
269
-
parsedTime, err := time.Parse(time.RFC3339, *lastSent)
270
-
if err != nil {
271
-
return nil, err
272
-
}
273
-
email.LastSent = &parsedTime
272
+
parsedTime, err := time.Parse(time.RFC3339, lastSent)
273
+
if err != nil {
274
+
return nil, err
274
275
}
276
+
email.LastSent = &parsedTime
275
277
emails = append(emails, email)
276
278
}
277
279
return emails, nil
···
278
284
func UpdateVerificationCode(e Execer, did string, email string, code string) error {
279
285
query := `
280
286
update emails
281
-
set verification_code = ?
287
+
set verification_code = ?,
288
+
last_sent = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')
282
289
where did = ? and email = ?
283
290
`
284
291
_, err := e.Exec(query, code, did, email)
285
-
return err
286
-
}
287
-
288
-
func UpdateLastSent(e Execer, did string, email string, lastSent time.Time) error {
289
-
query := `
290
-
update emails
291
-
set last_sent = ?
292
-
where did = ? and email = ?
293
-
`
294
-
_, err := e.Exec(query, lastSent.Format(time.RFC3339), did, email)
295
292
return err
296
293
}
+2
-2
appview/pages/templates/settings.html
+2
-2
appview/pages/templates/settings.html
···
108
108
</div>
109
109
<div class="flex gap-2 items-center">
110
110
{{ if not .Verified }}
111
-
<a
111
+
<button
112
112
class="btn flex gap-2"
113
113
hx-post="/settings/emails/verify/resend"
114
114
hx-swap="none"
···
116
116
hx-vals='{"email": "{{ .Address }}"}'>
117
117
<i class="w-5 h-5" data-lucide="rotate-cw"></i>
118
118
<span class="hidden md:inline">resend</span>
119
-
</a>
119
+
</button>
120
120
{{ end }}
121
121
{{ if and (not .Primary) .Verified }}
122
122
<a