commit 107a638184c2c4f35bb72a05bfdcd73e9e2f96f7 · notnite.com/core

+8 -4

api/bild/bildpublicKey.go api/tangled/tangledpublicKey.go

···

       1
       1
        
       // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT.

     

       2
       2
        
       

     

       3
       3
       -
       package bild

     

       3
       3
       +
       package tangled

     

       4
       4
        
       

     

       5
       5
       -
       // schema: sh.bild.publicKey

     

       5
       5
       +
       // schema: sh.tangled.publicKey

     

       6
       6
        
       

     

       7
       7
        
       import (

     

       8
       8
        
       	"github.com/bluesky-social/indigo/lex/util"

     

       9
       9
        
       )

     

       10
       10
        
       

     

       11
       11
       +
       const (

     

       12
       12
       +
       	PublicKeyNSID = "sh.tangled.publicKey"

     

       13
       13
       +
       )

     

       14
       14
       +
       

     

       11
       15
        
       func init() {

     

       12
       12
       -
       	 util.RegisterType("sh.bild.publicKey", &PublicKey{})

     

       16
       16
       +
       	util.RegisterType("sh.tangled.publicKey", &PublicKey{})

     

       13
       17
        
       } //

     

       14
       18
        
       // RECORDTYPE: PublicKey

     

       15
       19
        
       type PublicKey struct {

     

       16
       16
       -
       	LexiconTypeID string `json:"$type,const=sh.bild.publicKey" cborgen:"$type,const=sh.bild.publicKey"`

     

       20
       20
       +
       	LexiconTypeID string `json:"$type,const=sh.tangled.publicKey" cborgen:"$type,const=sh.tangled.publicKey"`

     

       17
       21
        
       	// created: key upload timestamp

     

       18
       22
        
       	Created string `json:"created" cborgen:"created"`

     

       19
       23
        
       	// key: public key contents

+3 -3

api/bild/cbor_gen.go api/tangled/cbor_gen.go

···

       1
       1
        
       // Code generated by github.com/whyrusleeping/cbor-gen. DO NOT EDIT.

     

       2
       2
        
       

     

       3
       3
       -
       package bild

     

       3
       3
       +
       package tangled

     

       4
       4
        
       

     

       5
       5
        
       import (

     

       6
       6
        
       	"fmt"

     
···

       88
       88
        
       		return err

     

       89
       89
        
       	}

     

       90
       90
        
       

     

       91
       91
       -
       	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.bild.publicKey"))); err != nil {

     

       91
       91
       +
       	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("sh.tangled.publicKey"))); err != nil {

     

       92
       92
        
       		return err

     

       93
       93
        
       	}

     

       94
       94
       -
       	if _, err := cw.WriteString(string("sh.bild.publicKey")); err != nil {

     

       94
       94
       +
       	if _, err := cw.WriteString(string("sh.tangled.publicKey")); err != nil {

     

       95
       95
        
       		return err

     

       96
       96
        
       	}

     

       97
       97

+2 -2

appview/state/state.go

···

       14
       14
        
       	"github.com/gliderlabs/ssh"

     

       15
       15
        
       	"github.com/go-chi/chi/v5"

     

       16
       16
        
       	"github.com/google/uuid"

     

       17
       17
       -
       	shbild "github.com/icyphox/bild/api/bild"

     

       17
       17
       +
       	tangled "github.com/icyphox/bild/api/tangled"

     

       18
       18
        
       	"github.com/icyphox/bild/appview"

     

       19
       19
        
       	"github.com/icyphox/bild/appview/auth"

     

       20
       20
        
       	"github.com/icyphox/bild/appview/db"

     
···

       148
       148
        
       			Collection: "sh.bild.publicKey",

     

       149
       149
        
       			Repo:       did,

     

       150
       150
        
       			Rkey:       uuid.New().String(),

     

       151
       151
       -
       			Record: &lexutil.LexiconTypeDecoder{Val: &shbild.PublicKey{

     

       151
       151
       +
       			Record: &lexutil.LexiconTypeDecoder{Val: &tangled.PublicKey{

     

       152
       152
        
       				Created: time.Now().String(),

     

       153
       153
        
       				Key:     key,

     

       154
       154
        
       				Name:    name,

+4 -4

cmd/gen.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	shbild "github.com/icyphox/bild/api/bild"

     

       4
       4
       +
       	shtangled "github.com/icyphox/bild/api/tangled"

     

       5
       5
        
       	cbg "github.com/whyrusleeping/cbor-gen"

     

       6
       6
        
       )

     

       7
       7
        
       

     
···

       12
       12
        
       	}

     

       13
       13
        
       

     

       14
       14
        
       	if err := genCfg.WriteMapEncodersToFile(

     

       15
       15
       -
       		"api/bild/cbor_gen.go",

     

       16
       16
       -
       		"bild",

     

       17
       17
       -
       		shbild.PublicKey{},

     

       15
       15
       +
       		"api/tangled/cbor_gen.go",

     

       16
       16
       +
       		"tangled",

     

       17
       17
       +
       		shtangled.PublicKey{},

     

       18
       18
        
       	); err != nil {

     

       19
       19
        
       		panic(err)

     

       20
       20
        
       	}

+1

flake.nix

···

       50
       50
        
                 pkgs.httpie

     

       51
       51
        
                 pkgs.indigo-lexgen

     

       52
       52
        
                 pkgs.litecli

     

       53
       53
       +
                 pkgs.websocat

     

       53
       54
        
               ];

     

       54
       55
        
             };

     

       55
       56
        
           });

