commit 775ea4d7921af4411574544840b10577f44501a5 · nel.pet/core

+2 -1

appview/commitverify/verify.go

···

       5
       5
        
       

     

       6
       6
        
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       7
       7
        
       	"tangled.org/core/appview/db"

     

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

     

       8
       9
        
       	"tangled.org/core/crypto"

     

       9
       10
        
       	"tangled.org/core/types"

     

       10
       11
        
       )

     
···

       45
       46
        
       func GetVerifiedCommits(e db.Execer, emailToDid map[string]string, ndCommits []types.NiceDiff) (VerifiedCommits, error) {

     

       46
       47
        
       	vcs := VerifiedCommits{}

     

       47
       48
        
       

     

       48
       48
       -
       	didPubkeyCache := make(map[string][]db.PublicKey)

     

       49
       49
       +
       	didPubkeyCache := make(map[string][]models.PublicKey)

     

       49
       50
        
       

     

       50
       51
        
       	for _, commit := range ndCommits {

     

       51
       52
        
       		c := commit.Commit

+7 -26

appview/db/pubkeys.go

···

       1
       1
        
       package db

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

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

     

       5
       5
        
       	"time"

     

       6
       6
        
       )

     

       7
       7
        
       

     
···

       29
       29
        
       	return err

     

       30
       30
        
       }

     

       31
       31
        
       

     

       32
       32
       -
       type PublicKey struct {

     

       33
       33
       -
       	Did     string `json:"did"`

     

       34
       34
       -
       	Key     string `json:"key"`

     

       35
       35
       -
       	Name    string `json:"name"`

     

       36
       36
       -
       	Rkey    string `json:"rkey"`

     

       37
       37
       -
       	Created *time.Time

     

       38
       38
       -
       }

     

       39
       39
       -
       

     

       40
       40
       -
       func (p PublicKey) MarshalJSON() ([]byte, error) {

     

       41
       41
       -
       	type Alias PublicKey

     

       42
       42
       -
       	return json.Marshal(&struct {

     

       43
       43
       -
       		Created string `json:"created"`

     

       44
       44
       -
       		*Alias

     

       45
       45
       -
       	}{

     

       46
       46
       -
       		Created: p.Created.Format(time.RFC3339),

     

       47
       47
       -
       		Alias:   (*Alias)(&p),

     

       48
       48
       -
       	})

     

       49
       49
       -
       }

     

       50
       50
       -
       

     

       51
       51
       -
       func GetAllPublicKeys(e Execer) ([]PublicKey, error) {

     

       52
       52
       -
       	var keys []PublicKey

     

       32
       32
       +
       func GetAllPublicKeys(e Execer) ([]models.PublicKey, error) {

     

       33
       33
       +
       	var keys []models.PublicKey

     

       53
       34
        
       

     

       54
       35
        
       	rows, err := e.Query(`select key, name, did, rkey, created from public_keys`)

     

       55
       36
        
       	if err != nil {

     
···

       58
       39
        
       	defer rows.Close()

     

       59
       40
        
       

     

       60
       41
        
       	for rows.Next() {

     

       61
       61
       -
       		var publicKey PublicKey

     

       42
       42
       +
       		var publicKey models.PublicKey

     

       62
       43
        
       		var createdAt string

     

       63
       44
        
       		if err := rows.Scan(&publicKey.Key, &publicKey.Name, &publicKey.Did, &publicKey.Rkey, &createdAt); err != nil {

     

       64
       45
        
       			return nil, err

     
···

       75
       56
        
       	return keys, nil

     

       76
       57
        
       }

     

       77
       58
        
       

     

       78
       78
       -
       func GetPublicKeysForDid(e Execer, did string) ([]PublicKey, error) {

     

       79
       79
       -
       	var keys []PublicKey

     

       59
       59
       +
       func GetPublicKeysForDid(e Execer, did string) ([]models.PublicKey, error) {

     

       60
       60
       +
       	var keys []models.PublicKey

     

       80
       61
        
       

     

       81
       62
        
       	rows, err := e.Query(`select did, key, name, rkey, created from public_keys where did = ?`, did)

     

       82
       63
        
       	if err != nil {

     
···

       85
       66
        
       	defer rows.Close()

     

       86
       67
        
       

     

       87
       68
        
       	for rows.Next() {

     

       88
       88
       -
       		var publicKey PublicKey

     

       69
       69
       +
       		var publicKey models.PublicKey

     

       89
       70
        
       		var createdAt string

     

       90
       71
        
       		if err := rows.Scan(&publicKey.Did, &publicKey.Key, &publicKey.Name, &publicKey.Rkey, &createdAt); err != nil {

     

       91
       72
        
       			return nil, err

+25

appview/models/pubkey.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"encoding/json"

     

       5
       5
       +
       	"time"

     

       6
       6
       +
       )

     

       7
       7
       +
       

     

       8
       8
       +
       type PublicKey struct {

     

       9
       9
       +
       	Did     string `json:"did"`

     

       10
       10
       +
       	Key     string `json:"key"`

     

       11
       11
       +
       	Name    string `json:"name"`

     

       12
       12
       +
       	Rkey    string `json:"rkey"`

     

       13
       13
       +
       	Created *time.Time

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       func (p PublicKey) MarshalJSON() ([]byte, error) {

     

       17
       17
       +
       	type Alias PublicKey

     

       18
       18
       +
       	return json.Marshal(&struct {

     

       19
       19
       +
       		Created string `json:"created"`

     

       20
       20
       +
       		*Alias

     

       21
       21
       +
       	}{

     

       22
       22
       +
       		Created: p.Created.Format(time.RFC3339),

     

       23
       23
       +
       		Alias:   (*Alias)(&p),

     

       24
       24
       +
       	})

     

       25
       25
       +
       }

+1 -1

appview/pages/pages.go

···

       303
       303
        
       

     

       304
       304
        
       type UserKeysSettingsParams struct {

     

       305
       305
        
       	LoggedInUser *oauth.User

     

       306
       306
       -
       	PubKeys      []db.PublicKey

     

       306
       306
       +
       	PubKeys      []models.PublicKey

     

       307
       307
        
       	Tabs         []map[string]any

     

       308
       308
        
       	Tab          string

     

       309
       309
        
       }