Belac/darkstorm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to new bbConvert version

Browse Source
This commit is contained in:
Caleb Gardner
2024-08-19 13:46:19 -05:00
parent 9cc4fa72f0
commit 1dc937fcaf
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+4 -3
View File
@@ -1,20 +1,21 @@
module github.com/CalebQ42/darkstorm-server module github.com/CalebQ42/darkstorm-server
go 1.22.5 go 1.23.0
require ( require (
github.com/CalebQ42/bbConvert v1.0.0 github.com/CalebQ42/bbConvert v1.0.2
github.com/golang-jwt/jwt/v5 v5.2.1 github.com/golang-jwt/jwt/v5 v5.2.1
github.com/google/uuid v1.6.0 github.com/google/uuid v1.6.0
github.com/lithammer/shortuuid/v3 v3.0.7
go.mongodb.org/mongo-driver v1.15.1 go.mongodb.org/mongo-driver v1.15.1
golang.org/x/crypto v0.24.0 golang.org/x/crypto v0.24.0
) )
require ( require (
github.com/dlclark/regexp2 v1.11.5-0.20240806004527-5bbbed8ea10b // indirect
github.com/golang/snappy v0.0.1 // indirect github.com/golang/snappy v0.0.1 // indirect
github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-cmp v0.6.0 // indirect
github.com/klauspost/compress v1.13.6 // indirect github.com/klauspost/compress v1.13.6 // indirect
github.com/lithammer/shortuuid/v3 v3.0.7
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/scram v1.1.2 // indirect
go.sum
+4 -2
View File
@@ -1,7 +1,9 @@
github.com/CalebQ42/bbConvert v1.0.0 h1:2WSAxVKhCCMReuU30r3ehLtL6m9aH8sY3wugp9yUdzg= github.com/CalebQ42/bbConvert v1.0.2 h1:N0+q7Kw3Ge2m117jbYp1DyrCa7zUuBOpyBfhcuphjz8=
github.com/CalebQ42/bbConvert v1.0.0/go.mod h1:QJevnlhzUdL3EJB5Lgqoi7rdgtzt/UEamn/QGNoVgkM= github.com/CalebQ42/bbConvert v1.0.2/go.mod h1:gV0gaDhzuIwWqX9O1F8qu7tFXz50DnGQOnq56qrtO3A=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= 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/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dlclark/regexp2 v1.11.5-0.20240806004527-5bbbed8ea10b h1:AJKOdc+1fRSJ0/75Jty1npvxUUD0y7hQDg15LMAHhyU=
github.com/dlclark/regexp2 v1.11.5-0.20240806004527-5bbbed8ea10b/go.mod h1:YvCrhrh/qlds8EhFKPtJprdXn5fWBllSw1qo99dZyiQ=
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
internal/blog/blog.go
+1 -1
View File
@@ -30,7 +30,7 @@ type Blog struct {
func (b *BlogApp) ConvertBlog(blog *Blog) { func (b *BlogApp) ConvertBlog(blog *Blog) {
//TODO: parse BBCode/Markdown from blog //TODO: parse BBCode/Markdown from blog
if !blog.StaticPage { if !blog.StaticPage {
blog.Blog = b.conv.Convert(blog.Blog) blog.Blog = b.conv.HTMLConvert(blog.Blog)
} }
} }
internal/blog/main.go
+2 -3
View File
@@ -13,7 +13,7 @@ type BlogApp struct {
blogCol *mongo.Collection blogCol *mongo.Collection
authCol *mongo.Collection authCol *mongo.Collection
portfolioCol *mongo.Collection portfolioCol *mongo.Collection
conv *bbConvert.HTMLConverter conv bbConvert.ComboConverter
} }
func NewBlogApp(db *mongo.Database) *BlogApp { func NewBlogApp(db *mongo.Database) *BlogApp {
@@ -21,9 +21,8 @@ func NewBlogApp(db *mongo.Database) *BlogApp {
blogCol: db.Collection("blog"), blogCol: db.Collection("blog"),
authCol: db.Collection("author"), authCol: db.Collection("author"),
portfolioCol: db.Collection("portfolio"), portfolioCol: db.Collection("portfolio"),
conv: &bbConvert.HTMLConverter{}, conv: bbConvert.NewComboConverter(),
} }
out.conv.ImplementDefaults()
return out return out
} }