+2 -1

knotserver/handler.go

···

       8
       8
        
       	"net/http"

     

       9
       9
        
       

     

       10
       10
        
       	"github.com/go-chi/chi/v5"

     

       11
       11
       +
       	tangled "github.com/icyphox/bild/api/tangled"

     

       11
       12
        
       	"github.com/icyphox/bild/knotserver/config"

     

       12
       13
        
       	"github.com/icyphox/bild/knotserver/db"

     

       13
       14
        
       	"github.com/icyphox/bild/knotserver/jsclient"

     
···

       71
       72
        
       }

     

       72
       73
        
       

     

       73
       74
        
       func (h *Handle) StartJetstream(ctx context.Context) error {

     

       74
       74
       -
       	colections := []string{"sh.bild.publicKeys"}

     

       75
       75
       +
       	colections := []string{tangled.PublicKeyNSID}

     

       75
       76
        
       	dids := []string{}

     

       76
       77
        
       

     

       77
       78
        
       	h.js = jsclient.NewJetstreamClient(colections, dids)

+4 -4

lexicon-build-config.json

···

       1
       1
        
       [

     

       2
       2
        
         {

     

       3
       3
       -
           "package": "bild",

     

       4
       4
       -
           "prefix": "sh.bild",

     

       5
       5
       -
           "outdir": "api/bild",

     

       6
       6
       -
           "import": "github.com/icyphox/bild/api/bild",

     

       3
       3
       +
           "package": "tangled",

     

       4
       4
       +
           "prefix": "sh.tangled",

     

       5
       5
       +
           "outdir": "api/tangled",

     

       6
       6
       +
           "import": "github.com/icyphox/bild/api/tangled",

     

       7
       7
        
           "gen-server": true

     

       8
       8
        
         }

     

       9
       9
        
       ]

+1 -1

lexicons/publicKey.json

···

       1
       1
        
       {

     

       2
       2
        
         "lexicon": 1,

     

       3
       3
       -
         "id": "sh.bild.publicKey",

     

       3
       3
       +
         "id": "sh.tangled.publicKey",

     

       4
       4
        
         "needsCbor": true,

     

       5
       5
        
         "needsType": true,

     

       6
       6
        
         "defs": {