makary/writefreely
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #138 from writeas/fix-unpublished-state

Browse source 
Don't consider post unpublished when title exists
This commit is contained in:
Matt Baer 2019-07-21 11:35:16 -04:00 • committed by GitHub
commit ba3cb4b4ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
database.go
View file

@ -926,7 +926,7 @@ func (db *datastore) GetEditablePost(id, editToken string) (*PublicPost, error)
return nil, err return nil, err
} }
if p.Content == "" { if p.Content == "" && p.Title.String == "" {
return nil, ErrPostUnpublished return nil, ErrPostUnpublished
} }
@ -976,7 +976,7 @@ func (db *datastore) GetPost(id string, collectionID int64) (*PublicPost, error)
return nil, err return nil, err
} }
if p.Content == "" { if p.Content == "" && p.Title.String == "" {
return nil, ErrPostUnpublished return nil, ErrPostUnpublished
} }
@ -1005,7 +1005,7 @@ func (db *datastore) GetOwnedPost(id string, ownerID int64) (*PublicPost, error)
return nil, err return nil, err
} }
if p.Content == "" { if p.Content == "" && p.Title.String == "" {
return nil, ErrPostUnpublished return nil, ErrPostUnpublished
} }

2
posts.go
View file

@ -1309,7 +1309,7 @@ func viewCollectionPost(app *App, w http.ResponseWriter, r *http.Request) error
p.IsTopLevel = app.cfg.App.SingleUser p.IsTopLevel = app.cfg.App.SingleUser
// Check if post has been unpublished // Check if post has been unpublished
if p.Content == "" { if p.Content == "" && p.Title.String == "" {
return impart.HTTPError{http.StatusGone, "Post was unpublished."} return impart.HTTPError{http.StatusGone, "Post was unpublished."}
} }