moving interface Mergable from api package to manager package. It avoids a cyclical import and also makes more sense logically as the management of content owns the scope of merging external to interal items

2 files changed, 1 insertions, 9 deletions

diff --git a/system/admin/handlers.go b/system/admin/handlers.go
index a53ebd3..59f6874 100644
--- a/system/admin/handlers.go
+++ b/system/admin/handlers.go
@@ -837,7 +837,7 @@ func approvePostHandler(res http.ResponseWriter, req *http.Request) {
 	}
 
 	// check if we have a Mergeable
-	m, ok := post.(api.Mergeable)
+	m, ok := post.(manager.Mergeable)
 	if !ok {
 		log.Println("Content type", t, "must implement api.Mergable before it can bee approved.")
 		res.WriteHeader(http.StatusBadRequest)
diff --git a/system/api/external.go b/system/api/external.go
index 7eade92..5c50172 100644
--- a/system/api/external.go
+++ b/system/api/external.go
@@ -19,14 +19,6 @@ type Externalable interface {
 	Accepts() bool
 }
 
-// Mergeable allows external post content to be approved and published through
-// the public-facing API
-type Mergeable interface {
-	// Approve copies an external post to the internal collection and triggers
-	// a re-sort of its content type posts
-	Approve(req *http.Request) error
-}
-
 func externalPostHandler(res http.ResponseWriter, req *http.Request) {
 	if req.Method != http.MethodPost {
 		res.WriteHeader(http.StatusMethodNotAllowed)