Monorepo for Tangled
appview/models: move db.Spindle* into models
Signed-off-by: oppiliappan <me@oppi.li>
oppiliappan
(Sep 23, 2025, 12:10 PM +0100)
cca61e7f
ac76ac2b
+42
-35
+2
-2
appview/ingester.go
+2
-2
appview/ingester.go
···
387
387
return fmt.Errorf("failed to index profile record, invalid db cast")
388
388
}
389
389
390
-
err = db.AddSpindleMember(ddb, db.SpindleMember{
390
+
err = db.AddSpindleMember(ddb, models.SpindleMember{
391
391
Did: syntax.DID(did),
392
392
Rkey: e.Commit.RKey,
393
393
Instance: record.Instance,
···
480
480
return fmt.Errorf("failed to index profile record, invalid db cast")
481
481
}
482
482
483
-
err := db.AddSpindle(ddb, db.Spindle{
483
+
err := db.AddSpindle(ddb, models.Spindle{
484
484
Owner: syntax.DID(did),
485
485
Instance: instance,
486
486
})
+9
-27
appview/db/spindle.go
+9
-27
appview/db/spindle.go
···
6
6
"strings"
7
7
"time"
8
8
9
-
"github.com/bluesky-social/indigo/atproto/syntax"
9
+
"tangled.org/core/appview/models"
10
10
)
11
11
12
-
type Spindle struct {
13
-
Id int
14
-
Owner syntax.DID
15
-
Instance string
16
-
Verified *time.Time
17
-
Created time.Time
18
-
NeedsUpgrade bool
19
-
}
20
-
21
-
type SpindleMember struct {
22
-
Id int
23
-
Did syntax.DID // owner of the record
24
-
Rkey string // rkey of the record
25
-
Instance string
26
-
Subject syntax.DID // the member being added
27
-
Created time.Time
28
-
}
29
-
30
-
func GetSpindles(e Execer, filters ...filter) ([]Spindle, error) {
31
-
var spindles []Spindle
12
+
func GetSpindles(e Execer, filters ...filter) ([]models.Spindle, error) {
13
+
var spindles []models.Spindle
32
14
33
15
var conditions []string
34
16
var args []any
···
59
41
defer rows.Close()
60
42
61
43
for rows.Next() {
62
-
var spindle Spindle
44
+
var spindle models.Spindle
63
45
var createdAt string
64
46
var verified sql.NullString
65
47
var needsUpgrade int
···
100
82
}
101
83
102
84
// if there is an existing spindle with the same instance, this returns an error
103
-
func AddSpindle(e Execer, spindle Spindle) error {
85
+
func AddSpindle(e Execer, spindle models.Spindle) error {
104
86
_, err := e.Exec(
105
87
`insert into spindles (owner, instance) values (?, ?)`,
106
88
spindle.Owner,
···
151
133
return err
152
134
}
153
135
154
-
func AddSpindleMember(e Execer, member SpindleMember) error {
136
+
func AddSpindleMember(e Execer, member models.SpindleMember) error {
155
137
_, err := e.Exec(
156
138
`insert or ignore into spindle_members (did, rkey, instance, subject) values (?, ?, ?, ?)`,
157
139
member.Did,
···
181
163
return err
182
164
}
183
165
184
-
func GetSpindleMembers(e Execer, filters ...filter) ([]SpindleMember, error) {
185
-
var members []SpindleMember
166
+
func GetSpindleMembers(e Execer, filters ...filter) ([]models.SpindleMember, error) {
167
+
var members []models.SpindleMember
186
168
187
169
var conditions []string
188
170
var args []any
···
213
195
defer rows.Close()
214
196
215
197
for rows.Next() {
216
-
var member SpindleMember
198
+
var member models.SpindleMember
217
199
var createdAt string
218
200
219
201
if err := rows.Scan(
+25
appview/models/spindle.go
+25
appview/models/spindle.go
···
1
+
package models
2
+
3
+
import (
4
+
"time"
5
+
6
+
"github.com/bluesky-social/indigo/atproto/syntax"
7
+
)
8
+
9
+
type Spindle struct {
10
+
Id int
11
+
Owner syntax.DID
12
+
Instance string
13
+
Verified *time.Time
14
+
Created time.Time
15
+
NeedsUpgrade bool
16
+
}
17
+
18
+
type SpindleMember struct {
19
+
Id int
20
+
Did syntax.DID // owner of the record
21
+
Rkey string // rkey of the record
22
+
Instance string
23
+
Subject syntax.DID // the member being added
24
+
Created time.Time
25
+
}
+4
-4
appview/pages/pages.go
+4
-4
appview/pages/pages.go
···
325
325
326
326
type UpgradeBannerParams struct {
327
327
Registrations []models.Registration
328
-
Spindles []db.Spindle
328
+
Spindles []models.Spindle
329
329
}
330
330
331
331
func (p *Pages) UpgradeBanner(w io.Writer, params UpgradeBannerParams) error {
···
363
363
364
364
type SpindlesParams struct {
365
365
LoggedInUser *oauth.User
366
-
Spindles []db.Spindle
366
+
Spindles []models.Spindle
367
367
}
368
368
369
369
func (p *Pages) Spindles(w io.Writer, params SpindlesParams) error {
···
371
371
}
372
372
373
373
type SpindleListingParams struct {
374
-
db.Spindle
374
+
models.Spindle
375
375
}
376
376
377
377
func (p *Pages) SpindleListing(w io.Writer, params SpindleListingParams) error {
···
380
380
381
381
type SpindleDashboardParams struct {
382
382
LoggedInUser *oauth.User
383
-
Spindle db.Spindle
383
+
Spindle models.Spindle
384
384
Members []string
385
385
Repos map[string][]models.Repo
386
386
}
+2
-2
appview/spindles/spindles.go
+2
-2
appview/spindles/spindles.go
···
164
164
s.Enforcer.E.LoadPolicy()
165
165
}()
166
166
167
-
err = db.AddSpindle(tx, db.Spindle{
167
+
err = db.AddSpindle(tx, models.Spindle{
168
168
Owner: syntax.DID(user.Did),
169
169
Instance: instance,
170
170
})
···
525
525
rkey := tid.TID()
526
526
527
527
// add member to db
528
-
if err = db.AddSpindleMember(tx, db.SpindleMember{
528
+
if err = db.AddSpindleMember(tx, models.SpindleMember{
529
529
Did: syntax.DID(user.Did),
530
530
Rkey: rkey,
531
531
Instance: instance,