forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
switch to RFC3339 everywhere
+37
-29
+5
-4
appview/db/db.go
+5
-4
appview/db/db.go
···
21
21
domain text not null unique,
22
22
did text not null,
23
23
secret text not null,
24
-
created integer default (strftime('%s', 'now')),
25
-
registered integer);
24
+
created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
25
+
registered text
26
+
);
26
27
create table if not exists public_keys (
27
28
id integer primary key autoincrement,
28
29
did text not null,
29
30
name text not null,
30
31
key text not null,
31
-
created integer default (strftime('%s', 'now')),
32
+
created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
32
33
unique(did, name, key)
33
34
);
34
35
create table if not exists repos (
···
37
36
did text not null,
38
37
name text not null,
39
38
knot text not null,
40
-
created integer default (strftime('%s', 'now')),
39
+
created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
41
40
unique(did, name, knot)
42
41
);
43
42
`)
+9
-7
appview/db/pubkeys.go
+9
-7
appview/db/pubkeys.go
···
21
21
Did string `json:"did"`
22
22
Key string `json:"key"`
23
23
Name string `json:"name"`
24
-
Created time.Time
24
+
Created *time.Time
25
25
}
26
26
27
27
func (p PublicKey) MarshalJSON() ([]byte, error) {
28
28
type Alias PublicKey
29
29
return json.Marshal(&struct {
30
-
Created int64 `json:"created"`
30
+
Created string `json:"created"`
31
31
*Alias
32
32
}{
33
-
Created: p.Created.Unix(),
33
+
Created: p.Created.Format(time.RFC3339),
34
34
Alias: (*Alias)(&p),
35
35
})
36
36
}
···
46
46
47
47
for rows.Next() {
48
48
var publicKey PublicKey
49
-
var createdAt *int64
49
+
var createdAt string
50
50
if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.Did, &createdAt); err != nil {
51
51
return nil, err
52
52
}
53
-
publicKey.Created = time.Unix(*createdAt, 0)
53
+
createdAtTime, _ := time.Parse(time.RFC3339, createdAt)
54
+
publicKey.Created = &createdAtTime
54
55
keys = append(keys, publicKey)
55
56
}
56
57
···
73
72
74
73
for rows.Next() {
75
74
var publicKey PublicKey
76
-
var createdAt *int64
75
+
var createdAt string
77
76
if err := rows.Scan(&publicKey.Did, &publicKey.Key, &publicKey.Name, &createdAt); err != nil {
78
77
return nil, err
79
78
}
80
-
publicKey.Created = time.Unix(*createdAt, 0)
79
+
createdAtTime, _ := time.Parse(time.RFC3339, createdAt)
80
+
publicKey.Created = &createdAtTime
81
81
keys = append(keys, publicKey)
82
82
}
83
83
+9
-10
appview/db/registration.go
+9
-10
appview/db/registration.go
···
44
44
}
45
45
46
46
for rows.Next() {
47
-
var createdAt *int64
48
-
var registeredAt *int64
47
+
var createdAt *string
48
+
var registeredAt *string
49
49
var registration Registration
50
50
err = rows.Scan(®istration.Domain, ®istration.ByDid, &createdAt, ®isteredAt)
51
51
52
52
if err != nil {
53
53
log.Println(err)
54
54
} else {
55
-
createdAtTime := time.Unix(*createdAt, 0)
56
-
55
+
createdAtTime, _ := time.Parse(time.RFC3339, *createdAt)
57
56
var registeredAtTime *time.Time
58
57
if registeredAt != nil {
59
-
x := time.Unix(*registeredAt, 0)
58
+
x, _ := time.Parse(time.RFC3339, *registeredAt)
60
59
registeredAtTime = &x
61
60
}
62
61
···
70
71
71
72
// returns registered status, did of owner, error
72
73
func (d *DB) RegistrationByDomain(domain string) (*Registration, error) {
73
-
var createdAt *int64
74
-
var registeredAt *int64
74
+
var createdAt *string
75
+
var registeredAt *string
75
76
var registration Registration
76
77
77
78
err := d.db.QueryRow(`
···
87
88
}
88
89
}
89
90
90
-
createdAtTime := time.Unix(*createdAt, 0)
91
+
createdAtTime, _ := time.Parse(time.RFC3339, *createdAt)
91
92
var registeredAtTime *time.Time
92
93
if registeredAt != nil {
93
-
x := time.Unix(*registeredAt, 0)
94
+
x, _ := time.Parse(time.RFC3339, *registeredAt)
94
95
registeredAtTime = &x
95
96
}
96
97
···
155
156
func (d *DB) Register(domain string) error {
156
157
_, err := d.db.Exec(`
157
158
update registrations
158
-
set registered = strftime('%s', 'now')
159
+
set registered = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')
159
160
where domain = ?;
160
161
`, domain)
161
162
+10
-5
appview/db/repos.go
+10
-5
appview/db/repos.go
···
1
1
package db
2
2
3
+
import "time"
4
+
3
5
type Repo struct {
4
6
Did string
5
7
Name string
6
8
Knot string
7
-
Created *int64
9
+
Created *time.Time
8
10
}
9
11
10
12
func (d *DB) GetAllReposByDid(did string) ([]Repo, error) {
···
20
18
21
19
for rows.Next() {
22
20
var repo Repo
23
-
var createdAt *int64
21
+
var createdAt string
24
22
if err := rows.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt); err != nil {
25
23
return nil, err
26
24
}
27
-
repo.Created = createdAt
25
+
createdAtTime, _ := time.Parse(time.RFC3339, createdAt)
26
+
repo.Created = &createdAtTime
28
27
repos = append(repos, repo)
29
28
}
30
29
···
40
37
var repo Repo
41
38
42
39
row := d.db.QueryRow(`select did, name, knot, created from repos where did = ? and name = ?`, did, name)
43
-
var createdAt *int64
40
+
41
+
var createdAt string
44
42
if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt); err != nil {
45
43
return nil, err
46
44
}
47
-
repo.Created = createdAt
45
+
createdAtTime, _ := time.Parse(time.RFC3339, createdAt)
46
+
repo.Created = &createdAtTime
48
47
49
48
return &repo, nil
50
49
}
+1
appview/state/middleware.go
+1
appview/state/middleware.go
+2
-2
knotserver/db/init.go
+2
-2
knotserver/db/init.go
···
25
25
id integer primary key autoincrement,
26
26
did text not null,
27
27
key text not null,
28
-
created timestamp default current_timestamp,
28
+
created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
29
29
unique(did, key),
30
30
foreign key (did) references known_dids(did) on delete cascade
31
31
);
···
35
35
did text not null,
36
36
name text not null,
37
37
description text not null,
38
-
created timestamp default current_timestamp,
38
+
created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
39
39
unique(did, name)
40
40
);
41
41
+1
-1
knotserver/db/pubkeys.go
+1
-1
knotserver/db/pubkeys.go
···
30
30
31
31
func (d *DB) AddPublicKey(pk PublicKey) error {
32
32
if pk.Created == "" {
33
-
pk.Created = time.Now().Format("2006-01-02 15:04:05.99999999 -0700 MST m=-0000.000000000")
33
+
pk.Created = time.Now().Format(time.RFC3339)
34
34
}
35
35
36
36
query := `insert or ignore into public_keys (did, key, created) values (?, ?, ?)`