Add /posts handler to api

pull/18/head
Brian Picciano 2 years ago
parent 2929b4279c
commit 7e87c09c50
  1. 16
      srv/src/api/api.go
  2. 46
      srv/src/api/posts.go
  3. 11
      srv/src/cmd/mediocre-blog/main.go

@ -14,6 +14,7 @@ import (
"github.com/mediocregopher/blog.mediocregopher.com/srv/cfg"
"github.com/mediocregopher/blog.mediocregopher.com/srv/chat"
"github.com/mediocregopher/blog.mediocregopher.com/srv/mailinglist"
"github.com/mediocregopher/blog.mediocregopher.com/srv/post"
"github.com/mediocregopher/blog.mediocregopher.com/srv/pow"
"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
"github.com/mediocregopher/mediocre-go-lib/v2/mlog"
@ -22,9 +23,14 @@ import (
// Params are used to instantiate a new API instance. All fields are required
// unless otherwise noted.
type Params struct {
Logger *mlog.Logger
PowManager pow.Manager
MailingList mailinglist.MailingList
Logger *mlog.Logger
PowManager pow.Manager
PostStore post.Store
PostHTTPRenderer post.Renderer
MailingList mailinglist.MailingList
GlobalRoom chat.Room
UserIDCalculator *chat.UserIDCalculator
@ -172,7 +178,7 @@ func (a *api) handler() http.Handler {
)))
var apiHandler http.Handler = apiMux
apiHandler = postOnlyMiddleware(apiHandler)
apiHandler = postOnlyMiddleware(apiHandler) // TODO probably should be last?
apiHandler = checkCSRFMiddleware(apiHandler)
apiHandler = logMiddleware(a.params.Logger, apiHandler)
apiHandler = annotateMiddleware(apiHandler)
@ -184,5 +190,7 @@ func (a *api) handler() http.Handler {
mux.Handle("/api/", http.StripPrefix("/api", apiHandler))
mux.Handle("/posts/", a.postHandler())
return mux
}

@ -0,0 +1,46 @@
package api
import (
"errors"
"fmt"
"net/http"
"path/filepath"
"strings"
"github.com/mediocregopher/blog.mediocregopher.com/srv/api/apiutils"
"github.com/mediocregopher/blog.mediocregopher.com/srv/post"
)
func (a *api) postHandler() http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
id := strings.TrimSuffix(filepath.Base(r.URL.Path), ".html")
storedPost, err := a.params.PostStore.GetByID(id)
if errors.Is(err, post.ErrPostNotFound) {
http.Error(rw, "Post not found", 404)
return
} else if err != nil {
apiutils.InternalServerError(
rw, r, fmt.Errorf("fetching post with id %q: %w", id, err),
)
return
}
renderablePost, err := post.NewRenderablePost(a.params.PostStore, storedPost)
if err != nil {
apiutils.InternalServerError(
rw, r, fmt.Errorf("constructing renderable post with id %q: %w", id, err),
)
return
}
if err := a.params.PostHTTPRenderer.Render(rw, renderablePost); err != nil {
apiutils.InternalServerError(
rw, r, fmt.Errorf("rendering post with id %q: %w", id, err),
)
return
}
})
}

@ -11,6 +11,7 @@ import (
cfgpkg "github.com/mediocregopher/blog.mediocregopher.com/srv/cfg"
"github.com/mediocregopher/blog.mediocregopher.com/srv/chat"
"github.com/mediocregopher/blog.mediocregopher.com/srv/mailinglist"
"github.com/mediocregopher/blog.mediocregopher.com/srv/post"
"github.com/mediocregopher/blog.mediocregopher.com/srv/pow"
"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
"github.com/mediocregopher/mediocre-go-lib/v2/mlog"
@ -112,8 +113,18 @@ func main() {
chatUserIDCalc := chat.NewUserIDCalculator([]byte(*chatUserIDCalcSecret))
postSQLDB, err := post.NewSQLDB(dataDir)
if err != nil {
logger.Fatal(ctx, "initializing sql db for post data", err)
}
defer postSQLDB.Close()
postStore := post.NewStore(postSQLDB)
apiParams.Logger = logger.WithNamespace("api")
apiParams.PowManager = powMgr
apiParams.PostStore = postStore
apiParams.PostHTTPRenderer = post.NewMarkdownToHTMLRenderer()
apiParams.MailingList = ml
apiParams.GlobalRoom = chatGlobalRoom
apiParams.UserIDCalculator = chatUserIDCalc

Loading…
Cancel
Save