From 7047fe16da843d649baac375e9674f238072d7d5 Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Sat, 6 Jan 2018 13:57:50 -0800 Subject: [PATCH] support posting code snippets --- controllers/controllers.php | 102 ++++++++++++++++++++++++ public/css/style.css | 5 ++ views/new-code.php | 116 ++++++++++++++++++++++++++++ views/partials/code-bookmarklet.php | 3 + 4 files changed, 226 insertions(+) create mode 100644 views/new-code.php create mode 100644 views/partials/code-bookmarklet.php diff --git a/controllers/controllers.php b/controllers/controllers.php index 8c371c7..bc13dd3 100644 --- a/controllers/controllers.php +++ b/controllers/controllers.php @@ -694,6 +694,108 @@ $app->post('/repost', function() use($app) { } }); +$app->get('/code', function() use($app) { + if($user=require_login($app)) { + $params = $app->request()->params(); + + $edit_data = ['content'=>'','name'=>'']; + + if(array_key_exists('edit', $params)) { + $source = get_micropub_source($user, $params['edit'], ['content','name']); + if(isset($source['content']) && is_array($source['content']) && isset($source['content'][0])) + $edit_data['content'] = $source['content'][0]; + if(isset($source['name']) && is_array($source['name']) && isset($source['name'][0])) + $edit_data['name'] = $source['name'][0]; + $url = $params['edit']; + } else { + $url = false; + } + + $languages = [ + 'php' => ['php'], + 'ruby' => ['rb'], + 'python' => ['py'], + 'perl' => ['pl'], + 'javascript' => ['js'], + 'html' => ['html','htm'], + 'css' => ['css'], + 'bash' => ['sh'], + 'nginx' => ['conf'], + 'apache' => [], + 'text' => ['txt'], + ]; + ksort($languages); + $language_map = []; + foreach($languages as $lang=>$exts) { + foreach($exts as $ext) + $language_map[$ext] = $lang; + } + + render('new-code', array( + 'title' => 'New Code Snippet', + 'url' => $url, + 'edit_data' => $edit_data, + 'token' => generate_login_token(), + 'languages' => $languages, + 'language_map' => $language_map, + 'my_hostname' => parse_url($user->url, PHP_URL_HOST), + 'authorizing' => false, + )); + } +}); + +$app->post('/code', function() use($app) { + if($user=require_login($app)) { + $params = $app->request()->params(); + + $error = false; + + if(isset($params['edit']) && $params['edit']) { + $micropub_request = [ + 'action' => 'update', + 'url' => $params['edit'], + 'replace' => [ + 'content' => [$params['content']] + ] + ]; + if(isset($params['name']) && $params['name']) { + $micropub_request['replace']['name'] = [$params['name']]; + } + $r = micropub_post_for_user($user, $micropub_request, null, true); + + if(isset($r['location']) && $r['location']) + $location = $r['location']; + elseif(in_array($r['code'], [200,201,204])) + $location = $params['edit']; + elseif(in_array($r['code'], [401,403])) { + $location = false; + $error = 'Your Micropub endpoint denied the request. Check that Quill is authorized to update posts.'; + } else { + $location = false; + $error = 'Your Micropub endpoint did not return a location header or a recognized response code'; + } + } else { + $micropub_request = array( + 'p3k-content-type' => 'code/' . $params['language'], + 'content' => $params['content'], + ); + if(isset($params['name']) && $params['name']) + $micropub_request['name'] = $params['name']; + + $r = micropub_post_for_user($user, $micropub_request); + + $location = $r['location']; + } + + $app->response()['Content-type'] = 'application/json'; + $app->response()->body(json_encode(array( + 'location' => $location, + 'error' => $r['error'], + 'error_details' => $error, + ))); + } +}); + $app->get('/reply/preview', function() use($app) { if($user=require_login($app)) { $params = $app->request()->params(); diff --git a/public/css/style.css b/public/css/style.css index 4a2acff..6dcf682 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -202,6 +202,11 @@ body { margin-top: 20px; } + textarea.code-snippet { + font-size: 12px; + font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace; + } + /** * nicer file upload diff --git a/views/new-code.php b/views/new-code.php new file mode 100644 index 0000000..96a93d3 --- /dev/null +++ b/views/new-code.php @@ -0,0 +1,116 @@ +
+ + +
+ + +
+ +
+ + +
+ + +
+ +
+ + +
+ + url): ?> + + + + +
+ +
+ + +
+ +
+ +
+
+ Bookmarklet: code +
+ +
+ diff --git a/views/partials/code-bookmarklet.php b/views/partials/code-bookmarklet.php new file mode 100644 index 0000000..d0cf219 --- /dev/null +++ b/views/partials/code-bookmarklet.php @@ -0,0 +1,3 @@ +(function(){ + window.open("code?"+(window.location.hostname=='my_hostname ?>'?"edit="+encodeURIComponent(window.location.href)+"&":"")+"token=token ?>"); +})();