commit 885cf5ceec9e661b2017de0f8e205e45411d42d0 · julien.rbrt.fr/tangled-core

+1 -1

appview/auth/auth.go

···

       11
       11
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       12
       12
        
       	"github.com/bluesky-social/indigo/xrpc"

     

       13
       13
        
       	"github.com/gorilla/sessions"

     

       14
       14
       -
       	"github.com/icyphox/bild/appview"

     

       14
       14
       +
       	"github.com/sotangled/tangled/appview"

     

       15
       15
        
       )

     

       16
       16
        
       

     

       17
       17
        
       type Auth struct {

+2 -2

appview/state/middleware.go

···

       7
       7
        
       

     

       8
       8
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       9
       9
        
       	"github.com/bluesky-social/indigo/xrpc"

     

       10
       10
       -
       	"github.com/icyphox/bild/appview"

     

       11
       11
       -
       	"github.com/icyphox/bild/appview/auth"

     

       10
       10
       +
       	"github.com/sotangled/tangled/appview"

     

       11
       11
       +
       	"github.com/sotangled/tangled/appview/auth"

     

       12
       12
        
       )

     

       13
       13
        
       

     

       14
       14
        
       type Middleware func(http.Handler) http.Handler

+4 -4

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
       -
       	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"

     

       17
       17
       +
       	tangled "github.com/sotangled/tangled/api/tangled"

     

       18
       18
       +
       	"github.com/sotangled/tangled/appview"

     

       19
       19
       +
       	"github.com/sotangled/tangled/appview/auth"

     

       20
       20
       +
       	"github.com/sotangled/tangled/appview/db"

     

       21
       21
        
       )

     

       22
       22
        
       

     

       23
       23
        
       type State struct {

+1 -1

cmd/appview/main.go

···

       7
       7
        
       	"net/http"

     

       8
       8
        
       	"os"

     

       9
       9
        
       

     

       10
       10
       -
       	"github.com/icyphox/bild/appview/state"

     

       10
       10
       +
       	"github.com/sotangled/tangled/appview/state"

     

       11
       11
        
       )

     

       12
       12
        
       

     

       13
       13
        
       func main() {

+1 -1

cmd/gen.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
        
       import (

     

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

     

       4
       4
       +
       	shtangled "github.com/sotangled/tangled/api/tangled"

     

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

     

       6
       6
        
       )

     

       7
       7

+3 -3

cmd/knotserver/main.go

···

       8
       8
        
       	"net/http"

     

       9
       9
        
       	"os"

     

       10
       10
        
       

     

       11
       11
       -
       	"github.com/icyphox/bild/knotserver"

     

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

     

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

     

       11
       11
       +
       	"github.com/sotangled/tangled/knotserver"

     

       12
       12
       +
       	"github.com/sotangled/tangled/knotserver/config"

     

       13
       13
       +
       	"github.com/sotangled/tangled/knotserver/db"

     

       14
       14
        
       )

     

       15
       15
        
       

     

       16
       16
        
       func main() {

+1 -1

cmd/repoguard/main.go

···

       12
       12
        
       	"strings"

     

       13
       13
        
       	"time"

     

       14
       14
        
       

     

       15
       15
       -
       	"github.com/icyphox/bild/appview/auth"

     

       15
       15
       +
       	"github.com/sotangled/tangled/appview/auth"

     

       16
       16
        
       )

     

       17
       17
        
       

     

       18
       18
        
       var (

+1 -1

config.yaml

···

       15
       15
        
         title: icy does git

     

       16
       16
        
         description: come get your free software

     

       17
       17
        
       server:

     

       18
       18
       -
         name: github.com/icyphox/bild

     

       18
       18
       +
         name: github.com/sotangled/tangled

     

       19
       19
        
         host: 0.0.0.0

     

       20
       20
        
         port: 5555

     

       21
       21
        
         dbpath: bild.db

+5 -8

go.mod

···

       1
       1
       -
       module github.com/icyphox/bild

     

       1
       1
       +
       module github.com/sotangled/tangled

     

       2
       2
        
       

     

       3
       3
        
       go 1.23

     

       4
       4
        
       

     

       5
       5
        
       toolchain go1.23.4

     

       6
       6
        
       

     

       7
       7
        
       require (

     

       8
       8
       -
       	github.com/alecthomas/chroma/v2 v2.14.0

     

       8
       8
       +
       	github.com/Blank-Xu/sql-adapter v1.1.1

     

       9
       9
        
       	github.com/bluekeyes/go-gitdiff v0.8.0

     

       10
       10
        
       	github.com/bluesky-social/indigo v0.0.0-20250123072624-9e3b84fdbb20

     

       11
       11
       -
       	github.com/dustin/go-humanize v1.0.1

     

       11
       11
       +
       	github.com/casbin/casbin/v2 v2.103.0

     

       12
       12
        
       	github.com/gliderlabs/ssh v0.3.5

     

       13
       13
        
       	github.com/go-chi/chi/v5 v5.2.0

     

       14
       14
        
       	github.com/go-git/go-git/v5 v5.12.0

     
···

       21
       21
        
       	github.com/russross/blackfriday/v2 v2.1.0

     

       22
       22
        
       	github.com/sethvargo/go-envconfig v1.1.0

     

       23
       23
        
       	github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e

     

       24
       24
       -
       	golang.org/x/crypto v0.32.0

     

       25
       24
        
       	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028

     

       26
       26
       -
       	gopkg.in/yaml.v3 v3.0.1

     

       27
       25
        
       )

     

       28
       26
        
       

     

       29
       27
        
       require (

     

       30
       30
       -
       	github.com/Blank-Xu/sql-adapter v1.1.1 // indirect

     

       31
       28
        
       	github.com/Microsoft/go-winio v0.6.2 // indirect

     

       32
       29
        
       	github.com/ProtonMail/go-crypto v1.0.0 // indirect

     

       33
       30
        
       	github.com/acomagu/bufpipe v1.0.4 // indirect

     
···

       36
       33
        
       	github.com/beorn7/perks v1.0.1 // indirect

     

       37
       34
        
       	github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect

     

       38
       35
        
       	github.com/carlmjohnson/versioninfo v0.22.5 // indirect

     

       39
       39
       -
       	github.com/casbin/casbin/v2 v2.103.0 // indirect

     

       40
       36
        
       	github.com/casbin/govaluate v1.3.0 // indirect

     

       41
       37
        
       	github.com/cespare/xxhash/v2 v2.2.0 // indirect

     

       42
       38
        
       	github.com/cloudflare/circl v1.4.0 // indirect

     

       43
       39
        
       	github.com/cyphar/filepath-securejoin v0.3.3 // indirect

     

       44
       40
        
       	github.com/davecgh/go-spew v1.1.1 // indirect

     

       45
       45
       -
       	github.com/dlclark/regexp2 v1.11.4 // indirect

     

       46
       41
        
       	github.com/emirpasic/gods v1.18.1 // indirect

     

       47
       42
        
       	github.com/felixge/httpsnoop v1.0.4 // indirect

     

       48
       43
        
       	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect

     
···

       103
       98
        
       	go.uber.org/atomic v1.11.0 // indirect

     

       104
       99
        
       	go.uber.org/multierr v1.11.0 // indirect

     

       105
       100
        
       	go.uber.org/zap v1.26.0 // indirect

     

       101
       101
       +
       	golang.org/x/crypto v0.32.0 // indirect

     

       106
       102
        
       	golang.org/x/net v0.33.0 // indirect

     

       107
       103
        
       	golang.org/x/sys v0.29.0 // indirect

     

       108
       104
        
       	golang.org/x/time v0.3.0 // indirect

     

       109
       105
        
       	google.golang.org/protobuf v1.33.0 // indirect

     

       110
       106
        
       	gopkg.in/warnings.v0 v0.1.2 // indirect

     

       107
       107
       +
       	gopkg.in/yaml.v3 v3.0.1 // indirect

     

       111
       108
        
       	lukechampine.com/blake3 v1.2.1 // indirect

     

       112
       109
        
       )

     

       113
       110

+1 -13

go.sum

···

       9
       9
        
       github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=

     

       10
       10
        
       github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=

     

       11
       11
        
       github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=

     

       12
       12
       -
       github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE=

     

       13
       13
       -
       github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=

     

       14
       14
       -
       github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E=

     

       15
       15
       -
       github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I=

     

       16
       16
       -
       github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=

     

       17
       17
       -
       github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=

     

       18
       12
        
       github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=

     

       19
       13
        
       github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=

     

       20
       14
        
       github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=

     
···

       28
       22
        
       github.com/bluekeyes/go-gitdiff v0.8.0/go.mod h1:WWAk1Mc6EgWarCrPFO+xeYlujPu98VuLW3Tu+B/85AE=

     

       29
       23
        
       github.com/bluesky-social/indigo v0.0.0-20250123072624-9e3b84fdbb20 h1:yHusfYYi8odoCcsI6AurU+dRWb7itHAQNwt3/Rl9Vfs=

     

       30
       24
        
       github.com/bluesky-social/indigo v0.0.0-20250123072624-9e3b84fdbb20/go.mod h1:Qp4YqWf+AQ3TwQCxV5Ls8O2tXE55zVTGVs3zTmn7BOg=

     

       31
       31
       -
       github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=

     

       32
       25
        
       github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=

     

       33
       26
        
       github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=

     

       34
       27
        
       github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=

     
···

       55
       48
        
       github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     

       56
       49
        
       github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

     

       57
       50
        
       github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     

       58
       58
       -
       github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=

     

       59
       59
       -
       github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=

     

       60
       60
       -
       github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=

     

       61
       61
       -
       github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=

     

       62
       51
        
       github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=

     

       63
       52
        
       github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=

     

       64
       53
        
       github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=

     
···

       86
       75
        
       github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=

     

       87
       76
        
       github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=

     

       88
       77
        
       github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=

     

       78
       78
       +
       github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=

     

       89
       79
        
       github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=

     

       90
       80
        
       github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=

     

       91
       81
        
       github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=

     
···

       115
       105
        
       github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=

     

       116
       106
        
       github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=

     

       117
       107
        
       github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=

     

       118
       118
       -
       github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=

     

       119
       119
       -
       github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=

     

       120
       108
        
       github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=

     

       121
       109
        
       github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=

     

       122
       110
        
       github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=

+1 -1

knotserver/db/pubkeys.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"time"

     

       5
       5
        
       

     

       6
       6
       -
       	tangled "github.com/icyphox/bild/api/tangled"

     

       6
       6
       +
       	"github.com/sotangled/tangled/api/tangled"

     

       7
       7
        
       )

     

       8
       8
        
       

     

       9
       9
        
       type PublicKey struct {

+1 -1

knotserver/file.go

···

       7
       7
        
       	"net/http"

     

       8
       8
        
       	"strings"

     

       9
       9
        
       

     

       10
       10
       -
       	"github.com/icyphox/bild/knotserver/git"

     

       10
       10
       +
       	"github.com/sotangled/tangled/knotserver/git"

     

       11
       11
        
       )

     

       12
       12
        
       

     

       13
       13
        
       func (h *Handle) listFiles(files []git.NiceTree, data map[string]any, w http.ResponseWriter) {

+1 -1

knotserver/git.go

···

       8
       8
        
       	"path/filepath"

     

       9
       9
        
       

     

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

     

       11
       11
       -
       	"github.com/icyphox/bild/knotserver/git/service"

     

       11
       11
       +
       	"github.com/sotangled/tangled/knotserver/git/service"

     

       12
       12
        
       )

     

       13
       13
        
       

     

       14
       14
        
       func (d *Handle) InfoRefs(w http.ResponseWriter, r *http.Request) {

+4 -4

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"

     

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

     

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

     

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

     

       11
       11
       +
       	tangled "github.com/sotangled/tangled/api/tangled"

     

       12
       12
       +
       	"github.com/sotangled/tangled/knotserver/config"

     

       13
       13
       +
       	"github.com/sotangled/tangled/knotserver/db"

     

       14
       14
       +
       	"github.com/sotangled/tangled/knotserver/jsclient"

     

       15
       15
        
       )

     

       16
       16
        
       

     

       17
       17
        
       type Handle struct {

+2 -2

knotserver/routes.go

···

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

     

       20
       20
        
       	"github.com/go-git/go-git/v5/plumbing"

     

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

     

       22
       22
       -
       	"github.com/icyphox/bild/knotserver/db"

     

       23
       23
       -
       	"github.com/icyphox/bild/knotserver/git"

     

       24
       22
        
       	"github.com/russross/blackfriday/v2"

     

       23
       23
       +
       	"github.com/sotangled/tangled/knotserver/db"

     

       24
       24
       +
       	"github.com/sotangled/tangled/knotserver/git"

     

       25
       25
        
       )

     

       26
       26
        
       

     

       27
       27
        
       func (h *Handle) Index(w http.ResponseWriter, r *http.Request) {

+1 -1

lexicon-build-config.json

···

       3
       3
        
           "package": "tangled",

     

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

     

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

     

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

     

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

     

       7
       7
        
           "gen-server": true

     

       8
       8
        
         }

     

       9
       9
        
       ]