diff options
Diffstat (limited to 'system/api')
-rw-r--r-- | system/api/external.go | 8 | ||||
-rw-r--r-- | system/api/handlers.go | 10 | ||||
-rw-r--r-- | system/api/server.go | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/system/api/external.go b/system/api/external.go index 0d1ea03..8112e29 100644 --- a/system/api/external.go +++ b/system/api/external.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/bosssauce/ponzu/content" "github.com/bosssauce/ponzu/system/admin/upload" "github.com/bosssauce/ponzu/system/db" + "github.com/bosssauce/ponzu/system/item" ) // Externalable accepts or rejects external POST requests to endpoints such as: @@ -44,7 +44,7 @@ func externalContentHandler(res http.ResponseWriter, req *http.Request) { return } - p, found := content.Types[t] + p, found := item.Types[t] if !found { log.Println("[External] attempt to submit unknown type:", t, "from:", req.RemoteAddr) res.WriteHeader(http.StatusNotFound) @@ -105,9 +105,9 @@ func externalContentHandler(res http.ResponseWriter, req *http.Request) { return } - hook, ok := post.(content.Hookable) + hook, ok := post.(item.Hookable) if !ok { - log.Println("[External] error: Type", t, "does not implement content.Hookable or embed content.Item.") + log.Println("[External] error: Type", t, "does not implement item.Hookable or embed item.Item.") res.WriteHeader(http.StatusBadRequest) return } diff --git a/system/api/handlers.go b/system/api/handlers.go index 7a2073d..1e2f1e2 100644 --- a/system/api/handlers.go +++ b/system/api/handlers.go @@ -8,14 +8,14 @@ import ( "strconv" "strings" - "github.com/bosssauce/ponzu/content" "github.com/bosssauce/ponzu/system/api/analytics" "github.com/bosssauce/ponzu/system/db" + "github.com/bosssauce/ponzu/system/item" ) func typesHandler(res http.ResponseWriter, req *http.Request) { var types = []string{} - for t := range content.Types { + for t := range item.Types { types = append(types, string(t)) } @@ -36,7 +36,7 @@ func contentsHandler(res http.ResponseWriter, req *http.Request) { return } - if _, ok := content.Types[t]; !ok { + if _, ok := item.Types[t]; !ok { res.WriteHeader(http.StatusNotFound) return } @@ -98,7 +98,7 @@ func contentHandler(res http.ResponseWriter, req *http.Request) { return } - if _, ok := content.Types[t]; !ok { + if _, ok := item.Types[t]; !ok { res.WriteHeader(http.StatusNotFound) return } @@ -224,7 +224,7 @@ func SendJSON(res http.ResponseWriter, j map[string]interface{}) { sendData(res, data, 200) } -// CORS wraps a HandleFunc to response to OPTIONS requests properly +// CORS wraps a HandleFunc to respond to OPTIONS requests properly func CORS(next http.HandlerFunc) http.HandlerFunc { return db.CacheControl(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { if req.Method == http.MethodOptions { diff --git a/system/api/server.go b/system/api/server.go index 823ec16..f31a748 100644 --- a/system/api/server.go +++ b/system/api/server.go @@ -1,8 +1,6 @@ package api -import ( - "net/http" -) +import "net/http" // Run adds Handlers to default http listener for API func Run() { |