From 6c5d89ac86d3c51746a0501a2135e92e4ba16631 Mon Sep 17 00:00:00 2001
From: Rob Loranger <dev@loranger.xyz>
Date: Mon, 19 Aug 2019 09:05:52 -0700
Subject: [PATCH] move import post handler under /api

handler for post request to import is now under /api/me/import
form target updated

also allow all plaintext files in form
---
 routes.go                  | 2 +-
 templates/user/import.tmpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/routes.go b/routes.go
index 022a7ea..7dcdc65 100644
--- a/routes.go
+++ b/routes.go
@@ -95,7 +95,6 @@ func InitRoutes(apper Apper, r *mux.Router) *mux.Router {
 	me.HandleFunc("/export", handler.User(viewExportOptions)).Methods("GET")
 	me.HandleFunc("/export.json", handler.Download(viewExportFull, UserLevelUser)).Methods("GET")
 	me.HandleFunc("/import", handler.User(viewImport)).Methods("GET")
-	me.HandleFunc("/import", handler.User(handleImport)).Methods("POST")
 	me.HandleFunc("/settings", handler.User(viewSettings)).Methods("GET")
 	me.HandleFunc("/invites", handler.User(handleViewUserInvites)).Methods("GET")
 	me.HandleFunc("/logout", handler.Web(viewLogout, UserLevelNone)).Methods("GET")
@@ -108,6 +107,7 @@ func InitRoutes(apper Apper, r *mux.Router) *mux.Router {
 	apiMe.HandleFunc("/password", handler.All(updatePassphrase)).Methods("POST")
 	apiMe.HandleFunc("/self", handler.All(updateSettings)).Methods("POST")
 	apiMe.HandleFunc("/invites", handler.User(handleCreateUserInvite)).Methods("POST")
+	apiMe.HandleFunc("/import", handler.User(handleImport)).Methods("POST")
 
 	// Sign up validation
 	write.HandleFunc("/api/alias", handler.All(handleUsernameCheck)).Methods("POST")
diff --git a/templates/user/import.tmpl b/templates/user/import.tmpl
index 3833095..002cf14 100644
--- a/templates/user/import.tmpl
+++ b/templates/user/import.tmpl
@@ -10,9 +10,9 @@
 	<h2 id="posts-header">Import</h2>
 	<p>Upload text or markdown files to import as posts.</p>
 	<div class="formContainer">
-		<form id="importPosts" class="import" enctype="multipart/form-data" action="/me/import" method="POST">
+		<form id="importPosts" class="import" enctype="multipart/form-data" action="/api/me/import" method="POST">
 			<label for="file" hidden>Browse files to upload</label>
-			<input class="fileInput" name="files" type="file" multiple accept=".txt,.md"/>
+			<input class="fileInput" name="files" type="file" multiple accept="text/plain"/>
 			<br />
 			<label for="collection">Select a blog to import the posts under.</label>
 			<select name="collection">