diff --git a/app.go b/app.go index 22bf21b..4c1844f 100644 --- a/app.go +++ b/app.go @@ -11,11 +11,11 @@ import ( ct "github.com/elnormous/contenttype" apc "github.com/go-ap/client" "github.com/go-fed/httpsig" - "github.com/hacdias/indieauth/v3" rotatelogs "github.com/lestrrat-go/file-rotatelogs" "github.com/yuin/goldmark" "go.goblog.app/app/pkgs/minify" "go.goblog.app/app/pkgs/plugins" + "go.hacdias.com/indielib/indieauth" "golang.org/x/crypto/acme/autocert" "golang.org/x/sync/singleflight" ) diff --git a/go.mod b/go.mod index fcc20bb..5b912d9 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,6 @@ require ( github.com/gorilla/handlers v1.5.2 github.com/gorilla/sessions v1.2.2 github.com/gorilla/websocket v1.5.1 - github.com/hacdias/indieauth/v3 v3.3.0 github.com/jlaffaye/ftp v0.2.0 github.com/jlelse/feeds v1.3.0 github.com/justinas/alice v1.2.0 @@ -60,6 +59,7 @@ require ( github.com/xhit/go-simple-mail/v2 v2.16.0 github.com/yuin/goldmark v1.6.0 github.com/yuin/goldmark-emoji v1.0.2 + go.hacdias.com/indielib v0.1.0 golang.org/x/crypto v0.14.0 golang.org/x/net v0.17.0 golang.org/x/sync v0.5.0 diff --git a/go.sum b/go.sum index ba9aaaa..a2e022c 100644 --- a/go.sum +++ b/go.sum @@ -227,8 +227,6 @@ github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8L github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= -github.com/hacdias/indieauth/v3 v3.3.0 h1:znBRtGZ0CTQg3TgHS8wf7ONxkzWM8gJ17UjuX+qGD+0= -github.com/hacdias/indieauth/v3 v3.3.0/go.mod h1:iB19em+Xc9+CYRntwRm6ZWltnljxPooGShMJ4FrsV74= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -426,6 +424,8 @@ github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68= github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s= github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY= +go.hacdias.com/indielib v0.1.0 h1:culufO8/RgTEEQMJmK4HnwAS2qZF7nfvHOBWPjJ9R+o= +go.hacdias.com/indielib v0.1.0/go.mod h1:zR/7VfuqHQSOmWB3S5fO5p7YQPaThnR5vYt33yMP05c= go.mau.fi/util v0.2.0 h1:AMGBEdg9Ya/smb/09dljo9wBwKr432EpfjDWF7aFQg0= go.mau.fi/util v0.2.0/go.mod h1:AxuJUMCxpzgJ5eV9JbPWKRH8aAJJidxetNdUj7qcb84= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= diff --git a/indieAuth.go b/indieAuth.go index 18ac3cc..5acd4ab 100644 --- a/indieAuth.go +++ b/indieAuth.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/hacdias/indieauth/v3" + "go.hacdias.com/indielib/indieauth" ) const indieAuthScope contextKey = "scope" diff --git a/indieAuthServer.go b/indieAuthServer.go index 913fb20..05fcab3 100644 --- a/indieAuthServer.go +++ b/indieAuthServer.go @@ -11,8 +11,8 @@ import ( "time" "github.com/google/uuid" - "github.com/hacdias/indieauth/v3" "go.goblog.app/app/pkgs/contenttype" + "go.hacdias.com/indielib/indieauth" ) // TODOs: diff --git a/indieAuthServer_test.go b/indieAuthServer_test.go index 0e0ee9c..07a062f 100644 --- a/indieAuthServer_test.go +++ b/indieAuthServer_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/PuerkitoBio/goquery" - "github.com/hacdias/indieauth/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.hacdias.com/indielib/indieauth" ) func Test_indieAuthServer(t *testing.T) { diff --git a/indieAuth_test.go b/indieAuth_test.go index 1a4752d..f96d4e6 100644 --- a/indieAuth_test.go +++ b/indieAuth_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hacdias/indieauth/v3" "github.com/stretchr/testify/assert" + "go.hacdias.com/indielib/indieauth" ) func Test_checkIndieAuth(t *testing.T) { diff --git a/ui.go b/ui.go index 1c46390..d4f9914 100644 --- a/ui.go +++ b/ui.go @@ -5,13 +5,13 @@ import ( "time" "github.com/PuerkitoBio/goquery" - "github.com/hacdias/indieauth/v3" "github.com/kaorimatz/go-opml" "github.com/mergestat/timediff" "github.com/samber/lo" "go.goblog.app/app/pkgs/contenttype" "go.goblog.app/app/pkgs/htmlbuilder" "go.goblog.app/app/pkgs/plugintypes" + "go.hacdias.com/indielib/indieauth" ) func (a *goBlog) renderEditorPreview(hb *htmlbuilder.HtmlBuilder, bc *configBlog, p *post) {