From c3fb722ad4bade9c4027c04de9b8dee511ab5756 Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Sat, 25 Jul 2015 05:44:10 -0700 Subject: [PATCH] add post-by-email support to quill --- controllers/controllers.php | 30 +++++++++++++++ controllers/hooks.php | 73 +++++++++++++++++++++++++++++++++++++ public/index.php | 1 + schema/mysql.sql | 1 + schema/sqlite.sql | 3 +- views/email.php | 29 +++++++++++++++ views/layout.php | 3 +- 7 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 controllers/hooks.php create mode 100644 views/email.php diff --git a/controllers/controllers.php b/controllers/controllers.php index 72ac2b8..95974d2 100644 --- a/controllers/controllers.php +++ b/controllers/controllers.php @@ -232,6 +232,36 @@ $app->get('/add-to-home', function() use($app) { } }); +$app->get('/email', function() use($app) { + if($user=require_login($app)) { + + $test_response = ''; + if($user->last_micropub_response) { + try { + if(@json_decode($user->last_micropub_response)) { + $d = json_decode($user->last_micropub_response); + $test_response = $d->response; + } + } catch(Exception $e) { + } + } + + if(!$user->email_username) { + $host = parse_url($user->url, PHP_URL_HOST); + $user->email_username = $host . '.' . rand(100000,999999); + $user->save(); + } + + $html = render('email', array( + 'title' => 'Post-by-Email', + 'micropub_endpoint' => $user->micropub_endpoint, + 'test_response' => $test_response, + 'user' => $user + )); + $app->response()->body($html); + } +}); + $app->get('/settings', function() use($app) { if($user=require_login($app)) { $html = render('settings', array('title' => 'Settings', 'include_facebook' => true, 'authorizing' => false)); diff --git a/controllers/hooks.php b/controllers/hooks.php new file mode 100644 index 0000000..b597c7b --- /dev/null +++ b/controllers/hooks.php @@ -0,0 +1,73 @@ +post('/mailgun', function() use($app) { + $params = $app->request()->params(); + + // Find the user for this email + if(!preg_match('/([^ <>]+)@'.Config::$hostname.'/', $params['To'], $match)) { + $app->response()->body('invalid recipient'); + return; + } + + $user = ORM::for_table('users')->where('email_username', $match[1])->find_one(); + if(!$user) { + $app->response()->body('user not found'); + return; + } + + if(!$user->micropub_access_token) { + $app->response()->body('user has no access token'); + return; + } + + $data = array( + 'published' => (k($params, 'Date') ? date('c', strtotime(k($params, 'Date'))) : date('c')) + ); + + if(k($params, 'Subject')) + $data['name'] = k($params, 'Subject'); + + if(k($params['body-plain']) + $data['content'] = k($params, 'body-plain'); + + // Set tags for any hashtags used in the body + if(preg_match_all('/#([^ ]+)/', $data['content'], $matches)) { + $tags = array(); + foreach($matches[1] as $m) + $tags[] = $m; + if($tags) { + if($user->send_category_as_array != 1) { + $data['category'] = $tags; + } else { + $data['category'] = implode(',', $tags); + } + } + } + + // Handle attachments + $filename = false; + + foreach($_FILES as $file) { + // If a photo was included, set the filename to the downloaded file + if(preg_match('/image/', $file['type'])) { + $filename = $file['tmp_name']; + } + + // Sometimes MMSs are sent with a txt file attached instead of in the body + if(preg_match('/text\/plain/', $file['type'])) { + $content = trim(file_get_contents($file['tmp_name'])); + if($content) { + $data['content'] = $content; + } + } + } + + $r = micropub_post_for_user($user, $data, $filename); + + if(k($r, 'location')) + $result = 'created post at ' . $r['location']; + else + $result = 'error creating post'; + + $app->response()->body($result); +}); diff --git a/public/index.php b/public/index.php index fde6984..e6a0f6a 100644 --- a/public/index.php +++ b/public/index.php @@ -14,6 +14,7 @@ $app = new \Slim\Slim(array( require 'controllers/auth.php'; require 'controllers/controllers.php'; require 'controllers/editor.php'; +require 'controllers/hooks.php'; session_name('quill'); session_set_cookie_params(86400*30); diff --git a/schema/mysql.sql b/schema/mysql.sql index 5f33ce6..e9f6d1d 100644 --- a/schema/mysql.sql +++ b/schema/mysql.sql @@ -19,5 +19,6 @@ CREATE TABLE `users` ( `twitter_token_secret` text, `twitter_username` varchar(255) DEFAULT NULL, `instagram_access_token` text, + `email_username` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/schema/sqlite.sql b/schema/sqlite.sql index ac691e3..9f05c1e 100644 --- a/schema/sqlite.sql +++ b/schema/sqlite.sql @@ -18,5 +18,6 @@ CREATE TABLE users ( twitter_access_token TEXT, twitter_token_secret TEXT, twitter_username TEXT, - instagram_access_token TEXT + instagram_access_token TEXT, + email_username TEXT ); \ No newline at end of file diff --git a/views/email.php b/views/email.php new file mode 100644 index 0000000..1f97905 --- /dev/null +++ b/views/email.php @@ -0,0 +1,29 @@ +
+ + +
+

+ Send email or MMS to
+ user->email_username . '@' . Config::$hostname ?> +

+
+ +
+

Email Subject

+

If you add a subject line to your email, it will be sent as the "name" property which indicates to your Micropub endpoint that this is a blog post.

+ +

Email and MMS body

+

The text of your email or MMS will be send as the "content" property, which is the main contents of your post. Plaintext only for now.

+ +

Photo

+

If you attach a photo to your email or MMS, it will be sent to your Micropub endpoint. (Only one photo is currently supported.)

+
+ +
+ test_response): ?> +

Last response from your Micropub endpoint

+ 
test_response) ?>
+ +
+ +
\ No newline at end of file diff --git a/views/layout.php b/views/layout.php index 7c2dab9..7bbba4a 100644 --- a/views/layout.php +++ b/views/layout.php @@ -63,10 +63,11 @@ if(property_exists($this, 'include_facebook')) {
  • Editor
    • -
  • New Note
    • +
  • Note
  • Bookmark
  • Favorite
  • Photo
    • +
  • Email
  • Docs