Monorepo for Tangled
appview/models: move db.Registration into models
Signed-off-by: oppiliappan <me@oppi.li>
oppiliappan
(Sep 23, 2025, 12:10 PM +0100)
a56c8a2a
a2979381
+52
-47
+4
-43
appview/db/registration.go
+4
-43
appview/db/registration.go
···
5
5
"fmt"
6
6
"strings"
7
7
"time"
8
-
)
9
-
10
-
// Registration represents a knot registration. Knot would've been a better
11
-
// name but we're stuck with this for historical reasons.
12
-
type Registration struct {
13
-
Id int64
14
-
Domain string
15
-
ByDid string
16
-
Created *time.Time
17
-
Registered *time.Time
18
-
NeedsUpgrade bool
19
-
}
20
8
21
-
func (r *Registration) Status() Status {
22
-
if r.NeedsUpgrade {
23
-
return NeedsUpgrade
24
-
} else if r.Registered != nil {
25
-
return Registered
26
-
} else {
27
-
return Pending
28
-
}
29
-
}
30
-
31
-
func (r *Registration) IsRegistered() bool {
32
-
return r.Status() == Registered
33
-
}
34
-
35
-
func (r *Registration) IsNeedsUpgrade() bool {
36
-
return r.Status() == NeedsUpgrade
37
-
}
38
-
39
-
func (r *Registration) IsPending() bool {
40
-
return r.Status() == Pending
41
-
}
42
-
43
-
type Status uint32
44
-
45
-
const (
46
-
Registered Status = iota
47
-
Pending
48
-
NeedsUpgrade
9
+
"tangled.org/core/appview/models"
49
10
)
50
11
51
-
func GetRegistrations(e Execer, filters ...filter) ([]Registration, error) {
52
-
var registrations []Registration
12
+
func GetRegistrations(e Execer, filters ...filter) ([]models.Registration, error) {
13
+
var registrations []models.Registration
53
14
54
15
var conditions []string
55
16
var args []any
···
81
42
var createdAt string
82
43
var registeredAt sql.Null[string]
83
44
var needsUpgrade int
84
-
var reg Registration
45
+
var reg models.Registration
85
46
86
47
err = rows.Scan(®.Id, ®.Domain, ®.ByDid, &createdAt, ®isteredAt, &needsUpgrade)
87
48
if err != nil {
+44
appview/models/registration.go
+44
appview/models/registration.go
···
1
+
package models
2
+
3
+
import "time"
4
+
5
+
// Registration represents a knot registration. Knot would've been a better
6
+
// name but we're stuck with this for historical reasons.
7
+
type Registration struct {
8
+
Id int64
9
+
Domain string
10
+
ByDid string
11
+
Created *time.Time
12
+
Registered *time.Time
13
+
NeedsUpgrade bool
14
+
}
15
+
16
+
func (r *Registration) Status() Status {
17
+
if r.NeedsUpgrade {
18
+
return NeedsUpgrade
19
+
} else if r.Registered != nil {
20
+
return Registered
21
+
} else {
22
+
return Pending
23
+
}
24
+
}
25
+
26
+
func (r *Registration) IsRegistered() bool {
27
+
return r.Status() == Registered
28
+
}
29
+
30
+
func (r *Registration) IsNeedsUpgrade() bool {
31
+
return r.Status() == NeedsUpgrade
32
+
}
33
+
34
+
func (r *Registration) IsPending() bool {
35
+
return r.Status() == Pending
36
+
}
37
+
38
+
type Status uint32
39
+
40
+
const (
41
+
Registered Status = iota
42
+
Pending
43
+
NeedsUpgrade
44
+
)
+4
-4
appview/pages/pages.go
+4
-4
appview/pages/pages.go
···
324
324
}
325
325
326
326
type UpgradeBannerParams struct {
327
-
Registrations []db.Registration
327
+
Registrations []models.Registration
328
328
Spindles []db.Spindle
329
329
}
330
330
···
334
334
335
335
type KnotsParams struct {
336
336
LoggedInUser *oauth.User
337
-
Registrations []db.Registration
337
+
Registrations []models.Registration
338
338
}
339
339
340
340
func (p *Pages) Knots(w io.Writer, params KnotsParams) error {
···
343
343
344
344
type KnotParams struct {
345
345
LoggedInUser *oauth.User
346
-
Registration *db.Registration
346
+
Registration *models.Registration
347
347
Members []string
348
348
Repos map[string][]models.Repo
349
349
IsOwner bool
···
354
354
}
355
355
356
356
type KnotListingParams struct {
357
-
*db.Registration
357
+
*models.Registration
358
358
}
359
359
360
360
func (p *Pages) KnotListing(w io.Writer, params KnotListingParams) error {