diff --git a/appview/auth/auth.go b/appview/auth/auth.go index 87f48c5f..8252edcc 100644 --- a/appview/auth/auth.go +++ b/appview/auth/auth.go @@ -11,7 +11,7 @@ import ( "github.com/bluesky-social/indigo/atproto/syntax" "github.com/bluesky-social/indigo/xrpc" "github.com/gorilla/sessions" - "github.com/icyphox/bild/appview" + "github.com/sotangled/tangled/appview" ) type Auth struct { diff --git a/appview/state/middleware.go b/appview/state/middleware.go index 0295b60d..c7b0b62c 100644 --- a/appview/state/middleware.go +++ b/appview/state/middleware.go @@ -7,8 +7,8 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/xrpc" - "github.com/icyphox/bild/appview" - "github.com/icyphox/bild/appview/auth" + "github.com/sotangled/tangled/appview" + "github.com/sotangled/tangled/appview/auth" ) type Middleware func(http.Handler) http.Handler diff --git a/appview/state/state.go b/appview/state/state.go index d8b9d235..7fed44fc 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -14,10 +14,10 @@ import ( "github.com/gliderlabs/ssh" "github.com/go-chi/chi/v5" "github.com/google/uuid" - tangled "github.com/icyphox/bild/api/tangled" - "github.com/icyphox/bild/appview" - "github.com/icyphox/bild/appview/auth" - "github.com/icyphox/bild/appview/db" + tangled "github.com/sotangled/tangled/api/tangled" + "github.com/sotangled/tangled/appview" + "github.com/sotangled/tangled/appview/auth" + "github.com/sotangled/tangled/appview/db" ) type State struct { diff --git a/cmd/appview/main.go b/cmd/appview/main.go index 36444888..4cafba22 100644 --- a/cmd/appview/main.go +++ b/cmd/appview/main.go @@ -7,7 +7,7 @@ import ( "net/http" "os" - "github.com/icyphox/bild/appview/state" + "github.com/sotangled/tangled/appview/state" ) func main() { diff --git a/cmd/gen.go b/cmd/gen.go index 53acda32..8761bafc 100644 --- a/cmd/gen.go +++ b/cmd/gen.go @@ -1,7 +1,7 @@ package main import ( - shtangled "github.com/icyphox/bild/api/tangled" + shtangled "github.com/sotangled/tangled/api/tangled" cbg "github.com/whyrusleeping/cbor-gen" ) diff --git a/cmd/knotserver/main.go b/cmd/knotserver/main.go index ec10d351..341b4870 100644 --- a/cmd/knotserver/main.go +++ b/cmd/knotserver/main.go @@ -8,9 +8,9 @@ import ( "net/http" "os" - "github.com/icyphox/bild/knotserver" - "github.com/icyphox/bild/knotserver/config" - "github.com/icyphox/bild/knotserver/db" + "github.com/sotangled/tangled/knotserver" + "github.com/sotangled/tangled/knotserver/config" + "github.com/sotangled/tangled/knotserver/db" ) func main() { diff --git a/cmd/repoguard/main.go b/cmd/repoguard/main.go index 3b262d78..6767316d 100644 --- a/cmd/repoguard/main.go +++ b/cmd/repoguard/main.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/icyphox/bild/appview/auth" + "github.com/sotangled/tangled/appview/auth" ) var ( diff --git a/config.yaml b/config.yaml index 0322f66a..5ddaa1fe 100644 --- a/config.yaml +++ b/config.yaml @@ -15,7 +15,7 @@ meta: title: icy does git description: come get your free software server: - name: github.com/icyphox/bild + name: github.com/sotangled/tangled host: 0.0.0.0 port: 5555 dbpath: bild.db diff --git a/go.mod b/go.mod index cd8e09d3..e5714e57 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ -module github.com/icyphox/bild +module github.com/sotangled/tangled go 1.23 toolchain go1.23.4 require ( - github.com/alecthomas/chroma/v2 v2.14.0 + github.com/Blank-Xu/sql-adapter v1.1.1 github.com/bluekeyes/go-gitdiff v0.8.0 github.com/bluesky-social/indigo v0.0.0-20250123072624-9e3b84fdbb20 - github.com/dustin/go-humanize v1.0.1 + github.com/casbin/casbin/v2 v2.103.0 github.com/gliderlabs/ssh v0.3.5 github.com/go-chi/chi/v5 v5.2.0 github.com/go-git/go-git/v5 v5.12.0 @@ -21,13 +21,10 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 github.com/sethvargo/go-envconfig v1.1.0 github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e - golang.org/x/crypto v0.32.0 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 - gopkg.in/yaml.v3 v3.0.1 ) require ( - github.com/Blank-Xu/sql-adapter v1.1.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.0.0 // indirect github.com/acomagu/bufpipe v1.0.4 // indirect @@ -36,13 +33,11 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect github.com/carlmjohnson/versioninfo v0.22.5 // indirect - github.com/casbin/casbin/v2 v2.103.0 // indirect github.com/casbin/govaluate v1.3.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cloudflare/circl v1.4.0 // indirect github.com/cyphar/filepath-securejoin v0.3.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/dlclark/regexp2 v1.11.4 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect @@ -103,11 +98,13 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect + golang.org/x/crypto v0.32.0 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/sys v0.29.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.2.1 // indirect ) diff --git a/go.sum b/go.sum index 4c4a91b3..509af155 100644 --- a/go.sum +++ b/go.sum @@ -9,12 +9,6 @@ github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0k github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= -github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE= -github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/chroma/v2 v2.14.0 h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E= -github.com/alecthomas/chroma/v2 v2.14.0/go.mod h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I= -github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= -github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= @@ -28,7 +22,6 @@ github.com/bluekeyes/go-gitdiff v0.8.0 h1:Nn1wfw3/XeKoc3lWk+2bEXGUHIx36kj80FM1gV github.com/bluekeyes/go-gitdiff v0.8.0/go.mod h1:WWAk1Mc6EgWarCrPFO+xeYlujPu98VuLW3Tu+B/85AE= github.com/bluesky-social/indigo v0.0.0-20250123072624-9e3b84fdbb20 h1:yHusfYYi8odoCcsI6AurU+dRWb7itHAQNwt3/Rl9Vfs= github.com/bluesky-social/indigo v0.0.0-20250123072624-9e3b84fdbb20/go.mod h1:Qp4YqWf+AQ3TwQCxV5Ls8O2tXE55zVTGVs3zTmn7BOg= -github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I= github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q= github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= @@ -55,10 +48,6 @@ github.com/cyphar/filepath-securejoin v0.3.3/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1na github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo= -github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= @@ -86,6 +75,7 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -115,8 +105,6 @@ github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iP github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= -github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= -github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= diff --git a/knotserver/db/pubkeys.go b/knotserver/db/pubkeys.go index 47725d5f..b9a1f1b9 100644 --- a/knotserver/db/pubkeys.go +++ b/knotserver/db/pubkeys.go @@ -3,7 +3,7 @@ package db import ( "time" - tangled "github.com/icyphox/bild/api/tangled" + "github.com/sotangled/tangled/api/tangled" ) type PublicKey struct { diff --git a/knotserver/file.go b/knotserver/file.go index b08484da..f8e4af28 100644 --- a/knotserver/file.go +++ b/knotserver/file.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/icyphox/bild/knotserver/git" + "github.com/sotangled/tangled/knotserver/git" ) func (h *Handle) listFiles(files []git.NiceTree, data map[string]any, w http.ResponseWriter) { diff --git a/knotserver/git.go b/knotserver/git.go index 2e9453ab..cdf32d71 100644 --- a/knotserver/git.go +++ b/knotserver/git.go @@ -8,7 +8,7 @@ import ( "path/filepath" "github.com/go-chi/chi/v5" - "github.com/icyphox/bild/knotserver/git/service" + "github.com/sotangled/tangled/knotserver/git/service" ) func (d *Handle) InfoRefs(w http.ResponseWriter, r *http.Request) { diff --git a/knotserver/handler.go b/knotserver/handler.go index a81bd65a..cd7cc564 100644 --- a/knotserver/handler.go +++ b/knotserver/handler.go @@ -8,10 +8,10 @@ import ( "net/http" "github.com/go-chi/chi/v5" - tangled "github.com/icyphox/bild/api/tangled" - "github.com/icyphox/bild/knotserver/config" - "github.com/icyphox/bild/knotserver/db" - "github.com/icyphox/bild/knotserver/jsclient" + tangled "github.com/sotangled/tangled/api/tangled" + "github.com/sotangled/tangled/knotserver/config" + "github.com/sotangled/tangled/knotserver/db" + "github.com/sotangled/tangled/knotserver/jsclient" ) type Handle struct { diff --git a/knotserver/routes.go b/knotserver/routes.go index a44891d2..7c246e33 100644 --- a/knotserver/routes.go +++ b/knotserver/routes.go @@ -19,9 +19,9 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" - "github.com/icyphox/bild/knotserver/db" - "github.com/icyphox/bild/knotserver/git" "github.com/russross/blackfriday/v2" + "github.com/sotangled/tangled/knotserver/db" + "github.com/sotangled/tangled/knotserver/git" ) func (h *Handle) Index(w http.ResponseWriter, r *http.Request) { diff --git a/lexicon-build-config.json b/lexicon-build-config.json index 1274bfd3..8f32ed5d 100644 --- a/lexicon-build-config.json +++ b/lexicon-build-config.json @@ -3,7 +3,7 @@ "package": "tangled", "prefix": "sh.tangled", "outdir": "api/tangled", - "import": "github.com/icyphox/bild/api/tangled", + "import": "github.com/sotangled/tangled/api/tangled", "gen-server": true } ]