From 542aa812f8606dad16ab456c3e5da438cc501644 Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Wed, 11 May 2016 17:47:17 +0200 Subject: [PATCH] support media endpoint, autosave notes in local storage * looks for a media endpoint in the micropub config * if media endpoint is available, both the note interface and the editor will upload files to it instead of posting the photo directly * the note interface autosaves in-progress notes in localstorage --- controllers/auth.php | 4 +- controllers/controllers.php | 28 +++++- controllers/editor.php | 33 ++++--- lib/helpers.php | 42 ++++++-- .../localforage => libs}/localforage.js | 0 schema/migrations/0001.sql | 2 + schema/mysql.sql | 1 + views/auth_start.php | 4 +- views/editor.php | 2 +- views/layout.php | 1 + views/new-post.php | 99 ++++++++++++++++++- views/partials/syndication-js.php | 1 + 12 files changed, 187 insertions(+), 30 deletions(-) rename public/{editor-files/localforage => libs}/localforage.js (100%) create mode 100644 schema/migrations/0001.sql diff --git a/controllers/auth.php b/controllers/auth.php index 748f7ad..c6c4ad8 100644 --- a/controllers/auth.php +++ b/controllers/auth.php @@ -212,9 +212,9 @@ $app->get('/auth/callback', function() use($app) { $user->save(); $_SESSION['user_id'] = $user->id(); - // Make a request to the micropub endpoint to discover the syndication targets if any. + // Make a request to the micropub endpoint to discover the syndication targets and media endpoint if any. // Errors are silently ignored here. The user will be able to retry from the new post interface and get feedback. - get_syndication_targets($user); + get_micropub_config($user); } unset($_SESSION['auth_state']); diff --git a/controllers/controllers.php b/controllers/controllers.php index 4373fcf..2a90892 100644 --- a/controllers/controllers.php +++ b/controllers/controllers.php @@ -76,6 +76,7 @@ $app->get('/new', function() use($app) { 'title' => 'New Post', 'in_reply_to' => $in_reply_to, 'micropub_endpoint' => $user->micropub_endpoint, + 'media_endpoint' => $user->micropub_media_endpoint, 'micropub_scope' => $user->micropub_scope, 'micropub_access_token' => $user->micropub_access_token, 'response_date' => $user->last_micropub_response_date, @@ -452,7 +453,7 @@ $app->post('/repost', function() use($app) { $app->get('/micropub/syndications', function() use($app) { if($user=require_login($app)) { - $data = get_syndication_targets($user); + $data = get_micropub_config($user, ['q'=>'syndicate-to']); $app->response()->body(json_encode(array( 'targets' => $data['targets'], 'response' => $data['response'] @@ -522,6 +523,31 @@ $app->post('/micropub/multipart', function() use($app) { } }); +$app->post('/micropub/media', function() use($app) { + if($user=require_login($app)) { + $file = isset($_FILES['photo']) ? $_FILES['photo'] : null; + $error = validate_photo($file); + unset($_POST['null']); + + if(!$error) { + $file_path = $file['tmp_name']; + correct_photo_rotation($file_path); + $r = micropub_media_post_for_user($user, $file_path); + } else { + $r = array('error' => $error); + } + + if(empty($r['location']) && empty($r['error'])) { + $r['error'] = "No 'Location' header in response."; + } + + $app->response()->body(json_encode(array( + 'location' => (isset($r['location']) ? $r['location'] : null), + 'error' => (isset($r['error']) ? $r['error'] : null), + ))); + } +}); + $app->post('/micropub/postjson', function() use($app) { if($user=require_login($app)) { $params = $app->request()->params(); diff --git a/controllers/editor.php b/controllers/editor.php index a3c0496..fbb72cf 100644 --- a/controllers/editor.php +++ b/controllers/editor.php @@ -35,19 +35,30 @@ $app->post('/editor/publish', function() use($app) { }); $app->post('/editor/upload', function() use($app) { - // Fake a file uploader by echo'ing back the data URI - $fn = $_FILES['files']['tmp_name'][0]; - $imageData = base64_encode(file_get_contents($fn)); - $src = 'data:'.mime_content_type($fn).';base64,'.$imageData; + if($user=require_login($app)) { + $fn = $_FILES['files']['tmp_name'][0]; + $imageURL = false; - $app->response()['Content-type'] = 'application/json'; - $app->response()->body(json_encode([ - 'files' => [ - [ - 'url'=>$src + if($user->micropub_media_endpoint) { + // If the user has a media endpoint, upload to that and return that URL + correct_photo_rotation($fn); + $r = micropub_media_post_for_user($user, $fn); + if(!empty($r['location'])) { + $imageURL = $r['location']; + } + } + if(!$imageURL) { + // Otherwise, fake a file uploader by echo'ing back the data URI + $imageData = base64_encode(file_get_contents($fn)); + $imageURL = 'data:'.mime_content_type($fn).';base64,'.$imageData; + } + $app->response()['Content-type'] = 'application/json'; + $app->response()->body(json_encode([ + 'files' => [ + ['url'=>$imageURL] ] - ] - ])); + ])); + } }); $app->post('/editor/delete-file', function() use($app) { diff --git a/lib/helpers.php b/lib/helpers.php index f0c226b..76f209e 100644 --- a/lib/helpers.php +++ b/lib/helpers.php @@ -109,6 +109,20 @@ function micropub_post_for_user(&$user, $params, $file_path = NULL, $json = fals return $r; } +function micropub_media_post_for_user(&$user, $file_path) { + // Send to the media endpoint + $r = micropub_post($user->micropub_media_endpoint, [], $user->micropub_access_token, $file_path, true); + + // Check the response and look for a "Location" header containing the URL + if($r['response'] && preg_match('/Location: (.+)/', $r['response'], $match)) { + $r['location'] = trim($match[1]); + } else { + $r['location'] = false; + } + + return $r; +} + function micropub_post($endpoint, $params, $access_token, $file_path = NULL, $json = false) { $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $endpoint); @@ -154,7 +168,7 @@ function micropub_post($endpoint, $params, $access_token, $file_path = NULL, $js $response = curl_exec($ch); $error = curl_error($ch); $sent_headers = curl_getinfo($ch, CURLINFO_HEADER_OUT); - $request = $sent_headers . $post; + $request = $sent_headers . (is_string($post) ? $post : http_build_query($post)); return array( 'request' => $request, 'response' => $response, @@ -193,15 +207,15 @@ function micropub_get($endpoint, $params, $access_token) { ); } -function get_syndication_targets(&$user) { - $targets = array(); +function get_micropub_config(&$user, $query=[]) { + $targets = []; - $r = micropub_get($user->micropub_endpoint, array('q'=>'syndicate-to'), $user->micropub_access_token); + $r = micropub_get($user->micropub_endpoint, $query, $user->micropub_access_token); if($r['data'] && array_key_exists('syndicate-to', $r['data'])) { if(is_array($r['data']['syndicate-to'])) { $data = $r['data']['syndicate-to']; } else { - $data = array(); + $data = []; } foreach($data as $t) { @@ -212,23 +226,31 @@ function get_syndication_targets(&$user) { } if(array_key_exists('uid', $t) && array_key_exists('name', $t)) { - $targets[] = array( + $targets[] = [ 'target' => $t['name'], 'uid' => $t['uid'], 'favicon' => $icon - ); + ]; } } } - if(count($targets)) { + + if(count($targets)) $user->syndication_targets = json_encode($targets); + + $media_endpoint = false; + if(array_key_exists('media_endpoint', $r['data'])) { + $user->micropub_media_endpoint = $r['data']['media_endpoint']; + } + + if(count($targets) || $media_endpoint) { $user->save(); } - return array( + return [ 'targets' => $targets, 'response' => $r - ); + ]; } function static_map($latitude, $longitude, $height=180, $width=700, $zoom=14) { diff --git a/public/editor-files/localforage/localforage.js b/public/libs/localforage.js similarity index 100% rename from public/editor-files/localforage/localforage.js rename to public/libs/localforage.js diff --git a/schema/migrations/0001.sql b/schema/migrations/0001.sql new file mode 100644 index 0000000..87d67b6 --- /dev/null +++ b/schema/migrations/0001.sql @@ -0,0 +1,2 @@ +ALTER TABLE users +ADD COLUMN `micropub_media_endpoint` VARCHAR(255) NOT NULL DEFAULT '' AFTER `micropub_endpoint`; diff --git a/schema/mysql.sql b/schema/mysql.sql index e9f6d1d..8eccb3a 100644 --- a/schema/mysql.sql +++ b/schema/mysql.sql @@ -4,6 +4,7 @@ CREATE TABLE `users` ( `authorization_endpoint` varchar(255) DEFAULT NULL, `token_endpoint` varchar(255) DEFAULT NULL, `micropub_endpoint` varchar(255) DEFAULT NULL, + `micropub_media_endpoint` varchar(255) DEFAULT NULL, `micropub_access_token` text, `micropub_scope` varchar(255) DEFAULT NULL, `micropub_response` text, diff --git a/views/auth_start.php b/views/auth_start.php index 8635f07..93f45e3 100644 --- a/views/auth_start.php +++ b/views/auth_start.php @@ -36,7 +36,9 @@

The Micropub endpoint is the URL this app will use to post new photos.

micropubEndpoint): ?> -
Found your Micropub endpoint: micropubEndpoint ?>
+
+ Found your Micropub endpoint: micropubEndpoint ?> +
Could not find your Micropub endpoint!

You need to set your Micropub endpoint in a <link> tag on your home page.

diff --git a/views/editor.php b/views/editor.php index 6d235c4..44b2987 100644 --- a/views/editor.php +++ b/views/editor.php @@ -30,7 +30,7 @@ - + diff --git a/views/layout.php b/views/layout.php index 03929b1..59025b1 100644 --- a/views/layout.php +++ b/views/layout.php @@ -33,6 +33,7 @@ + diff --git a/views/new-post.php b/views/new-post.php index da3927d..18e81d1 100644 --- a/views/new-post.php +++ b/views/new-post.php @@ -108,6 +108,12 @@ micropub endpoint micropub_endpoint ?> (should be a URL) + media_endpoint): ?> + + media endpoint + media_endpoint ?> (should be a URL) + + access token String of length micropub_access_token) ?>micropub_access_token) > 0) ? (', ending in ' . substr($this->micropub_access_token, -7) . '') : '' ?> (should be greater than length 0) @@ -137,14 +143,93 @@