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

Added draft blogs

Browse Source 
Fixed paths
This commit is contained in:
Caleb Gardner
2024-08-10 10:18:43 -05:00
parent da2db3ea9a
commit 55ae9a0f05
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/blog/blog.go
+4 -3
View File
@@ -22,6 +22,7 @@ type Blog struct {
Title string `json:"title" bson:"title"`
Blog string `json:"blog" bson:"blog"`
StaticPage bool `json:"staticPage" bson:"staticPage"`
Draft bool `json:"draft" bson:"draft"`
CreateTime int64 `json:"createTime" bson:"createTime"`
UpdateTime int64 `json:"updateTime" bson:"updateTime"`
}
@@ -47,7 +48,7 @@ func (b *BlogApp) GetAuthor(blog *Blog) (*Author, error) {
}
func (b *BlogApp) Blog(ID string) (*Blog, error) {
res := b.blogCol.FindOne(context.Background(), bson.M{"_id": ID})
res := b.blogCol.FindOne(context.Background(), bson.M{"_id": ID, "draft": false})
if res.Err() != nil {
if res.Err() == mongo.ErrNoDocuments {
return nil, backend.ErrNotFound
@@ -178,8 +179,8 @@ func (b *BlogApp) updateBlog(w http.ResponseWriter, r *http.Request) {
}
func (b *BlogApp) LatestBlogs(page int64) ([]*Blog, error) {
res, err := b.blogCol.Find(context.Background(), bson.M{"staticPage": false}, options.Find().
SetSort(bson.M{"createTime": 1}).
res, err := b.blogCol.Find(context.Background(), bson.M{"staticPage": false, "draft": false}, options.Find().
SetSort(bson.M{"createTime": -1}).
SetLimit(5).
SetSkip(page*5))
if err != nil {
main.go
+5 -8
View File
@@ -105,14 +105,11 @@ func mainHandle(w http.ResponseWriter, r *http.Request) {
return
}
spl := strings.Split(path, "/")
stat, err = os.Stat(filepath.Join(*webRoot, spl[0]))
if stat.IsDir() {
ind := filepath.Join(*webRoot, spl[0], "index.html")
stat, err = os.Stat(ind)
if err == nil {
http.ServeFile(w, r, ind)
return
}
ind := filepath.Join(*webRoot, spl[0], "index.html")
_, err = os.Stat(ind)
if err == nil {
http.ServeFile(w, r, ind)
return
}
blogHandle(w, r, path)
}