commit a56c8a2a916b62b39effad501991c905d73da2e0 · julien.rbrt.fr/tangled-core

+4 -43

appview/db/registration.go

···

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"strings"

     

       7
       7
        
       	"time"

     

       8
       8
       -
       )

     

       9
       9
       -
       

     

       10
       10
       -
       // Registration represents a knot registration. Knot would've been a better

     

       11
       11
       -
       // name but we're stuck with this for historical reasons.

     

       12
       12
       -
       type Registration struct {

     

       13
       13
       -
       	Id           int64

     

       14
       14
       -
       	Domain       string

     

       15
       15
       -
       	ByDid        string

     

       16
       16
       -
       	Created      *time.Time

     

       17
       17
       -
       	Registered   *time.Time

     

       18
       18
       -
       	NeedsUpgrade bool

     

       19
       19
       -
       }

     

       20
       8
        
       

     

       21
       21
       -
       func (r *Registration) Status() Status {

     

       22
       22
       -
       	if r.NeedsUpgrade {

     

       23
       23
       -
       		return NeedsUpgrade

     

       24
       24
       -
       	} else if r.Registered != nil {

     

       25
       25
       -
       		return Registered

     

       26
       26
       -
       	} else {

     

       27
       27
       -
       		return Pending

     

       28
       28
       -
       	}

     

       29
       29
       -
       }

     

       30
       30
       -
       

     

       31
       31
       -
       func (r *Registration) IsRegistered() bool {

     

       32
       32
       -
       	return r.Status() == Registered

     

       33
       33
       -
       }

     

       34
       34
       -
       

     

       35
       35
       -
       func (r *Registration) IsNeedsUpgrade() bool {

     

       36
       36
       -
       	return r.Status() == NeedsUpgrade

     

       37
       37
       -
       }

     

       38
       38
       -
       

     

       39
       39
       -
       func (r *Registration) IsPending() bool {

     

       40
       40
       -
       	return r.Status() == Pending

     

       41
       41
       -
       }

     

       42
       42
       -
       

     

       43
       43
       -
       type Status uint32

     

       44
       44
       -
       

     

       45
       45
       -
       const (

     

       46
       46
       -
       	Registered Status = iota

     

       47
       47
       -
       	Pending

     

       48
       48
       -
       	NeedsUpgrade

     

       9
       9
       +
       	"tangled.org/core/appview/models"

     

       49
       10
        
       )

     

       50
       11
        
       

     

       51
       51
       -
       func GetRegistrations(e Execer, filters ...filter) ([]Registration, error) {

     

       52
       52
       -
       	var registrations []Registration

     

       12
       12
       +
       func GetRegistrations(e Execer, filters ...filter) ([]models.Registration, error) {

     

       13
       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
       84
       -
       		var reg Registration

     

       45
       45
       +
       		var reg models.Registration

     

       85
       46
        
       

     

       86
       47
        
       		err = rows.Scan(&reg.Id, &reg.Domain, &reg.ByDid, &createdAt, &registeredAt, &needsUpgrade)

     

       87
       48
        
       		if err != nil {

+44

appview/models/registration.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import "time"

     

       4
       4
       +
       

     

       5
       5
       +
       // Registration represents a knot registration. Knot would've been a better

     

       6
       6
       +
       // name but we're stuck with this for historical reasons.

     

       7
       7
       +
       type Registration struct {

     

       8
       8
       +
       	Id           int64

     

       9
       9
       +
       	Domain       string

     

       10
       10
       +
       	ByDid        string

     

       11
       11
       +
       	Created      *time.Time

     

       12
       12
       +
       	Registered   *time.Time

     

       13
       13
       +
       	NeedsUpgrade bool

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       func (r *Registration) Status() Status {

     

       17
       17
       +
       	if r.NeedsUpgrade {

     

       18
       18
       +
       		return NeedsUpgrade

     

       19
       19
       +
       	} else if r.Registered != nil {

     

       20
       20
       +
       		return Registered

     

       21
       21
       +
       	} else {

     

       22
       22
       +
       		return Pending

     

       23
       23
       +
       	}

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       func (r *Registration) IsRegistered() bool {

     

       27
       27
       +
       	return r.Status() == Registered

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       func (r *Registration) IsNeedsUpgrade() bool {

     

       31
       31
       +
       	return r.Status() == NeedsUpgrade

     

       32
       32
       +
       }

     

       33
       33
       +
       

     

       34
       34
       +
       func (r *Registration) IsPending() bool {

     

       35
       35
       +
       	return r.Status() == Pending

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       type Status uint32

     

       39
       39
       +
       

     

       40
       40
       +
       const (

     

       41
       41
       +
       	Registered Status = iota

     

       42
       42
       +
       	Pending

     

       43
       43
       +
       	NeedsUpgrade

     

       44
       44
       +
       )

+4 -4

appview/pages/pages.go

···

       324
       324
        
       }

     

       325
       325
        
       

     

       326
       326
        
       type UpgradeBannerParams struct {

     

       327
       327
       -
       	Registrations []db.Registration

     

       327
       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
       337
       -
       	Registrations []db.Registration

     

       337
       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
       346
       -
       	Registration *db.Registration

     

       346
       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
       357
       -
       	*db.Registration

     

       357
       357
       +
       	*models.Registration

     

       358
       358
        
       }

     

       359
       359
        
       

     

       360
       360
        
       func (p *Pages) KnotListing(w io.Writer, params KnotListingParams) error {