Skip to content

Commit 7dedfee

Browse files
committed
minor adjustments
1 parent abcb172 commit 7dedfee

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

commands/exp/app_v2_0/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func PerformExport(
3131
os.Exit(1)
3232
}
3333

34-
users := results.(models.Users)
34+
users := results.([]models.User)
3535

3636
for i := 0; i < len(users); i++ {
3737
database.GetUserNodes(db, &users[i])
@@ -40,7 +40,7 @@ func PerformExport(
4040
fmt.Fprintf(os.Stderr, "Error getting GetDocumentPageRows: %v", err)
4141
}
4242

43-
docPages := results.(models.DocumentPageRows)
43+
docPages := results.([]models.DocumentPageRow)
4444

4545
models.ForEachDocument(
4646
users[i].Home,

database/app_v2_0/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func Open(dburl string, appVer types.AppVersion) (*types.DBConn, error) {
3535
return nil, fmt.Errorf("database open: app version %q not supported", appVer)
3636
}
3737

38-
func GetUsers(db *types.DBConn) (interface{}, error) {
38+
func GetUsers(db *types.DBConn) (any, error) {
3939
switch db.DBType {
4040
case types.SQLite:
4141
return sqlite_db.GetUsers(db.DB)
@@ -73,7 +73,7 @@ func GetInboxFlatNodes(db *types.DBConn, user_id interface{}) (interface{}, erro
7373
return nil, err
7474
}
7575

76-
func GetUserNodes(db *types.DBConn, user *interface{}) error {
76+
func GetUserNodes(db *types.DBConn, user *any) error {
7777
switch db.DBType {
7878
case types.SQLite:
7979
return sqlite_db.GetUserNodes(db.DB, user)

database/app_v2_0/sqlite/nodes.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ func GetHomeFlatNodes(db *sql.DB, user_id interface{}) ([]models.FlatNode, error
163163
return nodes, nil
164164
}
165165

166-
func GetUserNodes(db *sql.DB, u *interface{}) error {
166+
func GetUserNodes(db *sql.DB, u *any) error {
167167

168-
user := (*u).(models.User)
168+
user := (*u).(*models.User)
169169

170170
user.Inbox = &models.Node{
171171
Title: "inbox",

0 commit comments

Comments
 (0)