+23

appview/db/db.go

reviewed

··· 609 609 quote_count integer not null default 0 610 610 ); 611 611 612 612 + create table if not exists domain_claims ( 613 613 + id integer primary key autoincrement, 614 614 + did text not null unique, 615 615 + domain text not null unique, 616 616 + deleted text -- timestamp when the domain was released/unclaimed; null means actively claimed 617 617 + ); 618 618 + 612 619 create table if not exists migrations ( 613 620 id integer primary key autoincrement, 614 621 name text unique ··· 1258 1251 1259 1252 -- rename new table 1260 1253 alter table profile_stats_new rename to profile_stats; 1254 1254 + `) 1255 1255 + return err 1256 1256 + }) 1257 1257 + 1258 1258 + orm.RunMigration(conn, logger, "add-repo-sites-table", func(tx *sql.Tx) error { 1259 1259 + _, err := tx.Exec(` 1260 1260 + create table if not exists repo_sites ( 1261 1261 + id integer primary key autoincrement, 1262 1262 + repo_at text not null unique, 1263 1263 + branch text not null, 1264 1264 + dir text not null default '/', 1265 1265 + is_index integer not null default 0, 1266 1266 + created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 1267 1267 + updated text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 1268 1268 + foreign key (repo_at) references repos(at_uri) on delete cascade 1269 1269 + ); 1261 1270 `) 1262 1271 return err 1263 1272 })

+198

appview/db/sites.go

reviewed

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + "errors" 6 6 + "fmt" 7 7 + "time" 8 8 + 9 9 + "tangled.org/core/appview/models" 10 10 + ) 11 11 + 12 12 + var ( 13 13 + ErrDomainTaken = errors.New("domain is already claimed by another user") 14 14 + ErrDomainCooldown = errors.New("domain is in a 30-day cooldown period after being released") 15 15 + ErrAlreadyClaimed = errors.New("you already have an active domain claim; release it before claiming a new one") 16 16 + ) 17 17 + 18 18 + func scanClaim(row *sql.Row) (*models.DomainClaim, error) { 19 19 + var claim models.DomainClaim 20 20 + var deletedStr sql.NullString 21 21 + 22 22 + if err := row.Scan(&claim.ID, &claim.Did, &claim.Domain, &deletedStr); err != nil { 23 23 + return nil, err 24 24 + } 25 25 + 26 26 + if deletedStr.Valid { 27 27 + t, err := time.Parse(time.RFC3339, deletedStr.String) 28 28 + if err != nil { 29 29 + return nil, fmt.Errorf("parsing deleted timestamp: %w", err) 30 30 + } 31 31 + claim.Deleted = &t 32 32 + } 33 33 + 34 34 + return &claim, nil 35 35 + } 36 36 + 37 37 + func GetDomainClaimByDomain(e Execer, domain string) (*models.DomainClaim, error) { 38 38 + row := e.QueryRow(` 39 39 + select id, did, domain, deleted 40 40 + from domain_claims 41 41 + where domain = ? 42 42 + `, domain) 43 43 + return scanClaim(row) 44 44 + } 45 45 + 46 46 + func GetActiveDomainClaimForDid(e Execer, did string) (*models.DomainClaim, error) { 47 47 + row := e.QueryRow(` 48 48 + select id, did, domain, deleted 49 49 + from domain_claims 50 50 + where did = ? and deleted is null 51 51 + `, did) 52 52 + return scanClaim(row) 53 53 + } 54 54 + 55 55 + func GetDomainClaimForDid(e Execer, did string) (*models.DomainClaim, error) { 56 56 + row := e.QueryRow(` 57 57 + select id, did, domain, deleted 58 58 + from domain_claims 59 59 + where did = ? 60 60 + `, did) 61 61 + return scanClaim(row) 62 62 + } 63 63 + 64 64 + func ClaimDomain(e Execer, did, domain string) error { 65 65 + const cooldown = 30 * 24 * time.Hour 66 66 + 67 67 + domainRow, err := GetDomainClaimByDomain(e, domain) 68 68 + if err != nil && !errors.Is(err, sql.ErrNoRows) { 69 69 + return fmt.Errorf("looking up domain: %w", err) 70 70 + } 71 71 + 72 72 + if domainRow != nil { 73 73 + if domainRow.Did == did { 74 74 + if domainRow.Deleted == nil { 75 75 + return nil 76 76 + } 77 77 + if time.Since(*domainRow.Deleted) < cooldown { 78 78 + return ErrDomainCooldown 79 79 + } 80 80 + _, err = e.Exec(` 81 81 + update domain_claims set deleted = null where did = ? and domain = ? 82 82 + `, did, domain) 83 83 + return err 84 84 + } 85 85 + 86 86 + if domainRow.Deleted == nil { 87 87 + return ErrDomainTaken 88 88 + } 89 89 + if time.Since(*domainRow.Deleted) < cooldown { 90 90 + return ErrDomainCooldown 91 91 + } 92 92 + 93 93 + if _, err = e.Exec(`delete from domain_claims where domain = ?`, domain); err != nil { 94 94 + return fmt.Errorf("clearing expired domain row: %w", err) 95 95 + } 96 96 + } 97 97 + 98 98 + didRow, err := GetDomainClaimForDid(e, did) 99 99 + if err != nil && !errors.Is(err, sql.ErrNoRows) { 100 100 + return fmt.Errorf("looking up DID claim: %w", err) 101 101 + } 102 102 + 103 103 + if didRow == nil { 104 104 + _, err = e.Exec(` 105 105 + insert into domain_claims (did, domain) values (?, ?) 106 106 + `, did, domain) 107 107 + return err 108 108 + } 109 109 + 110 110 + if didRow.Deleted == nil { 111 111 + return ErrAlreadyClaimed 112 112 + } 113 113 + 114 114 + _, err = e.Exec(` 115 115 + update domain_claims set domain = ?, deleted = null where did = ? 116 116 + `, domain, did) 117 117 + return err 118 118 + } 119 119 + 120 120 + func ReleaseDomain(e Execer, did, domain string) error { 121 121 + result, err := e.Exec(` 122 122 + update domain_claims 123 123 + set deleted = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') 124 124 + where did = ? and domain = ? and deleted is null 125 125 + `, did, domain) 126 126 + if err != nil { 127 127 + return err 128 128 + } 129 129 + 130 130 + n, err := result.RowsAffected() 131 131 + if err != nil { 132 132 + return err 133 133 + } 134 134 + if n == 0 { 135 135 + return errors.New("domain not found or not actively claimed by this account") 136 136 + } 137 137 + return nil 138 138 + } 139 139 + 140 140 + // GetRepoSiteConfig returns the site configuration for a repo, or nil if not configured. 141 141 + func GetRepoSiteConfig(e Execer, repoAt string) (*models.RepoSite, error) { 142 142 + row := e.QueryRow(` 143 143 + select id, repo_at, branch, dir, is_index, created, updated 144 144 + from repo_sites 145 145 + where repo_at = ? 146 146 + `, repoAt) 147 147 + 148 148 + var s models.RepoSite 149 149 + var isIndex int 150 150 + var createdStr, updatedStr string 151 151 + 152 152 + err := row.Scan(&s.ID, &s.RepoAt, &s.Branch, &s.Dir, &isIndex, &createdStr, &updatedStr) 153 153 + if errors.Is(err, sql.ErrNoRows) { 154 154 + return nil, nil 155 155 + } 156 156 + if err != nil { 157 157 + return nil, err 158 158 + } 159 159 + 160 160 + s.IsIndex = isIndex != 0 161 161 + 162 162 + s.Created, err = time.Parse(time.RFC3339, createdStr) 163 163 + if err != nil { 164 164 + return nil, fmt.Errorf("parsing created timestamp: %w", err) 165 165 + } 166 166 + 167 167 + s.Updated, err = time.Parse(time.RFC3339, updatedStr) 168 168 + if err != nil { 169 169 + return nil, fmt.Errorf("parsing updated timestamp: %w", err) 170 170 + } 171 171 + 172 172 + return &s, nil 173 173 + } 174 174 + 175 175 + // SetRepoSiteConfig inserts or replaces the site configuration for a repo. 176 176 + func SetRepoSiteConfig(e Execer, repoAt, branch, dir string, isIndex bool) error { 177 177 + isIndexInt := 0 178 178 + if isIndex { 179 179 + isIndexInt = 1 180 180 + } 181 181 + 182 182 + _, err := e.Exec(` 183 183 + insert into repo_sites (repo_at, branch, dir, is_index, updated) 184 184 + values (?, ?, ?, ?, strftime('%Y-%m-%dT%H:%M:%SZ', 'now')) 185 185 + on conflict(repo_at) do update set 186 186 + branch = excluded.branch, 187 187 + dir = excluded.dir, 188 188 + is_index = excluded.is_index, 189 189 + updated = excluded.updated 190 190 + `, repoAt, branch, dir, isIndexInt) 191 191 + return err 192 192 + } 193 193 + 194 194 + // DeleteRepoSiteConfig removes the site configuration for a repo. 195 195 + func DeleteRepoSiteConfig(e Execer, repoAt string) error { 196 196 + _, err := e.Exec(`delete from repo_sites where repo_at = ?`, repoAt) 197 197 + return err 198 198 + }

+20

appview/models/sites.go

reviewed

··· 1 1 + package models 2 2 + 3 3 + import "time" 4 4 + 5 5 + type DomainClaim struct { 6 6 + ID int64 7 7 + Did string 8 8 + Domain string 9 9 + Deleted *time.Time 10 10 + } 11 11 + 12 12 + type RepoSite struct { 13 13 + ID int64 14 14 + RepoAt string 15 15 + Branch string 16 16 + Dir string 17 17 + IsIndex bool 18 18 + Created time.Time 19 19 + Updated time.Time 20 20 + }