From 206a64ed4b8cce4e6379f9c18c9bd0389a7efd54 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 4 Mar 2017 14:04:21 +0000
Subject: [PATCH 01/26] =?UTF-8?q?Remove=20spatie=E2=80=99s=20media=20libra?=
 =?UTF-8?q?ry=20package?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Note.php   |   5 +-
 composer.json  |   1 -
 composer.lock  | 451 +------------------------------------------------
 config/app.php |   5 -
 4 files changed, 2 insertions(+), 460 deletions(-)

diff --git a/app/Note.php b/app/Note.php
index fe574e33..6ee5e2ff 100644
--- a/app/Note.php
+++ b/app/Note.php
@@ -9,15 +9,12 @@ use Illuminate\Database\Eloquent\Model;
 use Jonnybarnes\EmojiA11y\EmojiModifier;
 use League\CommonMark\CommonMarkConverter;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
-use Spatie\MediaLibrary\HasMedia\Interfaces\HasMedia;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
-class Note extends Model implements HasMedia
+class Note extends Model
 {
     use Searchable;
     use SoftDeletes;
-    use HasMediaTrait;
 
     /**
      * The database table used by the model.
diff --git a/composer.json b/composer.json
index 8eab83ba..6b281798 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,6 @@
         "indieauth/client": "~0.1",
         "ezyang/htmlpurifier": "~4.6",
         "league/commonmark": "^0.15.0",
-        "spatie/laravel-medialibrary": "^4.0",
         "league/flysystem-aws-s3-v3": "^1.0",
         "phaza/laravel-postgis": "~3.1",
         "lcobucci/jwt": "^3.1",
diff --git a/composer.lock b/composer.lock
index ebdebdff..3b259129 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,58 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "f3b7bcd2d79e776a84c1387f2086a5cc",
+    "content-hash": "601dc56ebae7a60465cb336957ea4e38",
     "packages": [
-        {
-            "name": "anahkiasen/underscore-php",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Anahkiasen/underscore-php.git",
-                "reference": "48f97b295c82d99c1fe10d8b0684c43f051b5580"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Anahkiasen/underscore-php/zipball/48f97b295c82d99c1fe10d8b0684c43f051b5580",
-                "reference": "48f97b295c82d99c1fe10d8b0684c43f051b5580",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/inflector": "^1.0",
-                "patchwork/utf8": "^1.2",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "2.0.*@dev",
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Underscore\\": [
-                        "src",
-                        "tests"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Maxime Fabre",
-                    "email": "ehtnam6@gmail.com"
-                }
-            ],
-            "description": "A redacted port of Underscore.js for PHP",
-            "keywords": [
-                "internals",
-                "laravel",
-                "toolkit"
-            ],
-            "time": "2015-05-16T19:24:58+00:00"
-        },
         {
             "name": "aws/aws-sdk-php",
             "version": "3.18.23",
@@ -1178,68 +1128,6 @@
             ],
             "time": "2017-01-11T17:14:49+00:00"
         },
-        {
-            "name": "intervention/image",
-            "version": "2.3.11",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Intervention/image.git",
-                "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
-                "reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
-                "shasum": ""
-            },
-            "require": {
-                "ext-fileinfo": "*",
-                "guzzlehttp/psr7": "~1.1",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "~0.9.2",
-                "phpunit/phpunit": "3.*"
-            },
-            "suggest": {
-                "ext-gd": "to use GD library based image processing.",
-                "ext-imagick": "to use Imagick based image processing.",
-                "intervention/imagecache": "Caching extension for the Intervention Image library"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Intervention\\Image\\": "src/Intervention/Image"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Oliver Vogel",
-                    "email": "oliver@olivervogel.net",
-                    "homepage": "http://olivervogel.net/"
-                }
-            ],
-            "description": "Image handling and manipulation library with support for Laravel integration",
-            "homepage": "http://image.intervention.io/",
-            "keywords": [
-                "gd",
-                "image",
-                "imagick",
-                "laravel",
-                "thumbnail",
-                "watermark"
-            ],
-            "time": "2017-02-04T10:37:19+00:00"
-        },
         {
             "name": "jakub-onderka/php-console-color",
             "version": "0.1",
@@ -2019,67 +1907,6 @@
             "description": "Flysystem adapter for the AWS S3 SDK v3.x",
             "time": "2016-06-21T21:34:35+00:00"
         },
-        {
-            "name": "league/glide",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/glide.git",
-                "reference": "ae6351088b148ed73ebd1270e312b07fd35dd37d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/glide/zipball/ae6351088b148ed73ebd1270e312b07fd35dd37d",
-                "reference": "ae6351088b148ed73ebd1270e312b07fd35dd37d",
-                "shasum": ""
-            },
-            "require": {
-                "intervention/image": "^2.1",
-                "league/flysystem": "^1.0",
-                "php": "^5.4 | ^7.0",
-                "psr/http-message": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "~0.9",
-                "phpunit/php-token-stream": "^1.4",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Glide\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jonathan Reinink",
-                    "email": "jonathan@reinink.ca",
-                    "homepage": "http://reinink.ca"
-                }
-            ],
-            "description": "Wonderfully easy on-demand image manipulation library with an HTTP based API.",
-            "homepage": "http://glide.thephpleague.com",
-            "keywords": [
-                "ImageMagick",
-                "editing",
-                "gd",
-                "image",
-                "imagick",
-                "league",
-                "manipulation",
-                "processing"
-            ],
-            "time": "2017-01-19T01:26:54+00:00"
-        },
         {
             "name": "martinbean/laravel-sluggable-trait",
             "version": "0.2.0",
@@ -2504,65 +2331,6 @@
             ],
             "time": "2017-03-03T14:11:40+00:00"
         },
-        {
-            "name": "patchwork/utf8",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/tchwork/utf8.git",
-                "reference": "30ec6451aec7d2536f0af8fe535f70c764f2c47a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/tchwork/utf8/zipball/30ec6451aec7d2536f0af8fe535f70c764f2c47a",
-                "reference": "30ec6451aec7d2536f0af8fe535f70c764f2c47a",
-                "shasum": ""
-            },
-            "require": {
-                "lib-pcre": ">=7.3",
-                "php": ">=5.3.0"
-            },
-            "suggest": {
-                "ext-iconv": "Use iconv for best performance",
-                "ext-intl": "Use Intl for best performance",
-                "ext-mbstring": "Use Mbstring for best performance",
-                "ext-wfio": "Use WFIO for UTF-8 filesystem access on Windows"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Patchwork\\": "src/Patchwork/"
-                },
-                "classmap": [
-                    "src/Normalizer.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "(Apache-2.0 or GPL-2.0)"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                }
-            ],
-            "description": "Portable and performant UTF-8, Unicode and Grapheme Clusters for PHP",
-            "homepage": "https://github.com/tchwork/utf8",
-            "keywords": [
-                "grapheme",
-                "i18n",
-                "unicode",
-                "utf-8",
-                "utf8"
-            ],
-            "time": "2016-05-18T13:57:10+00:00"
-        },
         {
             "name": "phaza/laravel-postgis",
             "version": "3.1.1",
@@ -3014,223 +2782,6 @@
             "description": "A security checker for your composer.lock",
             "time": "2017-02-18T17:53:25+00:00"
         },
-        {
-            "name": "spatie/laravel-glide",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/laravel-glide.git",
-                "reference": "a75f9069a04a1337e7c5308fd4975821f8177f23"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-glide/zipball/a75f9069a04a1337e7c5308fd4975821f8177f23",
-                "reference": "a75f9069a04a1337e7c5308fd4975821f8177f23",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/support": "~5.3.0|~5.4.0",
-                "league/glide": "^1.0",
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "orchestra/testbench": "~3.3.0|~3.4.0",
-                "phpunit/phpunit": "5.*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Spatie\\Glide\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be"
-                }
-            ],
-            "description": "Easily convert images with Glide",
-            "homepage": "https://github.com/spatie/laravel-glide",
-            "time": "2017-01-24T10:51:47+00:00"
-        },
-        {
-            "name": "spatie/laravel-medialibrary",
-            "version": "4.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/laravel-medialibrary.git",
-                "reference": "89432693fa66aa101499f0f89cfcdec51a620471"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/89432693fa66aa101499f0f89cfcdec51a620471",
-                "reference": "89432693fa66aa101499f0f89cfcdec51a620471",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/bus": "~5.2.0|~5.3.0|~5.4.0",
-                "illuminate/console": "~5.2.0|~5.3.0|~5.4.0",
-                "illuminate/container": "~5.2.0|~5.3.28|~5.4.0",
-                "illuminate/contracts": "~5.2.0|~5.3.28|~5.4.0",
-                "illuminate/database": "~5.2.0|~5.3.0|~5.4.0",
-                "illuminate/filesystem": "~5.2.0|~5.3.0|~5.4.0",
-                "illuminate/support": "~5.2.0|~5.3.0|~5.4.0",
-                "league/flysystem": "^1.0.13",
-                "php": "^7.0",
-                "spatie/laravel-glide": "^3.0.0",
-                "spatie/pdf-to-image": "^1.2",
-                "spatie/string": "^2.0.0"
-            },
-            "conflict": {
-                "php-ffmpeg/php-ffmpeg": "<0.6.1"
-            },
-            "require-dev": {
-                "doctrine/dbal": "^2.5.2",
-                "league/flysystem-aws-s3-v3": "^1.0.13",
-                "mockery/mockery": "^0.9.4",
-                "orchestra/testbench": "~3.2.0|~3.3.0|~3.4.0",
-                "phpunit/phpunit": "^5.7.0"
-            },
-            "suggest": {
-                "league/flysystem-aws-s3-v3": "Required to use AWS S3 file storage",
-                "php-ffmpeg/php-ffmpeg": "Required for generating video thumbnails"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Spatie\\MediaLibrary\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be",
-                    "homepage": "https://murze.be",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Associate files with Eloquent models",
-            "homepage": "https://github.com/spatie/laravel-medialibrary",
-            "keywords": [
-                "cms",
-                "laravel",
-                "laravel-medialibrary",
-                "media",
-                "spatie"
-            ],
-            "time": "2017-01-30T13:33:03+00:00"
-        },
-        {
-            "name": "spatie/pdf-to-image",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/pdf-to-image.git",
-                "reference": "9a5cb264a99e87e010c65d4ece03b51f821d55bd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/pdf-to-image/zipball/9a5cb264a99e87e010c65d4ece03b51f821d55bd",
-                "reference": "9a5cb264a99e87e010c65d4ece03b51f821d55bd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*",
-                "scrutinizer/ocular": "~1.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Spatie\\PdfToImage\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be",
-                    "homepage": "https://spatie.be",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Convert a pdf to an image",
-            "homepage": "https://github.com/spatie/pdf-to-image",
-            "keywords": [
-                "convert",
-                "image",
-                "pdf",
-                "pdf-to-image",
-                "spatie"
-            ],
-            "time": "2016-12-14T15:37:00+00:00"
-        },
-        {
-            "name": "spatie/string",
-            "version": "2.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/string.git",
-                "reference": "5435f8095a6c2f4ac67cbc9a1fbc116197863144"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/string/zipball/5435f8095a6c2f4ac67cbc9a1fbc116197863144",
-                "reference": "5435f8095a6c2f4ac67cbc9a1fbc116197863144",
-                "shasum": ""
-            },
-            "require": {
-                "anahkiasen/underscore-php": "^2.0",
-                "php": ">=5.6.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "5.*",
-                "scrutinizer/ocular": "~1.1"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/string_functions.php"
-                ],
-                "psr-4": {
-                    "Spatie\\String\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be",
-                    "homepage": "https://murze.be",
-                    "role": "Developer"
-                }
-            ],
-            "description": "String handling evolved",
-            "homepage": "https://github.com/spatie/string",
-            "keywords": [
-                "handling",
-                "handy",
-                "spatie",
-                "string"
-            ],
-            "time": "2016-12-01T13:46:28+00:00"
-        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v5.4.6",
diff --git a/config/app.php b/config/app.php
index 57d672d9..1b96380e 100644
--- a/config/app.php
+++ b/config/app.php
@@ -215,11 +215,6 @@ return [
          */
         Thujohn\Twitter\TwitterServiceProvider::class,
 
-        /*
-         * Laravel Medialibrary
-         */
-        Spatie\MediaLibrary\MediaLibraryServiceProvider::class,
-
         /*
          * Phaza’s Postgis library
          */

From 21cd7186049415ab0ad30d6acb91556a808cf406 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue, 7 Mar 2017 18:47:29 +0000
Subject: [PATCH 02/26] Add a media endpoint route

---
 app/Http/Controllers/MicropubController.php | 38 +++++++++++++++++++++
 routes/web.php                              |  1 +
 2 files changed, 39 insertions(+)

diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index a110bc65..7c78111f 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -225,4 +225,42 @@ class MicropubController extends Controller
             'error_description' => 'No token provided with request',
         ], 400);
     }
+
+    /**
+     * Process a media item posted to the media endpoint.
+     *
+     * @param  Illuminate\Http\Request $request
+     * @return Illuminate\Http\Response
+     */
+    public function media(Request $request)
+    {
+        //can this go in middleware
+        $httpAuth = $request->header('Authorization');
+        if (preg_match('/Bearer (.+)/', $httpAuth, $match)) {
+            $token = $match[1];
+            $valid = $this->tokenService->validateToken($token);
+
+            if ($valid === null) {
+                return response()->json([
+                    'response' => 'error',
+                    'error' => 'invalid_token',
+                    'error_description' => 'The provided token did not pass validation',
+                ], 400);
+            }
+
+            //check post scope
+
+            //check media valid
+
+            //save media
+
+            //return URL for media
+        }
+
+        return response()->json([
+            'response' => 'error',
+            'error' => 'no_token',
+            'error_description' => 'There was no token provided with the request'
+        ], 400);
+    }
 }
diff --git a/routes/web.php b/routes/web.php
index 4b36bc18..a8268e27 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -115,6 +115,7 @@ Route::group(['domain' => config('url.longurl')], function () {
     // Micropub Endpoint
     Route::get('api/post', 'MicropubController@get');
     Route::post('api/post', 'MicropubController@post');
+    Route::post('api/media', 'MicropubController@media');
 
     //webmention
     Route::get('webmention', 'WebMentionsController@get');

From bd57ce56d430bdbb2b2daa094af8ebc314f5df99 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu, 9 Mar 2017 22:00:29 +0000
Subject: [PATCH 03/26] Starting work on adding a media endpoint

---
 app/Http/Controllers/MicropubController.php   | 35 +++++++++++++---
 app/Media.php                                 | 30 ++++++++++++++
 app/Note.php                                  | 10 +++++
 composer.json                                 | 27 +++++++------
 composer.lock                                 |  2 +-
 ..._09_155908_create_media_endpoint_table.php | 40 +++++++++++++++++++
 6 files changed, 125 insertions(+), 19 deletions(-)
 create mode 100644 app/Media.php
 create mode 100644 database/migrations/2017_03_09_155908_create_media_endpoint_table.php

diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index 7c78111f..5c4503a7 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -3,11 +3,13 @@
 namespace App\Http\Controllers;
 
 use App\Place;
+use Ramsey\Uuid\Uuid;
 use Illuminate\Http\Request;
 use App\Services\NoteService;
 use Illuminate\Http\Response;
 use App\Services\PlaceService;
 use App\Services\TokenService;
+use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
 
 class MicropubController extends Controller
 {
@@ -238,9 +240,9 @@ class MicropubController extends Controller
         $httpAuth = $request->header('Authorization');
         if (preg_match('/Bearer (.+)/', $httpAuth, $match)) {
             $token = $match[1];
-            $valid = $this->tokenService->validateToken($token);
+            $tokenData = $this->tokenService->validateToken($token);
 
-            if ($valid === null) {
+            if ($tokenData === null) {
                 return response()->json([
                     'response' => 'error',
                     'error' => 'invalid_token',
@@ -249,10 +251,33 @@ class MicropubController extends Controller
             }
 
             //check post scope
+            if ($tokenData->hasClaim('scope')) {
+                $scopes = explode(' ', $tokenData->getClaim('scope'));
+                if (array_search('post', $scopes) !== false) {
+                    //check media valid
+                    if ($request->file('file')->isValid()) {
+                        //save media
+                        try {
+                            $filename = Uuid::uuid4() . $request->file->extension();
+                        } catch (UnsatisfiedDependencyException $e) {
+                            return response()->json([
+                                'response' => 'error',
+                                'error' => 'internal_server_error',
+                                'error_description' => 'A problem occured handling your request'
+                            ], 500)
+                        }
+                        try {
+                            $path = $request->file->storeAs('media', $filename, 's3');
+                        } catch(Excetion $e) { // which exception?
+                            return response()->json([
+                                'response' => 'error',
+                                'error' => 'service_unavailable',
+                                'error_description' => 'Unable to save media to S3'
+                            ], 503)
+                        }
 
-            //check media valid
-
-            //save media
+                        return $path;
+                    }
 
             //return URL for media
         }
diff --git a/app/Media.php b/app/Media.php
new file mode 100644
index 00000000..61f94160
--- /dev/null
+++ b/app/Media.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Media extends Model
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'media_endpoint';
+
+    /**
+     * Our primaru key is a UUID value, therefore not incrementing.
+     *
+     * @var boolean
+     */
+    protected $incrementing = false;
+
+    /**
+     * Get the note that owns this media.
+     */
+    public function note()
+    {
+        return $this->belongsTo('App\Note');
+    }
+}
diff --git a/app/Note.php b/app/Note.php
index 6ee5e2ff..6a51a896 100644
--- a/app/Note.php
+++ b/app/Note.php
@@ -53,6 +53,16 @@ class Note extends Model
         return $this->belongsTo('App\Place');
     }
 
+    /**
+     * Define the relationship with media.
+     *
+     * @return void
+     */
+    public function media()
+    {
+        return $this->hasMany('App\Media');
+    }
+
     /**
      * We shall set a blacklist of non-modifiable model attributes.
      *
diff --git a/composer.json b/composer.json
index 6b281798..0c57c02e 100644
--- a/composer.json
+++ b/composer.json
@@ -6,25 +6,26 @@
     "type": "project",
     "require": {
         "php": ">=7.1.0",
-        "laravel/framework": "5.4.*",
+        "ezyang/htmlpurifier": "~4.6",
+        "guzzlehttp/guzzle": "~6.0",
+        "indieauth/client": "~0.1",
+        "jonnybarnes/emoji-a11y": "^0.2",
         "jonnybarnes/indieweb": "dev-master",
         "jonnybarnes/webmentions-parser": "0.4.*",
-        "guzzlehttp/guzzle": "~6.0",
-        "predis/predis": "~1.0",
-        "thujohn/twitter": "~2.0",
-        "mf2/mf2": "~0.3",
-        "martinbean/laravel-sluggable-trait": "0.2.*",
-        "indieauth/client": "~0.1",
-        "ezyang/htmlpurifier": "~4.6",
+        "laravel/framework": "5.4.*",
+        "laravel/scout": "^3.0",
+        "laravel/tinker": "^1.0",
+        "lcobucci/jwt": "^3.1",
         "league/commonmark": "^0.15.0",
         "league/flysystem-aws-s3-v3": "^1.0",
+        "martinbean/laravel-sluggable-trait": "0.2.*",
+        "mf2/mf2": "~0.3",
         "phaza/laravel-postgis": "~3.1",
-        "lcobucci/jwt": "^3.1",
-        "sensiolabs/security-checker": "^4.0",
-        "laravel/scout": "^3.0",
         "pmatseykanets/laravel-scout-postgres": "^0.5.0",
-        "jonnybarnes/emoji-a11y": "^0.2",
-        "laravel/tinker": "^1.0"
+        "predis/predis": "~1.0",
+        "ramsey/uuid": "^3.5",
+        "sensiolabs/security-checker": "^4.0",
+        "thujohn/twitter": "~2.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "~2.0",
diff --git a/composer.lock b/composer.lock
index 3b259129..95aa6499 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "601dc56ebae7a60465cb336957ea4e38",
+    "content-hash": "3a440750c3e5403668fd82dbe7c54de0",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
diff --git a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
new file mode 100644
index 00000000..92789dc0
--- /dev/null
+++ b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateMediaEndpointTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('media_endpoint', function (Blueprint $table) {
+            $table->uuid('id');
+            $table->varchar('client_id')->nullable();
+            $table->varchar('filetype');
+            $table->unsignedInteger('note_id')->nullable();
+            $table->timestamps();
+
+            $table->primary('id');
+            $table->foreign('note_id')->references('id')->on('notes');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Scheme::table('media_endpoint', function (Blueprint $table) {
+            $table->dropForeign(['note_id']);
+        });
+        Schema::dropIfExists('media_endpoint');
+    }
+}

From 2c5c6e7753c1cc4c1c11b19a4df4b7a714f455cd Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri, 10 Mar 2017 09:58:35 +0000
Subject: [PATCH 04/26] Save uploaded files to S3 and generate a URL

---
 app/Http/Controllers/MicropubController.php     | 12 ++++++++----
 app/Media.php                                   | 17 ++++++++++-------
 config/filesystems.php                          |  1 +
 ...03_09_155908_create_media_endpoint_table.php |  7 ++++---
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index 5c4503a7..8b1847e4 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -258,7 +258,7 @@ class MicropubController extends Controller
                     if ($request->file('file')->isValid()) {
                         //save media
                         try {
-                            $filename = Uuid::uuid4() . $request->file->extension();
+                            $filename = Uuid::uuid4() . $request->file('file')->extension();
                         } catch (UnsatisfiedDependencyException $e) {
                             return response()->json([
                                 'response' => 'error',
@@ -267,16 +267,20 @@ class MicropubController extends Controller
                             ], 500)
                         }
                         try {
-                            $path = $request->file->storeAs('media', $filename, 's3');
-                        } catch(Excetion $e) { // which exception?
+                            $path = $request->file('file')->storeAs('media', $filename, 's3');
+                        } catch (Exception $e) { // which exception?
                             return response()->json([
                                 'response' => 'error',
                                 'error' => 'service_unavailable',
                                 'error_description' => 'Unable to save media to S3'
                             ], 503)
                         }
+                        $media = new Media();
+                        $media->token = $token;
+                        $media->path = $path;
+                        $media->save();
 
-                        return $path;
+                        return $media->url;
                     }
 
             //return URL for media
diff --git a/app/Media.php b/app/Media.php
index 61f94160..31ea3a1b 100644
--- a/app/Media.php
+++ b/app/Media.php
@@ -13,13 +13,6 @@ class Media extends Model
      */
     protected $table = 'media_endpoint';
 
-    /**
-     * Our primaru key is a UUID value, therefore not incrementing.
-     *
-     * @var boolean
-     */
-    protected $incrementing = false;
-
     /**
      * Get the note that owns this media.
      */
@@ -27,4 +20,14 @@ class Media extends Model
     {
         return $this->belongsTo('App\Note');
     }
+
+    /**
+     * Get the URL for an S3 media file.
+     *
+     * @return string
+     */
+    public function getUrlAttribute()
+    {
+        return config('filesystems.s3.url') . '/' . $this->path;
+    }
 }
diff --git a/config/filesystems.php b/config/filesystems.php
index 66120369..38b34b97 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -61,6 +61,7 @@ return [
             'secret' => env('AWS_S3_SECRET'),
             'region' => env('AWS_S3_REGION'),
             'bucket' => env('AWS_S3_BUCKET'),
+            'url' => env('AWS_S3_URL'),
         ],
 
         'media' => [
diff --git a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
index 92789dc0..e885881f 100644
--- a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
+++ b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
@@ -14,13 +14,14 @@ class CreateMediaEndpointTable extends Migration
     public function up()
     {
         Schema::create('media_endpoint', function (Blueprint $table) {
-            $table->uuid('id');
-            $table->varchar('client_id')->nullable();
-            $table->varchar('filetype');
+            $table->increments('id');
+            $table->text('token')->nullable();
+            $table->varchar('path');
             $table->unsignedInteger('note_id')->nullable();
             $table->timestamps();
 
             $table->primary('id');
+            $table->index('token');
             $table->foreign('note_id')->references('id')->on('notes');
         });
     }

From d33c43958a34f34e446644f92638c66be4e7d68a Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri, 10 Mar 2017 10:05:49 +0000
Subject: [PATCH 05/26] Use the correct method for a VARCHAR column

---
 .../2017_03_09_155908_create_media_endpoint_table.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
index e885881f..7283ae6e 100644
--- a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
+++ b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
@@ -16,7 +16,7 @@ class CreateMediaEndpointTable extends Migration
         Schema::create('media_endpoint', function (Blueprint $table) {
             $table->increments('id');
             $table->text('token')->nullable();
-            $table->varchar('path');
+            $table->string('path');
             $table->unsignedInteger('note_id')->nullable();
             $table->timestamps();
 

From 46ebd38d6ba92b6db0b19e037f294bfd1643cc70 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri, 10 Mar 2017 10:06:41 +0000
Subject: [PATCH 06/26] Was trying to define the primary key twice

---
 .../migrations/2017_03_09_155908_create_media_endpoint_table.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
index 7283ae6e..a2388065 100644
--- a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
+++ b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
@@ -20,7 +20,6 @@ class CreateMediaEndpointTable extends Migration
             $table->unsignedInteger('note_id')->nullable();
             $table->timestamps();
 
-            $table->primary('id');
             $table->index('token');
             $table->foreign('note_id')->references('id')->on('notes');
         });

From 63a8f49b644d4863c5a011125a978e2e3a3f987b Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri, 10 Mar 2017 10:21:51 +0000
Subject: [PATCH 07/26] Remove more media-library routines that I missed
 earlier

---
 app/Http/Controllers/NotesController.php | 13 -------------
 resources/views/templates/note.blade.php |  5 -----
 2 files changed, 18 deletions(-)

diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php
index 45915796..06a68e4c 100644
--- a/app/Http/Controllers/NotesController.php
+++ b/app/Http/Controllers/NotesController.php
@@ -58,12 +58,6 @@ class NotesController extends Controller
                     $note->place->icon
                 );
             }
-            $photoURLs = [];
-            $photos = $note->getMedia();
-            foreach ($photos as $photo) {
-                $photoURLs[] = $photo->getUrl();
-            }
-            $note->photoURLs = $photoURLs;
         }
 
         $homepage = ($request->path() == '/');
@@ -164,13 +158,6 @@ class NotesController extends Controller
             );
         }
 
-        $photoURLs = [];
-        $photos = $note->getMedia();
-        foreach ($photos as $photo) {
-            $photoURLs[] = $photo->getUrl();
-        }
-        $note->photoURLs = $photoURLs;
-
         return view('notes.show', compact('note', 'replies', 'reposts', 'likes'));
     }
 
diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php
index d5ff1ae7..625af985 100644
--- a/resources/views/templates/note.blade.php
+++ b/resources/views/templates/note.blade.php
@@ -8,11 +8,6 @@
   <div class="note">
     <div class="e-content p-name">
       {!! $note->note !!}
-      @if(count($note->photoURLs) > 0)
-        @foreach($note->photoURLs as $photoURL)
-          <img src="{{ $photoURL }}" alt="" class="note-photo u-photo">
-        @endforeach
-      @endif
     </div>
     <div class="note-metadata">
       <div>

From c66dd6615577018c4cb28b1d57c6ab428f93af0f Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri, 10 Mar 2017 11:27:28 +0000
Subject: [PATCH 08/26] Media can now be uploaded and an S3 URL is returned

---
 app/Http/Controllers/MicropubController.php | 32 +++++++++++++++++----
 app/Http/Middleware/VerifyCsrfToken.php     |  5 ++--
 app/Media.php                               |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index 8b1847e4..f4d02b33 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Media;
 use App\Place;
 use Ramsey\Uuid\Uuid;
 use Illuminate\Http\Request;
@@ -258,13 +259,13 @@ class MicropubController extends Controller
                     if ($request->file('file')->isValid()) {
                         //save media
                         try {
-                            $filename = Uuid::uuid4() . $request->file('file')->extension();
+                            $filename = Uuid::uuid4() . '.' . $request->file('file')->extension();
                         } catch (UnsatisfiedDependencyException $e) {
                             return response()->json([
                                 'response' => 'error',
                                 'error' => 'internal_server_error',
                                 'error_description' => 'A problem occured handling your request'
-                            ], 500)
+                            ], 500);
                         }
                         try {
                             $path = $request->file('file')->storeAs('media', $filename, 's3');
@@ -273,17 +274,38 @@ class MicropubController extends Controller
                                 'response' => 'error',
                                 'error' => 'service_unavailable',
                                 'error_description' => 'Unable to save media to S3'
-                            ], 503)
+                            ], 503);
                         }
                         $media = new Media();
                         $media->token = $token;
                         $media->path = $path;
                         $media->save();
 
-                        return $media->url;
+                        return response()->json([
+                            'response' => 'created',
+                            'location' => $media->url,
+                        ], 201)->header('Location', $media->url);
                     }
 
-            //return URL for media
+                    return response()->json([
+                        'response' => 'error',
+                        'error' => 'invalid_request',
+                        'error_description' => 'The uploaded file failed validation',
+                    ], 400);
+                }
+
+                return response()->json([
+                    'response' => 'error',
+                    'error' => 'insufficient_scope',
+                    'error_description' => 'The provided token has insufficient scopes',
+                ], 401);
+            }
+
+            return response()->json([
+                'response' => 'error',
+                'error' => 'unauthorized',
+                'error_description' => 'No token provided with request',
+            ], 401);
         }
 
         return response()->json([
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index c8545185..948eda56 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -12,9 +12,10 @@ class VerifyCsrfToken extends BaseVerifier
      * @var array
      */
     protected $except = [
-        'api/token',
+        'api/media',
         'api/post',
-        'webmention',
+        'api/token',
         'places/new',
+        'webmention',
     ];
 }
diff --git a/app/Media.php b/app/Media.php
index 31ea3a1b..f0234c6e 100644
--- a/app/Media.php
+++ b/app/Media.php
@@ -28,6 +28,6 @@ class Media extends Model
      */
     public function getUrlAttribute()
     {
-        return config('filesystems.s3.url') . '/' . $this->path;
+        return config('filesystems.disks.s3.url') . '/' . $this->path;
     }
 }

From 56594facc4337b5c83e8a692eb6383befc308841 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri, 10 Mar 2017 14:41:09 +0000
Subject: [PATCH 09/26] NAme the media endpoint route

---
 routes/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index a8268e27..6d0dc09a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -115,7 +115,7 @@ Route::group(['domain' => config('url.longurl')], function () {
     // Micropub Endpoint
     Route::get('api/post', 'MicropubController@get');
     Route::post('api/post', 'MicropubController@post');
-    Route::post('api/media', 'MicropubController@media');
+    Route::post('api/media', 'MicropubController@media')->name('media-endpoint');
 
     //webmention
     Route::get('webmention', 'WebMentionsController@get');

From 68bfd12f930079359ded9eb737425811c1a905c3 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri, 10 Mar 2017 14:42:00 +0000
Subject: [PATCH 10/26] Declare media endpoint to micropub query

---
 app/Http/Controllers/MicropubController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index f4d02b33..5b88dd43 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -204,10 +204,10 @@ class MicropubController extends Controller
                 ]);
             }
             //nope, how about a config query?
-            //this should have a media endpoint as well at some point
             if ($request->input('q') == 'config') {
                 return response()->json([
                     'syndicate-to' => config('syndication.targets'),
+                    'media-endpoint' => route('media-endpoint'),
                 ]);
             }
 

From ff544885ec59d5cc24397cf49f8353ead1bd05d9 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon, 13 Mar 2017 10:42:17 +0000
Subject: [PATCH 11/26] composer update && yarn upgrade

---
 composer.lock | 193 +++++++++++++++++++++++++-------------------------
 yarn.lock     | 140 ++++++++++++++++--------------------
 2 files changed, 159 insertions(+), 174 deletions(-)

diff --git a/composer.lock b/composer.lock
index 95aa6499..56917049 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,22 +8,22 @@
     "packages": [
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.18.23",
+            "version": "3.24.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "a2791b6f14b7aa6eeb4fb9f3f779cc291ab455db"
+                "reference": "2b252f300de442cdb5cde18ddc118c2477972e30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a2791b6f14b7aa6eeb4fb9f3f779cc291ab455db",
-                "reference": "a2791b6f14b7aa6eeb4fb9f3f779cc291ab455db",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2b252f300de442cdb5cde18ddc118c2477972e30",
+                "reference": "2b252f300de442cdb5cde18ddc118c2477972e30",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/guzzle": "~5.3|~6.0.1|~6.1",
+                "guzzlehttp/guzzle": "^5.3.1|^6.2.1",
                 "guzzlehttp/promises": "~1.0",
-                "guzzlehttp/psr7": "~1.0",
+                "guzzlehttp/psr7": "^1.3.1, !=1.4.0",
                 "mtdowling/jmespath.php": "~2.2",
                 "php": ">=5.5"
             },
@@ -84,7 +84,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2016-06-30T19:49:43+00:00"
+            "time": "2017-03-10T21:09:41+00:00"
         },
         {
             "name": "barnabywalters/mf-cleaner",
@@ -727,16 +727,16 @@
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.9.0",
+            "version": "v4.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "a1c09b09e398687deeb8e309a6305def4b43439b"
+                "reference": "de82f9845f2a0f9f27abec67d6a4958427e6f5d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a1c09b09e398687deeb8e309a6305def4b43439b",
-                "reference": "a1c09b09e398687deeb8e309a6305def4b43439b",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/de82f9845f2a0f9f27abec67d6a4958427e6f5d6",
+                "reference": "de82f9845f2a0f9f27abec67d6a4958427e6f5d6",
                 "shasum": ""
             },
             "require": {
@@ -770,7 +770,7 @@
             "keywords": [
                 "html"
             ],
-            "time": "2017-01-13T12:31:37+00:00"
+            "time": "2017-03-08T08:22:36+00:00"
         },
         {
             "name": "geo-io/interface",
@@ -2234,16 +2234,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v3.0.4",
+            "version": "v3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "0bf561dfe75ba80441c22adecc0529056671a7d2"
+                "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0bf561dfe75ba80441c22adecc0529056671a7d2",
-                "reference": "0bf561dfe75ba80441c22adecc0529056671a7d2",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2b9e2f71b722f7c53918ab0c25f7646c2013f17d",
+                "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d",
                 "shasum": ""
             },
             "require": {
@@ -2281,20 +2281,20 @@
                 "parser",
                 "php"
             ],
-            "time": "2017-02-10T20:20:03+00:00"
+            "time": "2017-03-05T18:23:57+00:00"
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.8",
+            "version": "v2.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "eeb4c23c7b84c1dc87db3c92856bd57ff1844ca4"
+                "reference": "6968531206671f94377b01dc7888d5d1b858a01b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/eeb4c23c7b84c1dc87db3c92856bd57ff1844ca4",
-                "reference": "eeb4c23c7b84c1dc87db3c92856bd57ff1844ca4",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/6968531206671f94377b01dc7888d5d1b858a01b",
+                "reference": "6968531206671f94377b01dc7888d5d1b858a01b",
                 "shasum": ""
             },
             "require": {
@@ -2329,7 +2329,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-03-03T14:11:40+00:00"
+            "time": "2017-03-03T20:43:42+00:00"
         },
         {
             "name": "phaza/laravel-postgis",
@@ -2740,16 +2740,16 @@
         },
         {
             "name": "sensiolabs/security-checker",
-            "version": "v4.0.1",
+            "version": "v4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/security-checker.git",
-                "reference": "f2ce0035fc512287978510ca1740cd111d60f89f"
+                "reference": "56bded66985e22f6eac2cf86735fd21c625bff2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/f2ce0035fc512287978510ca1740cd111d60f89f",
-                "reference": "f2ce0035fc512287978510ca1740cd111d60f89f",
+                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/56bded66985e22f6eac2cf86735fd21c625bff2f",
+                "reference": "56bded66985e22f6eac2cf86735fd21c625bff2f",
                 "shasum": ""
             },
             "require": {
@@ -2780,7 +2780,7 @@
                 }
             ],
             "description": "A security checker for your composer.lock",
-            "time": "2017-02-18T17:53:25+00:00"
+            "time": "2017-03-09T17:33:20+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -2838,16 +2838,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870"
+                "reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
-                "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
+                "url": "https://api.github.com/repos/symfony/console/zipball/28fb243a2b5727774ca309ec2d92da240f1af0dd",
+                "reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd",
                 "shasum": ""
             },
             "require": {
@@ -2897,20 +2897,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16T14:07:22+00:00"
+            "time": "2017-03-06T19:30:27+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa"
+                "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
-                "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/a48f13dc83c168f1253a5d2a5a4fb46c36244c4c",
+                "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c",
                 "shasum": ""
             },
             "require": {
@@ -2950,20 +2950,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:32:22+00:00"
+            "time": "2017-02-21T09:12:04+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9"
+                "reference": "b90c9f91ad8ac37d9f114e369042d3226b34dc1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
-                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/b90c9f91ad8ac37d9f114e369042d3226b34dc1a",
+                "reference": "b90c9f91ad8ac37d9f114e369042d3226b34dc1a",
                 "shasum": ""
             },
             "require": {
@@ -3007,20 +3007,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16T16:34:18+00:00"
+            "time": "2017-02-18T17:28:00+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6"
+                "reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6",
-                "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d",
+                "reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d",
                 "shasum": ""
             },
             "require": {
@@ -3067,20 +3067,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:32:22+00:00"
+            "time": "2017-02-21T09:12:04+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "8c71141cae8e2957946b403cc71a67213c0380d6"
+                "reference": "92d7476d2df60cd851a3e13e078664b1deb8ce10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6",
-                "reference": "8c71141cae8e2957946b403cc71a67213c0380d6",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/92d7476d2df60cd851a3e13e078664b1deb8ce10",
+                "reference": "92d7476d2df60cd851a3e13e078664b1deb8ce10",
                 "shasum": ""
             },
             "require": {
@@ -3116,20 +3116,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:32:22+00:00"
+            "time": "2017-02-21T09:12:04+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0"
+                "reference": "c57009887010eb4e58bfca2970314a5b820b24b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a90da6dd679605d88c9803a57a6fc1fb7a19a6e0",
-                "reference": "a90da6dd679605d88c9803a57a6fc1fb7a19a6e0",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c57009887010eb4e58bfca2970314a5b820b24b9",
+                "reference": "c57009887010eb4e58bfca2970314a5b820b24b9",
                 "shasum": ""
             },
             "require": {
@@ -3169,20 +3169,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16T22:46:52+00:00"
+            "time": "2017-03-04T12:23:14+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "4cd0d4bc31819095c6ef13573069f621eb321081"
+                "reference": "bc909e85b8585c9edf043d0fca871308c41bb9b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4cd0d4bc31819095c6ef13573069f621eb321081",
-                "reference": "4cd0d4bc31819095c6ef13573069f621eb321081",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/bc909e85b8585c9edf043d0fca871308c41bb9b4",
+                "reference": "bc909e85b8585c9edf043d0fca871308c41bb9b4",
                 "shasum": ""
             },
             "require": {
@@ -3251,7 +3251,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16T23:59:56+00:00"
+            "time": "2017-03-10T18:35:31+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -3314,16 +3314,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856"
+                "reference": "68bfa8c83f24c0ac04ea7193bcdcda4519f41892"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
-                "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
+                "url": "https://api.github.com/repos/symfony/process/zipball/68bfa8c83f24c0ac04ea7193bcdcda4519f41892",
+                "reference": "68bfa8c83f24c0ac04ea7193bcdcda4519f41892",
                 "shasum": ""
             },
             "require": {
@@ -3359,20 +3359,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16T14:07:22+00:00"
+            "time": "2017-03-04T12:23:14+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "af464432c177dbcdbb32295113b7627500331f2d"
+                "reference": "d6605f9a5767bc5bc4895e1c762ba93964608aee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/af464432c177dbcdbb32295113b7627500331f2d",
-                "reference": "af464432c177dbcdbb32295113b7627500331f2d",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/d6605f9a5767bc5bc4895e1c762ba93964608aee",
+                "reference": "d6605f9a5767bc5bc4895e1c762ba93964608aee",
                 "shasum": ""
             },
             "require": {
@@ -3434,20 +3434,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2017-01-28T02:37:08+00:00"
+            "time": "2017-03-02T15:58:09+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029"
+                "reference": "0e1b15ce8fbf3890f4ccdac430ed5e07fdfe0690"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/d6825c6bb2f1da13f564678f9f236fe8242c0029",
-                "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/0e1b15ce8fbf3890f4ccdac430ed5e07fdfe0690",
+                "reference": "0e1b15ce8fbf3890f4ccdac430ed5e07fdfe0690",
                 "shasum": ""
             },
             "require": {
@@ -3460,7 +3460,7 @@
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~2.8|~3.0",
-                "symfony/intl": "~2.8|~3.0",
+                "symfony/intl": "^2.8.18|^3.2.5",
                 "symfony/yaml": "~2.8|~3.0"
             },
             "suggest": {
@@ -3498,26 +3498,29 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16T22:46:52+00:00"
+            "time": "2017-03-04T12:23:14+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20"
+                "reference": "4100f347aff890bc16b0b4b42843b599db257b2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cb50260b674ee1c2d4ab49f2395a42e0b4681e20",
-                "reference": "cb50260b674ee1c2d4ab49f2395a42e0b4681e20",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4100f347aff890bc16b0b4b42843b599db257b2d",
+                "reference": "4100f347aff890bc16b0b4b42843b599db257b2d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.5.9",
                 "symfony/polyfill-mbstring": "~1.0"
             },
+            "conflict": {
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+            },
             "require-dev": {
                 "twig/twig": "~1.20|~2.0"
             },
@@ -3561,7 +3564,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2017-02-16T22:46:52+00:00"
+            "time": "2017-02-20T13:45:48+00:00"
         },
         {
             "name": "themattharris/tmhoauth",
@@ -4869,23 +4872,23 @@
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5"
+                "phpunit/phpunit": "^5.7 || ^6.0"
             },
             "type": "library",
             "extra": {
@@ -4910,7 +4913,7 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2016-02-13T06:45:14+00:00"
+            "time": "2017-03-04T06:30:41+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -5382,16 +5385,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.2.4",
+            "version": "v3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8"
+                "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
-                "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a",
+                "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a",
                 "shasum": ""
             },
             "require": {
@@ -5433,7 +5436,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16T22:46:52+00:00"
+            "time": "2017-03-07T16:47:02+00:00"
         },
         {
             "name": "webmozart/assert",
diff --git a/yarn.lock b/yarn.lock
index a28f36eb..4cc8de33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,9 +52,9 @@ ajv-keywords@^1.1.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
-ajv@^4.7.0:
-  version "4.11.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.3.tgz#ce30bdb90d1254f762c75af915fb3a63e7183d22"
+ajv@^4.7.0, ajv@^4.9.1:
+  version "4.11.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
@@ -187,10 +187,6 @@ async@^2.1.2:
   dependencies:
     lodash "^4.14.0"
 
-async@~0.2.6:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-
 async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
@@ -379,8 +375,8 @@ babel-helpers@^6.23.0:
     babel-template "^6.23.0"
 
 babel-loader@^6.2.10:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.3.2.tgz#18de4566385578c1b4f8ffe6cbc668f5e2a5ef03"
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.0.tgz#e98c239662a22533b9e7a49594ef216d7635ea28"
   dependencies:
     find-cache-dir "^0.1.1"
     loader-utils "^0.2.16"
@@ -937,9 +933,9 @@ capture-stack-trace@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
 
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
 center-align@^0.1.1:
   version "0.1.3"
@@ -1231,8 +1227,8 @@ date-now@^0.1.4:
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
 debug@^2.1.1, debug@^2.2.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351"
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.2.tgz#dfa96a861ee9b8c2f29349b3bcc41aa599a71e0f"
   dependencies:
     ms "0.7.2"
 
@@ -1370,8 +1366,8 @@ errno@^0.1.3:
     prr "~0.0.0"
 
 error-ex@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.0.tgz#e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
     is-arrayish "^0.2.1"
 
@@ -1629,8 +1625,8 @@ fstream-ignore@~1.0.5:
     minimatch "^3.0.0"
 
 fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.10.tgz#604e8a92fe26ffd9f6fae30399d4984e1ab22822"
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -1654,16 +1650,6 @@ gauge@~2.7.1:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
 geojson-area@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/geojson-area/-/geojson-area-0.1.0.tgz#d48d807082cfadf4a78df1349be50f38bf1894ae"
@@ -1775,14 +1761,16 @@ grid-index@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.0.0.tgz#ad2c5d54ce5b35437faff1d70a9aeb3d1d261110"
 
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
   dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
 
 has-ansi@^2.0.0:
   version "2.0.0"
@@ -1952,8 +1940,8 @@ is-binary-path@^1.0.0:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.0.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
@@ -1997,15 +1985,6 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
-is-my-json-valid@^2.12.4:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
@@ -2032,10 +2011,6 @@ is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
@@ -2089,8 +2064,8 @@ js-tokens@^3.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
 js-yaml@^3.4.3, js-yaml@^3.5.3:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628"
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721"
   dependencies:
     argparse "^1.0.7"
     esprima "^3.1.1"
@@ -2140,10 +2115,6 @@ jsonlint-lines-primitives@~1.6.0:
     JSV ">= 4.0.x"
     nomnom ">= 1.5.x"
 
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
 jsprim@^1.2.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252"
@@ -2613,8 +2584,8 @@ nopt@~3.0.6:
     abbrev "1"
 
 normalize-package-data@^2.3.2:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -2881,6 +2852,10 @@ pbkdf2@^3.0.3:
   dependencies:
     create-hmac "^1.1.2"
 
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -2977,9 +2952,9 @@ punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-qs@~6.3.0:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.1.tgz#918c0b3bcd36679772baf135b1acb4c1651ed79d"
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
 querystring-es3@^0.2.0:
   version "0.2.1"
@@ -3175,17 +3150,17 @@ repeating@^2.0.0:
     is-finite "^1.0.0"
 
 request@^2.39.0, request@^2.74.0, request@^2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
-    caseless "~0.11.0"
+    caseless "~0.12.0"
     combined-stream "~1.0.5"
     extend "~3.0.0"
     forever-agent "~0.6.1"
     form-data "~2.1.1"
-    har-validator "~2.0.6"
+    har-validator "~4.2.1"
     hawk "~3.1.3"
     http-signature "~1.1.0"
     is-typedarray "~1.0.0"
@@ -3193,10 +3168,12 @@ request@^2.39.0, request@^2.74.0, request@^2.79.0:
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.7"
     oauth-sign "~0.8.1"
-    qs "~6.3.0"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
     stringstream "~0.0.4"
     tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
+    tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
 require-directory@^2.1.1:
@@ -3266,6 +3243,10 @@ rxjs@^5.0.0-beta.11:
   dependencies:
     symbol-observable "^1.0.1"
 
+safe-buffer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -3413,8 +3394,8 @@ snyk-try-require@^1.1.1, snyk-try-require@^1.2.0:
     then-fs "^2.0.0"
 
 snyk@^1.14.3:
-  version "1.25.1"
-  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.25.1.tgz#a034bbff29bb58f0ff7609aa8c90540a803a7b4a"
+  version "1.25.2"
+  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.25.2.tgz#6fb9801029255fb7e7d91fe1d43889eeea6ca01a"
   dependencies:
     abbrev "^1.0.7"
     ansi-escapes "^1.3.0"
@@ -3745,9 +3726,11 @@ tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
@@ -3764,10 +3747,9 @@ typedarray@^0.0.6, typedarray@~0.0.5:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
 uglify-js@^2.7.5:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.4.tgz#5aeb6fd6f1f0a672dea63795016590502c290513"
+  version "2.8.12"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.12.tgz#8a50f5d482243650b7108f6080aa3a6afe2a6c55"
   dependencies:
-    async "~0.2.6"
     source-map "~0.5.1"
     uglify-to-browserify "~1.0.0"
     yargs "~3.10.0"
@@ -3944,8 +3926,8 @@ webStorage@^1.2.2:
     gr-event-dispatcher "^1.1.1"
 
 webpack-sources@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
   dependencies:
     source-list-map "~0.1.7"
     source-map "~0.5.3"
@@ -4075,8 +4057,8 @@ y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
 yallist@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.1.tgz#6c11279640abd6ed0a86dd32ed56b03caa9df4f1"
 
 yargs-parser@^2.4.1:
   version "2.4.1"

From 7356a30c457d438faa7ca58c0a5332ea03c267c4 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon, 13 Mar 2017 10:53:07 +0000
Subject: [PATCH 12/26] We are using incrementing IDs

---
 app/Media.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/Media.php b/app/Media.php
index 61f94160..5c7370e0 100644
--- a/app/Media.php
+++ b/app/Media.php
@@ -13,13 +13,6 @@ class Media extends Model
      */
     protected $table = 'media_endpoint';
 
-    /**
-     * Our primaru key is a UUID value, therefore not incrementing.
-     *
-     * @var boolean
-     */
-    protected $incrementing = false;
-
     /**
      * Get the note that owns this media.
      */

From aca16c9d0b9131855d2d46df1b57998b71b2dc5b Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon, 13 Mar 2017 16:18:15 +0000
Subject: [PATCH 13/26] Add a config display page for the micropub client

---
 app/Http/Controllers/MicropubClientController.php | 14 ++++++++++++++
 resources/views/micropub/config.blade.php         | 14 ++++++++++++++
 resources/views/micropub/create.blade.php         |  1 +
 routes/web.php                                    |  1 +
 4 files changed, 30 insertions(+)
 create mode 100644 resources/views/micropub/config.blade.php

diff --git a/app/Http/Controllers/MicropubClientController.php b/app/Http/Controllers/MicropubClientController.php
index c2ecbc2c..d442c28f 100644
--- a/app/Http/Controllers/MicropubClientController.php
+++ b/app/Http/Controllers/MicropubClientController.php
@@ -79,6 +79,20 @@ class MicropubClientController extends Controller
         return redirect(route('micropub-client'))->with('error', 'Endpoint didn’t create the note.');
     }
 
+    /**
+     * Show currently stored configuration values.
+     *
+     * @param  Illuminate\Http\Request $request
+     * @return view
+     */
+    public function config(Request $request)
+    {
+        $data['me'] = $request->session()->get('me');
+        $data['token'] = $request->session()->get('token');
+        $data['syndication'] = $request->session()->get('syndication') ?? 'none defined';
+        return view('micropub.config', compact('data'));
+    }
+
     /**
      * We make a request to the micropub endpoint requesting syndication targets
      * and store them in the session.
diff --git a/resources/views/micropub/config.blade.php b/resources/views/micropub/config.blade.php
new file mode 100644
index 00000000..8ad97248
--- /dev/null
+++ b/resources/views/micropub/config.blade.php
@@ -0,0 +1,14 @@
+@extends('master')
+
+@section('title')
+Micropub Config «
+@stop
+
+@section('content')
+<p>The values for your micropub endpoint.</p>
+<dl>
+    <dt>Me (your url)</dt><dd>{{ $data['me'] }}</dd>
+    <dt>Token</dt><dd>{{ $data['token'] }}</dd>
+    <dt>Syndication Targets</dt><dd>{{ $data['syndication'] }}</dd>
+</dl>
+@stop
diff --git a/resources/views/micropub/create.blade.php b/resources/views/micropub/create.blade.php
index 6cf8be4e..c170b397 100644
--- a/resources/views/micropub/create.blade.php
+++ b/resources/views/micropub/create.blade.php
@@ -20,6 +20,7 @@ New Note «
 </form>
 @else
 <p>You are authenticated as <code>{{ $url }}</code>, <a href="/logout">log out</a>.</p>
+<p>Check your <a href="{{ route('micropub-config') }}">configuration</a>.</p>
 @endif
   @include('templates.new-note-form', [
     'micropub' => true,
diff --git a/routes/web.php b/routes/web.php
index 6d0dc09a..70df1ddd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -108,6 +108,7 @@ Route::group(['domain' => config('url.longurl')], function () {
     // Micropub Client
     Route::get('micropub/create', 'MicropubClientController@create')->name('micropub-client');
     Route::post('micropub', 'MicropubClientController@store')->name('micropub-client-post');
+    Route::get('micropub/config', 'MicropubClientController@config')->name('micropub-config');
     Route::get('micropub/refresh-syndication-targets', 'MicropubClientController@refreshSyndicationTargets');
     Route::get('micropub/places', 'MicropubClientController@nearbyPlaces');
     Route::post('micropub/places', 'MicropubClientController@newPlace');

From 2df90132745f241e896668cf45f69823c0666284 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 15 Mar 2017 12:22:41 +0000
Subject: [PATCH 14/26] Add some media endpoint routes

---
 routes/web.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index 70df1ddd..364f31a9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -109,9 +109,12 @@ Route::group(['domain' => config('url.longurl')], function () {
     Route::get('micropub/create', 'MicropubClientController@create')->name('micropub-client');
     Route::post('micropub', 'MicropubClientController@store')->name('micropub-client-post');
     Route::get('micropub/config', 'MicropubClientController@config')->name('micropub-config');
-    Route::get('micropub/refresh-syndication-targets', 'MicropubClientController@refreshSyndicationTargets');
+    Route::get('micropub/query-endpoint', 'MicropubClientController@queryEndpoint')->name('micropub-query-action');
+    //Route::get('micropub/refresh-syndication-targets', 'MicropubClientController@refreshSyndicationTargets');
     Route::get('micropub/places', 'MicropubClientController@nearbyPlaces');
     Route::post('micropub/places', 'MicropubClientController@newPlace');
+    Route::post('micropub/media', 'MicropubClientController@processMedia')->name('process-media');
+    Route::get('micropub/media/clearlinks', 'MicropubClientController@clearLinks');
 
     // Micropub Endpoint
     Route::get('api/post', 'MicropubController@get');

From fa04718a75a0c5f733da5f7541e5cbd5166c0b94 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 15 Mar 2017 12:23:42 +0000
Subject: [PATCH 15/26] Process micropub endpoint config queries, and posting
 of media

---
 .../Controllers/MicropubClientController.php  | 109 +++++++++++++++++-
 1 file changed, 106 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/MicropubClientController.php b/app/Http/Controllers/MicropubClientController.php
index d442c28f..b469e98a 100644
--- a/app/Http/Controllers/MicropubClientController.php
+++ b/app/Http/Controllers/MicropubClientController.php
@@ -8,6 +8,7 @@ use App\Services\IndieAuthService;
 use Illuminate\Support\Facades\Log;
 use IndieAuth\Client as IndieClient;
 use GuzzleHttp\Client as GuzzleClient;
+use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Exception\ClientException;
 
 class MicropubClientController extends Controller
@@ -40,8 +41,60 @@ class MicropubClientController extends Controller
     {
         $url = $request->session()->get('me');
         $syndication = $request->session()->get('syndication');
+        $mediaEndpoint = $request->session()->get('media-endpoint');
+        $mediaURLs = $request->session()->get('media-links');
 
-        return view('micropub.create', compact('url', 'syndication'));
+        return view('micropub.create', compact('url', 'syndication', 'mediaEndpoint', 'mediaURLs'));
+    }
+
+    /**
+     * Process an upload to the media endpoint.
+     *
+     * @param  Illuminate\Http\Request $request
+     * @return Illuminate\Http\Response
+     */
+    public function processMedia(Request $request)
+    {
+        if ($request->hasFile('file') == false) {
+            return back();
+        }
+
+        $mediaEndpoint = $request->session()->get('media-endpoint');
+        if ($mediaEndpoint == null) {
+            return back();
+        }
+
+        $token = $request->session()->get('token');
+
+        $mediaURLs = [];
+        foreach ($request->file('file') as $file) {
+            try {
+                $response = $this->guzzleClient->request('POST', $mediaEndpoint, [
+                    'headers' => ['Authorization' => 'Bearer ' . $token],
+                    'mulitpart' => [
+                        [
+                            'name' => $file->getClientOriginalName(),
+                            'file' => fopen($file->path(), 'r'),
+                        ],
+                    ],
+                ]);
+            } catch (ClientException | ServerException $e) {
+                continue;
+            }
+
+            $mediaURLs[] = $response->header('Location');
+        }
+
+        $request->session()->put('media-links', $mediaURLs);
+
+        return redirect(route('micropub-client'));
+    }
+
+    public function clearLinks(Request $request)
+    {
+        $request->session()->forget('media-links');
+
+        return redirect(route('micropub-client'));
     }
 
     /**
@@ -90,9 +143,43 @@ class MicropubClientController extends Controller
         $data['me'] = $request->session()->get('me');
         $data['token'] = $request->session()->get('token');
         $data['syndication'] = $request->session()->get('syndication') ?? 'none defined';
+        $data['media-endpoint'] = $request->session()->get('media-endpoint') ?? 'none defined';
+
         return view('micropub.config', compact('data'));
     }
 
+    /**
+     * Query the micropub endpoint and store response in the session.
+     *
+     * @param  Illuminate\Http\Request $request
+     * @return redirect
+     */
+    public function queryEndpoint(Request $request)
+    {
+        $domain = $request->session()->get('me');
+        $token = $request->session()->get('token');
+        $micropubEndpoint = $this->indieAuthService->discoverMicropubEndpoint($domain);
+        if ($micropubEndpoint !== null) {
+            try {
+                $response = $this->guzzleClient->get($micropubEndpoint, [
+                    'headers' => ['Authorization' => 'Bearer ' . $token],
+                    'query' => 'q=config',
+                ]);
+            } catch (ClientException | ServerException $e) {
+                return back();
+            }
+            $body = (string) $response->getBody();
+
+            $syndication = $this->parseSyndicationTargets($body);
+            $request->session()->put('syndication', $syndication);
+
+            $mediaEndpoint = $this->parseMediaEndpoint($body);
+            $request->session()->put('media-endpoint', $mediaEndpoint);
+
+            return back();
+        }
+    }
+
     /**
      * We make a request to the micropub endpoint requesting syndication targets
      * and store them in the session.
@@ -352,11 +439,27 @@ class MicropubClientController extends Controller
                     'name' => $syn['name'],
                 ];
             }
-        } else {
-            $syndicateTo[] = ['target' => 'http://example.org', 'name' => 'Joe Bloggs on Example'];
         }
         if (count($syndicateTo) > 0) {
             return $syndicateTo;
         }
     }
+
+    /**
+     * Parse the media-endpoint retrieved from querying a micropub endpoint.
+     *
+     * @param  string|null
+     * @return string
+     */
+    private function parseMediaEndpoint($queryResponse = null)
+    {
+        if ($queryResponse === null) {
+            return;
+        }
+
+        $data = json_decode($queryResponse, true);
+        if (array_key_exists('media-endpoint', $data)) {
+            return $data['media-endpoint'];
+        }
+    }
 }

From 997da7a7e97aa5b95a38b158cf9d67a22e40a765 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 15 Mar 2017 12:24:06 +0000
Subject: [PATCH 16/26] Update views for the micropub client

---
 resources/views/micropub/config.blade.php     |  4 +-
 .../views/templates/new-note-form.blade.php   | 38 +++++++++++++++++--
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/resources/views/micropub/config.blade.php b/resources/views/micropub/config.blade.php
index 8ad97248..fd06d71e 100644
--- a/resources/views/micropub/config.blade.php
+++ b/resources/views/micropub/config.blade.php
@@ -9,6 +9,8 @@ Micropub Config «
 <dl>
     <dt>Me (your url)</dt><dd>{{ $data['me'] }}</dd>
     <dt>Token</dt><dd>{{ $data['token'] }}</dd>
-    <dt>Syndication Targets</dt><dd>{{ $data['syndication'] }}</dd>
+    <dt>Syndication Targets</dt><dd><ul>@foreach ($data['syndication'] as $syn)<li>{{ $syn['name'] }} ({{ $syn['target'] }})</li>@endforeach</ul></dd>
+    <dt>Media Endpoint</dt><dd>{{ $data['media-endpoint'] }}</dd>
 </dl>
+<p><a href="{{ route('micropub-query-action') }}">Re-query</a> the endpoint.</p>
 @stop
diff --git a/resources/views/templates/new-note-form.blade.php b/resources/views/templates/new-note-form.blade.php
index 50267cf9..10066955 100644
--- a/resources/views/templates/new-note-form.blade.php
+++ b/resources/views/templates/new-note-form.blade.php
@@ -22,7 +22,7 @@
   @if($syndication)
     <div>
       <label for="syndication" accesskey="s">Syndication: </label>
-      <ul class="/micropub/syndication-targets-list" name="syndication">
+      <ul name="syndication">
         @foreach($syndication as $syn)
         <li><input type="checkbox"
                    name="mp-syndicate-to[]"
@@ -35,10 +35,16 @@
       </ul>
     </div>
   @endif
-    <div>
-      <a href="/micropub/refresh-syndication-targets">Refresh Syndication Targets</a>
-    </div>
+  @if($mediaURLs)
+    <ul>
+    @foreach($mediaURLs as $mediaURL)
+      <li>{{ $mediaURL }}</li>
+    @endforeach
+    </ul>
+    <a href="/micropub/media/clearlinks">Clear media</a> 
+  @endif
 @endif
+@if(!$mediaEndpoint)
     <div>
       <label for="photo" accesskey="p">Photo: </label>
       <input type="file"
@@ -49,6 +55,7 @@
              multiple
       >
     </div>
+@endif
     <div>
       <label for="locate" accesskey="l"></label>
       <button type="button"
@@ -65,3 +72,26 @@
     </div>
   </fieldset>
 </form>
+
+@if($mediaEndpoint)
+  <form action="{{ route('process-media') }}" method="post" enctype="multipart/form-data" accept-charset="utf8" name="media-upload">
+    {{ csrf_field() }}
+    <fieldset class="note-ui">
+      <legend>Media Upload</legend>
+      <div>
+        <label for="media" accesskey="m">Media: </label>
+        <input type="file"
+               accept="audio/*,video/*,image/*,application/pdf,.md"
+               value="Upload"
+               name="file[]"
+               id="media"
+               multiple
+        >
+      </div>
+      <div>
+        <label for="kludge"></label>
+        <button type="submit" name="upload-media" id="upload-media">Upload Media</button>
+      </div>
+    </fieldset>
+  </form>
+@endif

From 16015d3f4bb40a14ad1a521c006022b5f4c84431 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 15 Mar 2017 19:16:49 +0000
Subject: [PATCH 17/26] Allow string for when there are no syndication targets

---
 resources/views/micropub/config.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/micropub/config.blade.php b/resources/views/micropub/config.blade.php
index fd06d71e..d950a41a 100644
--- a/resources/views/micropub/config.blade.php
+++ b/resources/views/micropub/config.blade.php
@@ -9,7 +9,7 @@ Micropub Config «
 <dl>
     <dt>Me (your url)</dt><dd>{{ $data['me'] }}</dd>
     <dt>Token</dt><dd>{{ $data['token'] }}</dd>
-    <dt>Syndication Targets</dt><dd><ul>@foreach ($data['syndication'] as $syn)<li>{{ $syn['name'] }} ({{ $syn['target'] }})</li>@endforeach</ul></dd>
+    <dt>Syndication Targets</dt><dd>@if(is_array($data['syndication']))<ul>@foreach ($data['syndication'] as $syn)<li>{{ $syn['name'] }} ({{ $syn['target'] }})</li>@endforeach</ul>@else{{ $data['syndication'] }}@endif</dd>
     <dt>Media Endpoint</dt><dd>{{ $data['media-endpoint'] }}</dd>
 </dl>
 <p><a href="{{ route('micropub-query-action') }}">Re-query</a> the endpoint.</p>

From 764557b96bc3a336295e3de641e9084d98ce5a0d Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 18 Mar 2017 20:09:11 +0000
Subject: [PATCH 18/26] Images can now be uploaded via the media endpoint in a
 basic way

---
 .../Controllers/MicropubClientController.php  | 28 +++++---
 app/Http/Controllers/MicropubController.php   | 42 +++++++----
 app/Http/Controllers/NotesController.php      |  7 +-
 app/Services/NoteService.php                  | 18 +++--
 composer.lock                                 | 72 +++++++++----------
 public/assets/css/app.css                     |  4 +-
 public/assets/css/app.css.map                 |  2 +-
 resources/assets/sass/note-form.scss          |  5 ++
 .../views/templates/new-note-form.blade.php   | 19 +++--
 resources/views/templates/note.blade.php      |  3 +
 10 files changed, 125 insertions(+), 75 deletions(-)

diff --git a/app/Http/Controllers/MicropubClientController.php b/app/Http/Controllers/MicropubClientController.php
index b469e98a..7305bbfc 100644
--- a/app/Http/Controllers/MicropubClientController.php
+++ b/app/Http/Controllers/MicropubClientController.php
@@ -2,14 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use App\Services\IndieAuthService;
 use Illuminate\Support\Facades\Log;
 use IndieAuth\Client as IndieClient;
 use GuzzleHttp\Client as GuzzleClient;
-use GuzzleHttp\Exception\ServerException;
-use GuzzleHttp\Exception\ClientException;
+use Illuminate\Http\{Request, Response};
+use GuzzleHttp\Exception\{ClientException, ServerException};
 
 class MicropubClientController extends Controller
 {
@@ -70,11 +68,14 @@ class MicropubClientController extends Controller
         foreach ($request->file('file') as $file) {
             try {
                 $response = $this->guzzleClient->request('POST', $mediaEndpoint, [
-                    'headers' => ['Authorization' => 'Bearer ' . $token],
-                    'mulitpart' => [
+                    'headers' => [
+                        'Authorization' => 'Bearer ' . $token,
+                    ],
+                    'multipart' => [
                         [
-                            'name' => $file->getClientOriginalName(),
-                            'file' => fopen($file->path(), 'r'),
+                            'name' => 'file',
+                            'contents' => fopen($file->path(), 'r'),
+                            'filename' => $file->getClientOriginalName(),
                         ],
                     ],
                 ]);
@@ -82,7 +83,7 @@ class MicropubClientController extends Controller
                 continue;
             }
 
-            $mediaURLs[] = $response->header('Location');
+            $mediaURLs[] = $response->getHeader('Location')[0];
         }
 
         $request->session()->put('media-links', $mediaURLs);
@@ -121,6 +122,7 @@ class MicropubClientController extends Controller
         $response = $this->postNoteRequest($request, $micropubEndpoint, $token);
 
         if ($response->getStatusCode() == 201) {
+            $request->session()->forget('media-links');
             $location = $response->getHeader('Location');
             if (is_array($location)) {
                 return redirect($location[0]);
@@ -273,6 +275,14 @@ class MicropubClientController extends Controller
                 ];
             }
         }
+        if ($request->input('media')) {
+            foreach ($request->input('media') as $media) {
+                $multipart[] = [
+                    'name' => 'photo[]',
+                    'contents' => $media,
+                ];
+            }
+        }
         $headers = [
             'Authorization' => 'Bearer ' . $token,
         ];
diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index 5b88dd43..648bbf92 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -2,15 +2,13 @@
 
 namespace App\Http\Controllers;
 
-use App\Media;
-use App\Place;
+use Illuminate\Support\Facades\Log;
+
 use Ramsey\Uuid\Uuid;
-use Illuminate\Http\Request;
-use App\Services\NoteService;
-use Illuminate\Http\Response;
-use App\Services\PlaceService;
-use App\Services\TokenService;
+use App\{Media, Place};
+use Illuminate\Http\{Request, Response};
 use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
+use App\Services\{NoteService, PlaceService, TokenService};
 
 class MicropubController extends Controller
 {
@@ -98,6 +96,18 @@ class MicropubController extends Controller
                                 }
                             }
                         }
+                        $data['photo'] = [];
+                        Log::info('Checking request for photos');
+                        Log::info($request->all());
+                        if (is_array($request->input('photo'))) {
+                            foreach ($request->input('photo') as $photo) {
+                                if (is_string($photo)) {
+                                    Log::info($photo);
+                                    //only supporting media URLs for now
+                                    $data['photo'][] = $photo;
+                                }
+                            }
+                        }
                         try {
                             $note = $this->noteService->createNote($data);
                         } catch (Exception $exception) {
@@ -185,6 +195,15 @@ class MicropubController extends Controller
                     'syndicate-to' => config('syndication.targets'),
                 ]);
             }
+
+            //nope, how about a config query?
+            if ($request->input('q') == 'config') {
+                return response()->json([
+                    'syndicate-to' => config('syndication.targets'),
+                    'media-endpoint' => route('media-endpoint'),
+                ]);
+            }
+
             //nope, how about a geo URL?
             if (substr($request->input('q'), 0, 4) === 'geo:') {
                 preg_match_all(
@@ -203,13 +222,6 @@ class MicropubController extends Controller
                     'places' => $places,
                 ]);
             }
-            //nope, how about a config query?
-            if ($request->input('q') == 'config') {
-                return response()->json([
-                    'syndicate-to' => config('syndication.targets'),
-                    'media-endpoint' => route('media-endpoint'),
-                ]);
-            }
 
             //nope, just return the token
             return response()->json([
@@ -256,7 +268,7 @@ class MicropubController extends Controller
                 $scopes = explode(' ', $tokenData->getClaim('scope'));
                 if (array_search('post', $scopes) !== false) {
                     //check media valid
-                    if ($request->file('file')->isValid()) {
+                    if ($request->hasFile('file') && $request->file('file')->isValid()) {
                         //save media
                         try {
                             $filename = Uuid::uuid4() . '.' . $request->file('file')->extension();
diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php
index 06a68e4c..2cff88bf 100644
--- a/app/Http/Controllers/NotesController.php
+++ b/app/Http/Controllers/NotesController.php
@@ -2,9 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Tag;
+use App\{Note, Tag};
 use Twitter;
-use App\Note;
 use HTMLPurifier;
 use GuzzleHttp\Client;
 use HTMLPurifier_Config;
@@ -58,6 +57,10 @@ class NotesController extends Controller
                     $note->place->icon
                 );
             }
+            /*$mediaLinks = [];
+            foreach ($note->media()->get() as $media) {
+                $mediaLinks[] = $media->url;
+            }*/
         }
 
         $homepage = ($request->path() == '/');
diff --git a/app/Services/NoteService.php b/app/Services/NoteService.php
index f5ce84b1..54f776b2 100644
--- a/app/Services/NoteService.php
+++ b/app/Services/NoteService.php
@@ -4,11 +4,10 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Note;
-use App\Place;
-use App\Jobs\SendWebMentions;
-use App\Jobs\SyndicateToTwitter;
-use App\Jobs\SyndicateToFacebook;
+use Illuminate\Support\Facades\Log;
+
+use App\{Media, Note, Place};
+use App\Jobs\{SendWebMentions, SyndicateToFacebook, SyndicateToTwitter};
 
 class NoteService
 {
@@ -55,6 +54,15 @@ class NoteService
             }
         }
         */
+        //add support for media uploaded as URLs
+        foreach ($data['photo'] as $photo) {
+            // check the media was uploaded to my endpoint
+            if (starts_with($photo, config('filesystems.disks.s3.url'))) {
+                $path = substr($photo, strlen(config('filesystems.disks.s3.url')));
+                $media = Media::where('path', ltrim($path, '/'))->firstOrFail();
+                $note->media()->save($media);
+            }
+        }
 
         $note->save();
 
diff --git a/composer.lock b/composer.lock
index 56917049..7a3ccfac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.24.2",
+            "version": "3.24.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "2b252f300de442cdb5cde18ddc118c2477972e30"
+                "reference": "2823e0a0742505f655b0cb3bcdb10844f60e6078"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2b252f300de442cdb5cde18ddc118c2477972e30",
-                "reference": "2b252f300de442cdb5cde18ddc118c2477972e30",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2823e0a0742505f655b0cb3bcdb10844f60e6078",
+                "reference": "2823e0a0742505f655b0cb3bcdb10844f60e6078",
                 "shasum": ""
             },
             "require": {
@@ -84,7 +84,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2017-03-10T21:09:41+00:00"
+            "time": "2017-03-14T00:56:44+00:00"
         },
         {
             "name": "barnabywalters/mf-cleaner",
@@ -727,16 +727,16 @@
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.9.1",
+            "version": "v4.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "de82f9845f2a0f9f27abec67d6a4958427e6f5d6"
+                "reference": "6d50e5282afdfdfc3e0ff6d192aff56c5629b3d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/de82f9845f2a0f9f27abec67d6a4958427e6f5d6",
-                "reference": "de82f9845f2a0f9f27abec67d6a4958427e6f5d6",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/6d50e5282afdfdfc3e0ff6d192aff56c5629b3d4",
+                "reference": "6d50e5282afdfdfc3e0ff6d192aff56c5629b3d4",
                 "shasum": ""
             },
             "require": {
@@ -770,7 +770,7 @@
             "keywords": [
                 "html"
             ],
-            "time": "2017-03-08T08:22:36+00:00"
+            "time": "2017-03-13T06:30:53+00:00"
         },
         {
             "name": "geo-io/interface",
@@ -1779,16 +1779,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.35",
+            "version": "1.0.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062"
+                "reference": "d9c1698582dfbfbd092ec9c5c3325f862cdb3297"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dda7f3ab94158a002d9846a97dc18ebfb7acc062",
-                "reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d9c1698582dfbfbd092ec9c5c3325f862cdb3297",
+                "reference": "d9c1698582dfbfbd092ec9c5c3325f862cdb3297",
                 "shasum": ""
             },
             "require": {
@@ -1858,7 +1858,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2017-02-09T11:33:58+00:00"
+            "time": "2017-03-18T16:02:30+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
@@ -2004,16 +2004,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.22.0",
+            "version": "1.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
+                "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
-                "reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0",
+                "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0",
                 "shasum": ""
             },
             "require": {
@@ -2078,7 +2078,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2016-11-26T00:15:39+00:00"
+            "time": "2017-03-13T07:08:03+00:00"
         },
         {
             "name": "mtdowling/cron-expression",
@@ -2285,16 +2285,16 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.9",
+            "version": "v2.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "6968531206671f94377b01dc7888d5d1b858a01b"
+                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/6968531206671f94377b01dc7888d5d1b858a01b",
-                "reference": "6968531206671f94377b01dc7888d5d1b858a01b",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
                 "shasum": ""
             },
             "require": {
@@ -2329,7 +2329,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-03-03T20:43:42+00:00"
+            "time": "2017-03-13T16:27:32+00:00"
         },
         {
             "name": "phaza/laravel-postgis",
@@ -2658,21 +2658,21 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "3.5.2",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954"
+                "reference": "0b7bdfb180e72c8d76e75a649ced67e392201458"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/5677cfe02397dd6b58c861870dfaa5d9007d3954",
-                "reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/0b7bdfb180e72c8d76e75a649ced67e392201458",
+                "reference": "0b7bdfb180e72c8d76e75a649ced67e392201458",
                 "shasum": ""
             },
             "require": {
                 "paragonie/random_compat": "^1.0|^2.0",
-                "php": ">=5.4"
+                "php": "^5.4 || ^7.0"
             },
             "replace": {
                 "rhumsaa/uuid": "self.version"
@@ -2736,7 +2736,7 @@
                 "identifier",
                 "uuid"
             ],
-            "time": "2016-11-22T19:21:44+00:00"
+            "time": "2017-03-18T15:38:09+00:00"
         },
         {
             "name": "sensiolabs/security-checker",
@@ -4731,16 +4731,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.7.15",
+            "version": "5.7.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "b99112aecc01f62acf3d81a3f59646700a1849e5"
+                "reference": "dafc78e2a7d12139b0e97078d1082326bd09363d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b99112aecc01f62acf3d81a3f59646700a1849e5",
-                "reference": "b99112aecc01f62acf3d81a3f59646700a1849e5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/dafc78e2a7d12139b0e97078d1082326bd09363d",
+                "reference": "dafc78e2a7d12139b0e97078d1082326bd09363d",
                 "shasum": ""
             },
             "require": {
@@ -4809,7 +4809,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-03-02T15:22:43+00:00"
+            "time": "2017-03-15T13:02:34+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
diff --git a/public/assets/css/app.css b/public/assets/css/app.css
index a97bf32b..ff38139a 100644
--- a/public/assets/css/app.css
+++ b/public/assets/css/app.css
@@ -1,2 +1,2 @@
-html{box-sizing:border-box;font-size:24px}*,*::before,*::after{box-sizing:inherit}body{max-width:25em;margin:0 auto;padding-left:5px;padding-right:5px;word-wrap:break-word}#topheader{text-align:center}.h-entry{padding-top:1rem}.note{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.note-metadata{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:0.75em}.social-links{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.social-links svg{padding-left:3px}.mini-h-card img{display:inline-block;height:1rem}body>.h-card{margin-top:5px;border-top:1px solid grey}footer{margin-top:1rem}footer button{margin-left:5px}.u-comment{margin-top:1em;padding:0 1em;font-size:0.75rem}.u-comment.h-cite img{height:0.75rem}.u-comment .e-content{margin-top:0.5em;font-size:1rem}.container{position:relative;width:100%;height:0;padding-bottom:56.25%}.youtube{position:absolute;top:0;left:0;width:100%;height:100%}body{font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif}a{text-decoration:none;border-bottom:1px solid;color:blue}.social-links a{border-bottom:none}.icon{height:1em;width:auto}footer{font-size:0.5rem;text-align:center}footer p>a{border-bottom:none}.iwc-logo{width:100px;height:auto}.pagination{width:100%;height:3rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.pagination li{list-style-type:none}.note-ui{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media (min-width: 600px){.note-ui>div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;padding:0.2rem}}@media (max-width: 599px){input[name="photo[]"]{width:100%}}.note-ui label{width:5em;margin-right:0.5rem;text-align:right}.note-ui input:not([type=submit]),.note-ui textarea{-webkit-box-flex:1;-ms-flex:1;flex:1}.note-ui textarea{padding:0.1rem 0.3rem}#locate{margin-right:0.4rem}.map{margin-top:4px;height:200px}.marker{background-image:url(data:image/png;base64,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);background-size:contain;width:20px;height:20px}.map-menu{position:absolute;top:0;left:0;background:white;padding:0.4rem}.map-menu label{margin-left:3px;margin-right:3px}.contact{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-top:1em;border-bottom:1px dashed grey}.contact img{margin-right:0.2rem;width:100px;height:100px}span[role=img][aria-label],span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;max-width:5em;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}}
-/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9hcHAuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9sYXlvdXQuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9zdHlsZXMuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9wYWdpbmF0aW9uLnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3Mvbm90ZS1mb3JtLnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3MvbWFwYm94LnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3MvY29udGFjdHMuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9lbW9qaS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLEtBQ0ksc0JBQ0EsY0FBZSxDQUNsQixxQkFLRyxrQkFBbUIsQ0FDdEIsS0NWRyxlQUNBLGNBQ0EsaUJBQ0Esa0JBQ0Esb0JBQXFCLENBQ3hCLFdBR0csaUJBQWtCLENBQ3JCLFNBR0csZ0JBQWlCLENBQ3BCLE1BR0csb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsNEJBQXNCLEFBQXRCLDZCQUFzQixBQUF0QiwwQkFBc0IsQUFBdEIscUJBQXNCLENBQ3pCLGVBR0csb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EseUJBQ0EsQUFEQSxzQkFDQSxBQURBLDhCQUNBLGdCQUFpQixDQUNwQixjQUdHLG9CQUNBLEFBREEsb0JBQ0EsQUFEQSxhQUNBLHlCQUFtQixBQUFuQixzQkFBbUIsQUFBbkIsa0JBQW1CLENBQ3RCLGtCQUdHLGdCQUFpQixDQUNwQixpQkFHRyxxQkFDQSxXQUFZLENBQ2YsYUFHRyxlQUNBLHlCQUEwQixDQUM3QixPQUdHLGVBQWdCLENBQ25CLGNBR0csZUFBZ0IsQ0FDbkIsV0FHRyxlQUNBLGNBQ0EsaUJBQWtCLENBQ3JCLHNCQUdHLGNBQWUsQ0FDbEIsc0JBR0csaUJBQ0EsY0FBZSxDQUNsQixXQUdHLGtCQUNBLFdBQ0EsU0FDQSxxQkFBc0IsQ0FDekIsU0FHRyxrQkFDQSxNQUNBLE9BQ0EsV0FDQSxXQUFZLENBQ2YsS0NqRkcsNkpBV2MsQ0FDakIsRUFHRyxxQkFDQSx3QkFDQSxVQUFXLENBQ2QsZ0JBR0csa0JBQW1CLENBQ3RCLE1BR0csV0FDQSxVQUFXLENBQ2QsT0FHRyxpQkFDQSxpQkFBa0IsQ0FDckIsV0FHRyxrQkFBbUIsQ0FDdEIsVUFHRyxZQUNBLFdBQVksQ0FDZixZQzFDRyxXQUNBLFlBQ0Esb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EseUJBQ0EsQUFEQSxzQkFDQSxBQURBLDhCQUNBLHlCQUFtQixBQUFuQixzQkFBbUIsQUFBbkIsa0JBQW1CLENBQ3RCLGVBR0csb0JBQXFCLENBQ3hCLFNDVkcsb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsNEJBQXNCLEFBQXRCLDZCQUFzQixBQUF0QiwwQkFBc0IsQUFBdEIscUJBQXNCLENBQ3pCLDBCQUdHLGFBQ0ksb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EsY0FBZSxDQUNsQixDQUdMLDBCQUNJLHNCQUNJLFVBQVcsQ0FDZCxDQUdMLGVBQ0ksVUFDQSxvQkFDQSxnQkFBaUIsQ0FDcEIsb0RBSUcsbUJBQU8sQUFBUCxXQUFPLEFBQVAsTUFBTyxDQUNWLGtCQUdHLHFCQUFzQixDQUN6QixRQUdHLG1CQUFvQixDQUN2QixLQ25DRyxlQUNBLFlBQWEsQ0FDaEIsUUFHRyx5NEhBQ0Esd0JBQ0EsV0FDQSxXQUFZLENBQ2YsVUFHRyxrQkFDQSxNQUNBLE9BQ0EsaUJBQ0EsY0FBZSxDQUNsQixnQkFHRyxnQkFDQSxnQkFBaUIsQ0FDcEIsU0N0Qkcsb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EsZUFDQSw2QkFBOEIsQ0FDakMsYUFHRyxvQkFDQSxZQUNBLFlBQWEsQ0FDaEIsc0RDUEcsaUJBQWtCLENBQ3JCLGdGQUlHLGtCQUNBLGNBQ0EsVUFDQSxhQUNBLE9BQ0EsY0FDQSxxQkFDQSx5QkFDQSxvQkFDQSxvQ0FDQSx5QkFDQSxrQ0FDQSxXQUNBLGNBQ0EsMENBQWtDLEFBQWxDLGlDQUFrQyxDQUNyQywyQkFHRyxLQUNJLGFBQ0EsNkJBQ0Esd0NBQ0EsMEJBQ0EscUJBQWtDLENBR3RDLEdBQ0ksYUFDQSxrQ0FDQSx5QkFDQSxXQUNBLG1DQUFnRCxDQUFBLENBSXhELEFBcEJDLG1CQUdHLEtBQ0ksYUFDQSw2QkFDQSx3Q0FDQSwwQkFDQSxxQkFBa0MsQ0FHdEMsR0FDSSxhQUNBLGtDQUNBLHlCQUNBLFdBQ0EsbUNBQWdELENBQUEsQ0FJeEQsYUFDSSxrQ0FDSSxrQ0FBbUMsQ0FDdEMsQ0FBQSIsImZpbGUiOiJhcHAuY3NzIn0= */
\ No newline at end of file
+html{box-sizing:border-box;font-size:24px}*,*::before,*::after{box-sizing:inherit}body{max-width:25em;margin:0 auto;padding-left:5px;padding-right:5px;word-wrap:break-word}#topheader{text-align:center}.h-entry{padding-top:1rem}.note{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.note-metadata{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:0.75em}.social-links{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.social-links svg{padding-left:3px}.mini-h-card img{display:inline-block;height:1rem}body>.h-card{margin-top:5px;border-top:1px solid grey}footer{margin-top:1rem}footer button{margin-left:5px}.u-comment{margin-top:1em;padding:0 1em;font-size:0.75rem}.u-comment.h-cite img{height:0.75rem}.u-comment .e-content{margin-top:0.5em;font-size:1rem}.container{position:relative;width:100%;height:0;padding-bottom:56.25%}.youtube{position:absolute;top:0;left:0;width:100%;height:100%}body{font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif}a{text-decoration:none;border-bottom:1px solid;color:blue}.social-links a{border-bottom:none}.icon{height:1em;width:auto}footer{font-size:0.5rem;text-align:center}footer p>a{border-bottom:none}.iwc-logo{width:100px;height:auto}.pagination{width:100%;height:3rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.pagination li{list-style-type:none}.note-ui{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media (min-width: 600px){.note-ui>div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;padding:0.2rem}}@media (max-width: 599px){input[name="photo[]"]{width:100%}}.note-ui label{width:5em;margin-right:0.5rem;text-align:right}.note-ui input:not([type=submit]),.note-ui textarea{-webkit-box-flex:1;-ms-flex:1;flex:1}.note-ui textarea{padding:0.1rem 0.3rem}#locate{margin-right:0.4rem}.mp-media img{height:4em;width:4em}.map{margin-top:4px;height:200px}.marker{background-image:url(data:image/png;base64,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);background-size:contain;width:20px;height:20px}.map-menu{position:absolute;top:0;left:0;background:white;padding:0.4rem}.map-menu label{margin-left:3px;margin-right:3px}.contact{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-top:1em;border-bottom:1px dashed grey}.contact img{margin-right:0.2rem;width:100px;height:100px}span[role=img][aria-label],span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;max-width:5em;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}}
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9hcHAuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9sYXlvdXQuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9zdHlsZXMuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9wYWdpbmF0aW9uLnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3Mvbm90ZS1mb3JtLnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3MvbWFwYm94LnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3MvY29udGFjdHMuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9lbW9qaS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLEtBQ0ksc0JBQ0EsY0FBZSxDQUNsQixxQkFLRyxrQkFBbUIsQ0FDdEIsS0NWRyxlQUNBLGNBQ0EsaUJBQ0Esa0JBQ0Esb0JBQXFCLENBQ3hCLFdBR0csaUJBQWtCLENBQ3JCLFNBR0csZ0JBQWlCLENBQ3BCLE1BR0csb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsNEJBQXNCLEFBQXRCLDZCQUFzQixBQUF0QiwwQkFBc0IsQUFBdEIscUJBQXNCLENBQ3pCLGVBR0csb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EseUJBQ0EsQUFEQSxzQkFDQSxBQURBLDhCQUNBLGdCQUFpQixDQUNwQixjQUdHLG9CQUNBLEFBREEsb0JBQ0EsQUFEQSxhQUNBLHlCQUFtQixBQUFuQixzQkFBbUIsQUFBbkIsa0JBQW1CLENBQ3RCLGtCQUdHLGdCQUFpQixDQUNwQixpQkFHRyxxQkFDQSxXQUFZLENBQ2YsYUFHRyxlQUNBLHlCQUEwQixDQUM3QixPQUdHLGVBQWdCLENBQ25CLGNBR0csZUFBZ0IsQ0FDbkIsV0FHRyxlQUNBLGNBQ0EsaUJBQWtCLENBQ3JCLHNCQUdHLGNBQWUsQ0FDbEIsc0JBR0csaUJBQ0EsY0FBZSxDQUNsQixXQUdHLGtCQUNBLFdBQ0EsU0FDQSxxQkFBc0IsQ0FDekIsU0FHRyxrQkFDQSxNQUNBLE9BQ0EsV0FDQSxXQUFZLENBQ2YsS0NqRkcsNkpBV2MsQ0FDakIsRUFHRyxxQkFDQSx3QkFDQSxVQUFXLENBQ2QsZ0JBR0csa0JBQW1CLENBQ3RCLE1BR0csV0FDQSxVQUFXLENBQ2QsT0FHRyxpQkFDQSxpQkFBa0IsQ0FDckIsV0FHRyxrQkFBbUIsQ0FDdEIsVUFHRyxZQUNBLFdBQVksQ0FDZixZQzFDRyxXQUNBLFlBQ0Esb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EseUJBQ0EsQUFEQSxzQkFDQSxBQURBLDhCQUNBLHlCQUFtQixBQUFuQixzQkFBbUIsQUFBbkIsa0JBQW1CLENBQ3RCLGVBR0csb0JBQXFCLENBQ3hCLFNDVkcsb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsNEJBQXNCLEFBQXRCLDZCQUFzQixBQUF0QiwwQkFBc0IsQUFBdEIscUJBQXNCLENBQ3pCLDBCQUdHLGFBQ0ksb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EsY0FBZSxDQUNsQixDQUdMLDBCQUNJLHNCQUNJLFVBQVcsQ0FDZCxDQUdMLGVBQ0ksVUFDQSxvQkFDQSxnQkFBaUIsQ0FDcEIsb0RBSUcsbUJBQU8sQUFBUCxXQUFPLEFBQVAsTUFBTyxDQUNWLGtCQUdHLHFCQUFzQixDQUN6QixRQUdHLG1CQUFvQixDQUN2QixjQUdHLFdBQ0EsU0FBVSxDQUNiLEtDeENHLGVBQ0EsWUFBYSxDQUNoQixRQUdHLHk0SEFDQSx3QkFDQSxXQUNBLFdBQVksQ0FDZixVQUdHLGtCQUNBLE1BQ0EsT0FDQSxpQkFDQSxjQUFlLENBQ2xCLGdCQUdHLGdCQUNBLGdCQUFpQixDQUNwQixTQ3RCRyxvQkFDQSxBQURBLG9CQUNBLEFBREEsYUFDQSw4QkFDQSxBQURBLDZCQUNBLEFBREEsdUJBQ0EsQUFEQSxtQkFDQSxlQUNBLDZCQUE4QixDQUNqQyxhQUdHLG9CQUNBLFlBQ0EsWUFBYSxDQUNoQixzRENQRyxpQkFBa0IsQ0FDckIsZ0ZBSUcsa0JBQ0EsY0FDQSxVQUNBLGFBQ0EsT0FDQSxjQUNBLHFCQUNBLHlCQUNBLG9CQUNBLG9DQUNBLHlCQUNBLGtDQUNBLFdBQ0EsY0FDQSwwQ0FBa0MsQUFBbEMsaUNBQWtDLENBQ3JDLDJCQUdHLEtBQ0ksYUFDQSw2QkFDQSx3Q0FDQSwwQkFDQSxxQkFBa0MsQ0FHdEMsR0FDSSxhQUNBLGtDQUNBLHlCQUNBLFdBQ0EsbUNBQWdELENBQUEsQ0FJeEQsQUFwQkMsbUJBR0csS0FDSSxhQUNBLDZCQUNBLHdDQUNBLDBCQUNBLHFCQUFrQyxDQUd0QyxHQUNJLGFBQ0Esa0NBQ0EseUJBQ0EsV0FDQSxtQ0FBZ0QsQ0FBQSxDQUl4RCxhQUNJLGtDQUNJLGtDQUFtQyxDQUN0QyxDQUFBIiwiZmlsZSI6ImFwcC5jc3MifQ== */
\ No newline at end of file
diff --git a/public/assets/css/app.css.map b/public/assets/css/app.css.map
index 9b81d251..20b8d057 100644
--- a/public/assets/css/app.css.map
+++ b/public/assets/css/app.css.map
@@ -12,5 +12,5 @@
 		"../../../resources/assets/sass/emoji.scss"
 	],
 	"names": [],
-	"mappings": "AAIA,AAAA,IAAI,AAAC,CACD,UAAU,CAAE,UAAU,CACtB,SAAS,CAAE,IAAI,CAClB,AAED,AAAA,CAAC,CACD,AAAA,CAAC,AAAA,QAAQ,CACT,AAAA,CAAC,AAAA,OAAO,AAAC,CACL,UAAU,CAAE,OAAO,CACtB,ACXD,AAAA,IAAI,AAAC,CACD,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,MAAM,CACd,YAAY,CAAE,GAAG,CACjB,aAAa,CAAE,GAAG,CAClB,SAAS,CAAE,UAAU,CACxB,AAED,AAAA,UAAU,AAAC,CACP,UAAU,CAAE,MAAM,CACrB,AAED,AAAA,QAAQ,AAAC,CACL,WAAW,CAAE,IAAI,CACpB,AAED,AAAA,KAAK,AAAC,CACF,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,MAAM,CACzB,AAED,AAAA,cAAc,AAAC,CACX,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,GAAG,CACnB,eAAe,CAAE,aAAa,CAC9B,SAAS,CAAE,MAAM,CACpB,AAED,AAAA,aAAa,AAAC,CACV,OAAO,CAAE,IAAI,CACb,WAAW,CAAE,MAAM,CACtB,AAED,AAAc,aAAD,CAAC,GAAG,AAAC,CACd,YAAY,CAAE,GAAG,CACpB,AAED,AAAa,YAAD,CAAC,GAAG,AAAC,CACb,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,IAAI,CACf,AAED,AAAO,IAAH,CAAG,OAAO,AAAC,CACX,UAAU,CAAE,GAAG,CACf,UAAU,CAAE,cAAc,CAC7B,AAED,AAAA,MAAM,AAAC,CACH,UAAU,CAAE,IAAI,CACnB,AAED,AAAO,MAAD,CAAC,MAAM,AAAC,CACV,WAAW,CAAE,GAAG,CACnB,AAED,AAAA,UAAU,AAAC,CACP,UAAU,CAAE,GAAG,CACf,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,OAAO,CACrB,AAED,AAAkB,UAAR,AAAA,OAAO,CAAC,GAAG,AAAC,CAClB,MAAM,CAAE,OAAO,CAClB,AAED,AAAW,UAAD,CAAC,UAAU,AAAC,CAClB,UAAU,CAAE,KAAK,CACjB,SAAS,CAAE,IAAI,CAClB,AAED,AAAA,UAAU,AAAC,CACP,QAAQ,CAAE,QAAQ,CAClB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,CAAC,CACT,cAAc,CAAE,MAAM,CACzB,AAED,AAAA,QAAQ,AAAC,CACL,QAAQ,CAAE,QAAQ,CAClB,GAAG,CAAE,CAAC,CACN,IAAI,CAAE,CAAC,CACP,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACf,ACnFD,AAAA,IAAI,AAAC,CAED,WAAW,CACP,iJAUU,CACjB,AAED,AAAA,CAAC,AAAC,CACE,eAAe,CAAE,IAAI,CACrB,aAAa,CAAE,SAAS,CACxB,KAAK,CAAE,IAAI,CACd,AAED,AAAc,aAAD,CAAC,CAAC,AAAC,CACZ,aAAa,CAAE,IAAI,CACtB,AAED,AAAA,KAAK,AAAC,CACF,MAAM,CAAE,GAAG,CACX,KAAK,CAAE,IAAI,CACd,AAED,AAAA,MAAM,AAAC,CACH,SAAS,CAAE,MAAM,CACjB,UAAU,CAAE,MAAM,CACrB,AAED,AAAW,MAAL,CAAC,CAAC,CAAG,CAAC,AAAC,CACT,aAAa,CAAE,IAAI,CACtB,AAED,AAAA,SAAS,AAAC,CACN,KAAK,CAAE,KAAK,CACZ,MAAM,CAAE,IAAI,CACf,AC3CD,AAAA,WAAW,AAAC,CACR,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,GAAG,CACnB,eAAe,CAAE,aAAa,CAC9B,WAAW,CAAE,MAAM,CACtB,AAED,AAAY,WAAD,CAAC,EAAE,AAAC,CACX,eAAe,CAAE,IAAI,CACxB,ACXD,AAAA,QAAQ,AAAC,CACL,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,MAAM,CACzB,AAED,MAAM,EAAE,SAAS,EAAE,KAAK,EACpB,AAAW,QAAH,CAAG,GAAG,AAAC,CACX,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,GAAG,CACnB,OAAO,CAAE,MAAM,CAClB,CAGL,MAAM,EAAE,SAAS,EAAE,KAAK,EACpB,AAAA,KAAK,CAAA,AAAA,IAAC,CAAK,SAAS,AAAd,CAAgB,CAClB,KAAK,CAAE,IAAI,CACd,CAGL,AAAS,QAAD,CAAC,KAAK,AAAC,CACX,KAAK,CAAE,GAAG,CACV,YAAY,CAAE,MAAM,CACpB,UAAU,CAAE,KAAK,CACpB,AAED,AAAS,QAAD,CAAC,KAAK,AAAA,IAAK,EAAA,AAAA,AAAA,IAAC,CAAD,MAAC,AAAA,GACpB,AAAS,QAAD,CAAC,QAAQ,AAAC,CACd,IAAI,CAAE,CAAC,CACV,AAED,AAAS,QAAD,CAAC,QAAQ,AAAC,CACd,OAAO,CAAE,aAAa,CACzB,AAED,AAAA,OAAO,AAAC,CACJ,YAAY,CAAE,MAAM,CACvB,ACpCD,AAAA,IAAI,AAAC,CACD,UAAU,CAAE,GAAG,CACf,MAAM,CAAE,KAAK,CAChB,AAED,AAAA,OAAO,AAAC,CACJ,gBAAgB,CAAE,u3HAAu3H,CACz4H,eAAe,CAAE,OAAO,CACxB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACf,AAED,AAAA,SAAS,AAAC,CACN,QAAQ,CAAE,QAAQ,CAClB,GAAG,CAAE,CAAC,CACN,IAAI,CAAE,CAAC,CACP,UAAU,CAAE,KAAK,CACjB,OAAO,CAAE,MAAM,CAClB,AAED,AAAU,SAAD,CAAC,KAAK,AAAC,CACZ,WAAW,CAAE,GAAG,CAChB,YAAY,CAAE,GAAG,CACpB,ACvBD,AAAA,QAAQ,AAAC,CACL,OAAO,CAAE,IAAI,CACb,cAAc,CAAE,GAAG,CACnB,UAAU,CAAE,GAAG,CACf,aAAa,CAAE,eAAe,CACjC,AAED,AAAS,QAAD,CAAC,GAAG,AAAC,CACT,YAAY,CAAE,MAAM,CACpB,KAAK,CAAE,KAAK,CACZ,MAAM,CAAE,KAAK,CAChB,ACTD,AAAA,IAAI,CAAA,AAAA,IAAC,CAAD,GAAC,AAAA,EAAS,AAAA,UAAC,AAAA,EACf,AAAA,IAAI,CAAA,AAAA,IAAC,CAAD,GAAC,AAAA,EAAS,AAAA,UAAC,AAAA,CAAY,CACvB,QAAQ,CAAE,QAAQ,CACrB,AAED,AAAA,IAAI,CAAA,AAAA,IAAC,CAAD,GAAC,AAAA,EAAS,AAAA,UAAC,AAAA,CAAW,MAAM,AAAA,OAAO,CACvC,AAAA,IAAI,CAAA,AAAA,IAAC,CAAD,GAAC,AAAA,EAAS,AAAA,UAAC,AAAA,CAAW,MAAM,AAAA,OAAO,AAAC,CACpC,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,KAAK,CACb,IAAI,CAAE,CAAC,CACP,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,MAAM,CAAC,KAAK,CAAC,IAAsB,CAC3C,aAAa,CAAE,KAAK,CACpB,UAAU,CAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAgB,CAChD,OAAO,CAAE,gBAAgB,CACzB,gBAAgB,CAAE,gBAAmB,CACrC,KAAK,CAAE,IAAsB,CAC7B,SAAS,CAAE,GAAG,CACd,SAAS,CAAE,uBAAuB,CACrC,AAED,UAAU,CAAV,OAAU,CACN,AAAA,IAAI,CACA,MAAM,CAAE,KAAK,CACb,gBAAgB,CAAE,WAAgB,CAClC,MAAM,CAAE,MAAM,CAAC,KAAK,CAAC,mBAAsB,CAC3C,KAAK,CAAE,mBAAsB,CAC7B,UAAU,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAgB,CAGtC,AAAA,EAAE,CACE,MAAM,CAAE,KAAK,CACb,gBAAgB,CAAE,gBAAmB,CACrC,MAAM,CAAE,MAAM,CAAC,KAAK,CAAC,IAAsB,CAC3C,KAAK,CAAE,IAAsB,CAC7B,UAAU,CAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAgB,EAIxD,MAAM,CAAC,KAAK,CACR,AAAA,IAAI,CAAA,AAAA,IAAC,CAAD,GAAC,AAAA,EAAS,AAAA,UAAC,AAAA,CAAW,OAAO,AAAC,CAC9B,OAAO,CAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CACtC"
+	"mappings": "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"
 }
\ No newline at end of file
diff --git a/resources/assets/sass/note-form.scss b/resources/assets/sass/note-form.scss
index 1aadfafb..e4b7ea85 100644
--- a/resources/assets/sass/note-form.scss
+++ b/resources/assets/sass/note-form.scss
@@ -37,3 +37,8 @@
 #locate {
     margin-right: 0.4rem;
 }
+
+.mp-media img {
+    height: 4em;
+    width: 4em;
+}
diff --git a/resources/views/templates/new-note-form.blade.php b/resources/views/templates/new-note-form.blade.php
index 10066955..d21ac3a4 100644
--- a/resources/views/templates/new-note-form.blade.php
+++ b/resources/views/templates/new-note-form.blade.php
@@ -22,7 +22,7 @@
   @if($syndication)
     <div>
       <label for="syndication" accesskey="s">Syndication: </label>
-      <ul name="syndication">
+      <ul id="syndication">
         @foreach($syndication as $syn)
         <li><input type="checkbox"
                    name="mp-syndicate-to[]"
@@ -36,12 +36,21 @@
     </div>
   @endif
   @if($mediaURLs)
-    <ul>
+    <div class="mp-media">
+      <label for="media">Media:</label>
+      <ul>
     @foreach($mediaURLs as $mediaURL)
-      <li>{{ $mediaURL }}</li>
+        <li>
+          <input type="checkbox" name="media[]" id="{{ $mediaURL }}" value="{{ $mediaURL }}" checked>
+          <label for="{{ $mediaURL }}"><img src="{{ $mediaURL }}" alt=""></label>
+        </li>
     @endforeach
-    </ul>
-    <a href="/micropub/media/clearlinks">Clear media</a> 
+      </ul>
+    </div>
+    <div>
+      <label for="kludge"></label>
+      <a href="/micropub/media/clearlinks">Clear media</a>
+    </div>
   @endif
 @endif
 @if(!$mediaEndpoint)
diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php
index 625af985..8e4335cd 100644
--- a/resources/views/templates/note.blade.php
+++ b/resources/views/templates/note.blade.php
@@ -8,6 +8,9 @@
   <div class="note">
     <div class="e-content p-name">
       {!! $note->note !!}
+      @foreach($note->media()->get() as $media)
+        <img src="{{ $media->url }}" alt="">
+      @endforeach
     </div>
     <div class="note-metadata">
       <div>

From 2bef7a154b6fe2709a93acdd08d7056c8c3c2275 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 18 Mar 2017 21:02:23 +0000
Subject: [PATCH 19/26] Fix typo

---
 .../2017_03_09_155908_create_media_endpoint_table.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
index a2388065..3604f99b 100644
--- a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
+++ b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
@@ -32,7 +32,7 @@ class CreateMediaEndpointTable extends Migration
      */
     public function down()
     {
-        Scheme::table('media_endpoint', function (Blueprint $table) {
+        Schema::table('media_endpoint', function (Blueprint $table) {
             $table->dropForeign(['note_id']);
         });
         Schema::dropIfExists('media_endpoint');

From 7cb01007271e315d175b945fb27d16eab57db7f5 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 18 Mar 2017 21:17:40 +0000
Subject: [PATCH 20/26] Remove some un-needed Log commands, fix some array
 styling

---
 app/Http/Controllers/MicropubController.php | 9 ++-------
 app/Services/NoteService.php                | 2 --
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index 648bbf92..2cbf0b4d 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\Log;
-
 use Ramsey\Uuid\Uuid;
 use App\{Media, Place};
 use Illuminate\Http\{Request, Response};
@@ -97,12 +95,9 @@ class MicropubController extends Controller
                             }
                         }
                         $data['photo'] = [];
-                        Log::info('Checking request for photos');
-                        Log::info($request->all());
                         if (is_array($request->input('photo'))) {
                             foreach ($request->input('photo') as $photo) {
                                 if (is_string($photo)) {
-                                    Log::info($photo);
                                     //only supporting media URLs for now
                                     $data['photo'][] = $photo;
                                 }
@@ -276,7 +271,7 @@ class MicropubController extends Controller
                             return response()->json([
                                 'response' => 'error',
                                 'error' => 'internal_server_error',
-                                'error_description' => 'A problem occured handling your request'
+                                'error_description' => 'A problem occured handling your request',
                             ], 500);
                         }
                         try {
@@ -285,7 +280,7 @@ class MicropubController extends Controller
                             return response()->json([
                                 'response' => 'error',
                                 'error' => 'service_unavailable',
-                                'error_description' => 'Unable to save media to S3'
+                                'error_description' => 'Unable to save media to S3',
                             ], 503);
                         }
                         $media = new Media();
diff --git a/app/Services/NoteService.php b/app/Services/NoteService.php
index 54f776b2..6329b9ea 100644
--- a/app/Services/NoteService.php
+++ b/app/Services/NoteService.php
@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use Illuminate\Support\Facades\Log;
-
 use App\{Media, Note, Place};
 use App\Jobs\{SendWebMentions, SyndicateToFacebook, SyndicateToTwitter};
 

From 031e528c63570a415a53d259ee29c97fb77ac7c7 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 18 Mar 2017 21:18:02 +0000
Subject: [PATCH 21/26] Allow grouped use statements, hopefully

---
 .styleci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.styleci.yml b/.styleci.yml
index c46055c0..5e728eb1 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -3,6 +3,7 @@ preset: laravel
 disabled:
   - concat_without_spaces
   - simplified_null_return
+  - single_import_per_statement
 
 finder:
   path: app/

From d14c5a8f973cf012dbbce74c591fa9730aefe800 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 18 Mar 2017 21:18:36 +0000
Subject: [PATCH 22/26] Apply fixes from StyleCI

---
 app/Http/Controllers/MicropubController.php | 2 +-
 app/Http/Controllers/NotesController.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index 2cbf0b4d..b2219267 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -318,7 +318,7 @@ class MicropubController extends Controller
         return response()->json([
             'response' => 'error',
             'error' => 'no_token',
-            'error_description' => 'There was no token provided with the request'
+            'error_description' => 'There was no token provided with the request',
         ], 400);
     }
 }
diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php
index 2cff88bf..0b8ae808 100644
--- a/app/Http/Controllers/NotesController.php
+++ b/app/Http/Controllers/NotesController.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\{Note, Tag};
 use Twitter;
 use HTMLPurifier;
+use App\{Note, Tag};
 use GuzzleHttp\Client;
 use HTMLPurifier_Config;
 use Illuminate\Http\Request;

From f9c98108db3839f8b0f58fe5b11e1c1a2d9316b5 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sat, 18 Mar 2017 21:39:13 +0000
Subject: [PATCH 23/26] Remove test associated with removed functionality

---
 tests/Browser/MicropubClientTest.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/tests/Browser/MicropubClientTest.php b/tests/Browser/MicropubClientTest.php
index 25cece44..69562e53 100644
--- a/tests/Browser/MicropubClientTest.php
+++ b/tests/Browser/MicropubClientTest.php
@@ -33,15 +33,4 @@ class MicropubClientTest extends DuskTestCase
         $newNote = \App\Note::where('note', $note)->first();
         $newNote->forceDelete();
     }
-
-    public function test_client_page_updates_syndication()
-    {
-        $this->browse(function ($browser) {
-            $browser->visit(route('micropub-client'))
-                    ->assertDontSee('jonnybarnes on Twitter')
-                    ->clickLink('Refresh Syndication Targets')
-                    ->pause(5000)
-                    ->assertSee('jonnybarnes on Twitter');
-        });
-    }
 }

From 8a79204a20ade285ec46e685e42174656c6807bc Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sun, 19 Mar 2017 10:04:48 +0000
Subject: [PATCH 24/26] Add storing media type, so that we can use use right
 tag, such as img, or video in the view

---
 app/Http/Controllers/MicropubController.php   | 47 ++++++++++++++++++-
 ..._09_155908_create_media_endpoint_table.php |  1 +
 resources/views/templates/note.blade.php      |  5 +-
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/MicropubController.php b/app/Http/Controllers/MicropubController.php
index b2219267..e414da3d 100644
--- a/app/Http/Controllers/MicropubController.php
+++ b/app/Http/Controllers/MicropubController.php
@@ -264,7 +264,7 @@ class MicropubController extends Controller
                 if (array_search('post', $scopes) !== false) {
                     //check media valid
                     if ($request->hasFile('file') && $request->file('file')->isValid()) {
-                        //save media
+                        $type = $this->getFileTypeFromMimeType($request->file('file')->getMimeType());
                         try {
                             $filename = Uuid::uuid4() . '.' . $request->file('file')->extension();
                         } catch (UnsatisfiedDependencyException $e) {
@@ -286,6 +286,7 @@ class MicropubController extends Controller
                         $media = new Media();
                         $media->token = $token;
                         $media->path = $path;
+                        $media->type = $type;
                         $media->save();
 
                         return response()->json([
@@ -321,4 +322,48 @@ class MicropubController extends Controller
             'error_description' => 'There was no token provided with the request',
         ], 400);
     }
+
+    /**
+     * Get the file type from the mimetype of the uploaded file.
+     *
+     * @param  string The mimetype
+     * @return string The type
+     */
+    private function getFileTypeFromMimeType($mimetype)
+    {
+        //try known images
+        $imageMimeTypes = [
+            'image/gif',
+            'image/jpeg',
+            'image/png',
+            'image/svg+xml',
+            'image/tiff',
+            'image/webp',
+        ];
+        if (in_array($mimetype, $imageMimeTypes)) {
+            return 'image';
+        }
+        //try known video
+        $videoMimeTypes = [
+            'video/mp4',
+            'video/mpeg',
+            'video/quicktime',
+            'video/webm',
+        ];
+        if (in_array($mimetype, $videoMimeTypes)) {
+            return 'video';
+        }
+        //try known audio types
+        $audioMimeTypes = [
+            'audio/midi',
+            'audio/mpeg',
+            'audio/ogg',
+            'audio/x-m4a',
+        ];
+        if (in_array($mimetype, $audioMimeTypes)) {
+            return 'audio';
+        }
+
+        return 'download';
+    }
 }
diff --git a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
index 3604f99b..39de17f7 100644
--- a/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
+++ b/database/migrations/2017_03_09_155908_create_media_endpoint_table.php
@@ -17,6 +17,7 @@ class CreateMediaEndpointTable extends Migration
             $table->increments('id');
             $table->text('token')->nullable();
             $table->string('path');
+            $table->string('type');
             $table->unsignedInteger('note_id')->nullable();
             $table->timestamps();
 
diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php
index 8e4335cd..5e9d3cb3 100644
--- a/resources/views/templates/note.blade.php
+++ b/resources/views/templates/note.blade.php
@@ -9,7 +9,10 @@
     <div class="e-content p-name">
       {!! $note->note !!}
       @foreach($note->media()->get() as $media)
-        <img src="{{ $media->url }}" alt="">
+        @if($media->type == 'image')<img class="u-photo" src="{{ $media->url }}" alt="">@endif
+        @if($media->type == 'audio')<audio class="u-audio" src="{{ $media->url }}" controls>@endif
+        @if($media->type == 'video')<video class="u-video" src="{{ $media->url }}" controls>@endif
+        @if($media->type == 'download')<p><a class="u-attachment" href="{{ $media->url }}">Download the attached media</a></p>@endif
       @endforeach
     </div>
     <div class="note-metadata">

From 191c0870c038d40de88fc5e7d9ddd2784bd2bb81 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sun, 19 Mar 2017 15:19:12 +0000
Subject: [PATCH 25/26] Allow multiple images to be uploaded via the media
 endpoint

---
 .../Controllers/MicropubClientController.php  |   4 +-
 public/assets/css/app.css                     |   4 +-
 public/assets/css/app.css.br                  | Bin 4387 -> 4467 bytes
 public/assets/css/app.css.gz                  | Bin 4653 -> 4712 bytes
 public/assets/css/app.css.map                 |   2 +-
 resources/assets/sass/note-form.scss          |   4 +
 yarn.lock                                     | 136 +++++++++---------
 7 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/app/Http/Controllers/MicropubClientController.php b/app/Http/Controllers/MicropubClientController.php
index 7305bbfc..7cc5877a 100644
--- a/app/Http/Controllers/MicropubClientController.php
+++ b/app/Http/Controllers/MicropubClientController.php
@@ -86,7 +86,9 @@ class MicropubClientController extends Controller
             $mediaURLs[] = $response->getHeader('Location')[0];
         }
 
-        $request->session()->put('media-links', $mediaURLs);
+        $storedMediaURLs = $request->session()->get('media-links') ?? [];
+        $mediaURLsToSave = array_merge($storedMediaURLs, $mediaURLs);
+        $request->session()->put('media-links', $mediaURLsToSave);
 
         return redirect(route('micropub-client'));
     }
diff --git a/public/assets/css/app.css b/public/assets/css/app.css
index ff38139a..4c0b46bc 100644
--- a/public/assets/css/app.css
+++ b/public/assets/css/app.css
@@ -1,2 +1,2 @@
-html{box-sizing:border-box;font-size:24px}*,*::before,*::after{box-sizing:inherit}body{max-width:25em;margin:0 auto;padding-left:5px;padding-right:5px;word-wrap:break-word}#topheader{text-align:center}.h-entry{padding-top:1rem}.note{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.note-metadata{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:0.75em}.social-links{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.social-links svg{padding-left:3px}.mini-h-card img{display:inline-block;height:1rem}body>.h-card{margin-top:5px;border-top:1px solid grey}footer{margin-top:1rem}footer button{margin-left:5px}.u-comment{margin-top:1em;padding:0 1em;font-size:0.75rem}.u-comment.h-cite img{height:0.75rem}.u-comment .e-content{margin-top:0.5em;font-size:1rem}.container{position:relative;width:100%;height:0;padding-bottom:56.25%}.youtube{position:absolute;top:0;left:0;width:100%;height:100%}body{font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif}a{text-decoration:none;border-bottom:1px solid;color:blue}.social-links a{border-bottom:none}.icon{height:1em;width:auto}footer{font-size:0.5rem;text-align:center}footer p>a{border-bottom:none}.iwc-logo{width:100px;height:auto}.pagination{width:100%;height:3rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.pagination li{list-style-type:none}.note-ui{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media (min-width: 600px){.note-ui>div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;padding:0.2rem}}@media (max-width: 599px){input[name="photo[]"]{width:100%}}.note-ui label{width:5em;margin-right:0.5rem;text-align:right}.note-ui input:not([type=submit]),.note-ui textarea{-webkit-box-flex:1;-ms-flex:1;flex:1}.note-ui textarea{padding:0.1rem 0.3rem}#locate{margin-right:0.4rem}.mp-media img{height:4em;width:4em}.map{margin-top:4px;height:200px}.marker{background-image:url(data:image/png;base64,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);background-size:contain;width:20px;height:20px}.map-menu{position:absolute;top:0;left:0;background:white;padding:0.4rem}.map-menu label{margin-left:3px;margin-right:3px}.contact{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-top:1em;border-bottom:1px dashed grey}.contact img{margin-right:0.2rem;width:100px;height:100px}span[role=img][aria-label],span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;max-width:5em;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}}
-/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9hcHAuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9sYXlvdXQuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9zdHlsZXMuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9wYWdpbmF0aW9uLnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3Mvbm90ZS1mb3JtLnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3MvbWFwYm94LnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3MvY29udGFjdHMuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9lbW9qaS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLEtBQ0ksc0JBQ0EsY0FBZSxDQUNsQixxQkFLRyxrQkFBbUIsQ0FDdEIsS0NWRyxlQUNBLGNBQ0EsaUJBQ0Esa0JBQ0Esb0JBQXFCLENBQ3hCLFdBR0csaUJBQWtCLENBQ3JCLFNBR0csZ0JBQWlCLENBQ3BCLE1BR0csb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsNEJBQXNCLEFBQXRCLDZCQUFzQixBQUF0QiwwQkFBc0IsQUFBdEIscUJBQXNCLENBQ3pCLGVBR0csb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EseUJBQ0EsQUFEQSxzQkFDQSxBQURBLDhCQUNBLGdCQUFpQixDQUNwQixjQUdHLG9CQUNBLEFBREEsb0JBQ0EsQUFEQSxhQUNBLHlCQUFtQixBQUFuQixzQkFBbUIsQUFBbkIsa0JBQW1CLENBQ3RCLGtCQUdHLGdCQUFpQixDQUNwQixpQkFHRyxxQkFDQSxXQUFZLENBQ2YsYUFHRyxlQUNBLHlCQUEwQixDQUM3QixPQUdHLGVBQWdCLENBQ25CLGNBR0csZUFBZ0IsQ0FDbkIsV0FHRyxlQUNBLGNBQ0EsaUJBQWtCLENBQ3JCLHNCQUdHLGNBQWUsQ0FDbEIsc0JBR0csaUJBQ0EsY0FBZSxDQUNsQixXQUdHLGtCQUNBLFdBQ0EsU0FDQSxxQkFBc0IsQ0FDekIsU0FHRyxrQkFDQSxNQUNBLE9BQ0EsV0FDQSxXQUFZLENBQ2YsS0NqRkcsNkpBV2MsQ0FDakIsRUFHRyxxQkFDQSx3QkFDQSxVQUFXLENBQ2QsZ0JBR0csa0JBQW1CLENBQ3RCLE1BR0csV0FDQSxVQUFXLENBQ2QsT0FHRyxpQkFDQSxpQkFBa0IsQ0FDckIsV0FHRyxrQkFBbUIsQ0FDdEIsVUFHRyxZQUNBLFdBQVksQ0FDZixZQzFDRyxXQUNBLFlBQ0Esb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EseUJBQ0EsQUFEQSxzQkFDQSxBQURBLDhCQUNBLHlCQUFtQixBQUFuQixzQkFBbUIsQUFBbkIsa0JBQW1CLENBQ3RCLGVBR0csb0JBQXFCLENBQ3hCLFNDVkcsb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsNEJBQXNCLEFBQXRCLDZCQUFzQixBQUF0QiwwQkFBc0IsQUFBdEIscUJBQXNCLENBQ3pCLDBCQUdHLGFBQ0ksb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EsY0FBZSxDQUNsQixDQUdMLDBCQUNJLHNCQUNJLFVBQVcsQ0FDZCxDQUdMLGVBQ0ksVUFDQSxvQkFDQSxnQkFBaUIsQ0FDcEIsb0RBSUcsbUJBQU8sQUFBUCxXQUFPLEFBQVAsTUFBTyxDQUNWLGtCQUdHLHFCQUFzQixDQUN6QixRQUdHLG1CQUFvQixDQUN2QixjQUdHLFdBQ0EsU0FBVSxDQUNiLEtDeENHLGVBQ0EsWUFBYSxDQUNoQixRQUdHLHk0SEFDQSx3QkFDQSxXQUNBLFdBQVksQ0FDZixVQUdHLGtCQUNBLE1BQ0EsT0FDQSxpQkFDQSxjQUFlLENBQ2xCLGdCQUdHLGdCQUNBLGdCQUFpQixDQUNwQixTQ3RCRyxvQkFDQSxBQURBLG9CQUNBLEFBREEsYUFDQSw4QkFDQSxBQURBLDZCQUNBLEFBREEsdUJBQ0EsQUFEQSxtQkFDQSxlQUNBLDZCQUE4QixDQUNqQyxhQUdHLG9CQUNBLFlBQ0EsWUFBYSxDQUNoQixzRENQRyxpQkFBa0IsQ0FDckIsZ0ZBSUcsa0JBQ0EsY0FDQSxVQUNBLGFBQ0EsT0FDQSxjQUNBLHFCQUNBLHlCQUNBLG9CQUNBLG9DQUNBLHlCQUNBLGtDQUNBLFdBQ0EsY0FDQSwwQ0FBa0MsQUFBbEMsaUNBQWtDLENBQ3JDLDJCQUdHLEtBQ0ksYUFDQSw2QkFDQSx3Q0FDQSwwQkFDQSxxQkFBa0MsQ0FHdEMsR0FDSSxhQUNBLGtDQUNBLHlCQUNBLFdBQ0EsbUNBQWdELENBQUEsQ0FJeEQsQUFwQkMsbUJBR0csS0FDSSxhQUNBLDZCQUNBLHdDQUNBLDBCQUNBLHFCQUFrQyxDQUd0QyxHQUNJLGFBQ0Esa0NBQ0EseUJBQ0EsV0FDQSxtQ0FBZ0QsQ0FBQSxDQUl4RCxhQUNJLGtDQUNJLGtDQUFtQyxDQUN0QyxDQUFBIiwiZmlsZSI6ImFwcC5jc3MifQ== */
\ No newline at end of file
+html{box-sizing:border-box;font-size:24px}*,*::before,*::after{box-sizing:inherit}body{max-width:25em;margin:0 auto;padding-left:5px;padding-right:5px;word-wrap:break-word}#topheader{text-align:center}.h-entry{padding-top:1rem}.note{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.note-metadata{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:0.75em}.social-links{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.social-links svg{padding-left:3px}.mini-h-card img{display:inline-block;height:1rem}body>.h-card{margin-top:5px;border-top:1px solid grey}footer{margin-top:1rem}footer button{margin-left:5px}.u-comment{margin-top:1em;padding:0 1em;font-size:0.75rem}.u-comment.h-cite img{height:0.75rem}.u-comment .e-content{margin-top:0.5em;font-size:1rem}.container{position:relative;width:100%;height:0;padding-bottom:56.25%}.youtube{position:absolute;top:0;left:0;width:100%;height:100%}body{font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif}a{text-decoration:none;border-bottom:1px solid;color:blue}.social-links a{border-bottom:none}.icon{height:1em;width:auto}footer{font-size:0.5rem;text-align:center}footer p>a{border-bottom:none}.iwc-logo{width:100px;height:auto}.pagination{width:100%;height:3rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.pagination li{list-style-type:none}.note-ui{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media (min-width: 600px){.note-ui>div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;padding:0.2rem}}@media (max-width: 599px){input[name="photo[]"]{width:100%}}.note-ui label{width:5em;margin-right:0.5rem;text-align:right}.note-ui input:not([type=submit]),.note-ui textarea{-webkit-box-flex:1;-ms-flex:1;flex:1}.note-ui textarea{padding:0.1rem 0.3rem}#locate{margin-right:0.4rem}.mp-media li{list-style-type:none}.mp-media img{height:4em;width:4em}.map{margin-top:4px;height:200px}.marker{background-image:url(data:image/png;base64,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);background-size:contain;width:20px;height:20px}.map-menu{position:absolute;top:0;left:0;background:white;padding:0.4rem}.map-menu label{margin-left:3px;margin-right:3px}.contact{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;margin-top:1em;border-bottom:1px dashed grey}.contact img{margin-right:0.2rem;width:100px;height:100px}span[role=img][aria-label],span[role=img][aria-label]{position:relative}span[role=img][aria-label]:focus::after,span[role=img][aria-label]:hover::after{position:absolute;display:block;z-index:1;bottom:1.5em;left:0;max-width:5em;padding:0.5em 0.75em;border:0.05em solid #fff;border-radius:0.2em;box-shadow:0.15em 0.15em 0.5em #000;content:attr(aria-label);background-color:rgba(0,0,0,0.85);color:#fff;font-size:80%;-webkit-animation:TOOLTIP 0.1s ease-out 1;animation:TOOLTIP 0.1s ease-out 1}@-webkit-keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@keyframes TOOLTIP{from{bottom:0.5em;background-color:transparent;border:0.05em solid rgba(255,255,255,0);color:rgba(255,255,255,0);box-shadow:0 0 0 #000}to{bottom:1.5em;background-color:rgba(0,0,0,0.85);border:0.05em solid #fff;color:#fff;box-shadow:0.15em 0.15em 0.5em #000}}@media print{span[role=img][aria-label]::after{content:" (" attr(aria-label) ") "}}
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9hcHAuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9sYXlvdXQuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9zdHlsZXMuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9wYWdpbmF0aW9uLnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3Mvbm90ZS1mb3JtLnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3MvbWFwYm94LnNjc3MiLCIuLi8uLi8uLi9yZXNvdXJjZXMvYXNzZXRzL3Nhc3MvY29udGFjdHMuc2NzcyIsIi4uLy4uLy4uL3Jlc291cmNlcy9hc3NldHMvc2Fzcy9lbW9qaS5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLEtBQ0ksc0JBQ0EsY0FBZSxDQUNsQixxQkFLRyxrQkFBbUIsQ0FDdEIsS0NWRyxlQUNBLGNBQ0EsaUJBQ0Esa0JBQ0Esb0JBQXFCLENBQ3hCLFdBR0csaUJBQWtCLENBQ3JCLFNBR0csZ0JBQWlCLENBQ3BCLE1BR0csb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsNEJBQXNCLEFBQXRCLDZCQUFzQixBQUF0QiwwQkFBc0IsQUFBdEIscUJBQXNCLENBQ3pCLGVBR0csb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EseUJBQ0EsQUFEQSxzQkFDQSxBQURBLDhCQUNBLGdCQUFpQixDQUNwQixjQUdHLG9CQUNBLEFBREEsb0JBQ0EsQUFEQSxhQUNBLHlCQUFtQixBQUFuQixzQkFBbUIsQUFBbkIsa0JBQW1CLENBQ3RCLGtCQUdHLGdCQUFpQixDQUNwQixpQkFHRyxxQkFDQSxXQUFZLENBQ2YsYUFHRyxlQUNBLHlCQUEwQixDQUM3QixPQUdHLGVBQWdCLENBQ25CLGNBR0csZUFBZ0IsQ0FDbkIsV0FHRyxlQUNBLGNBQ0EsaUJBQWtCLENBQ3JCLHNCQUdHLGNBQWUsQ0FDbEIsc0JBR0csaUJBQ0EsY0FBZSxDQUNsQixXQUdHLGtCQUNBLFdBQ0EsU0FDQSxxQkFBc0IsQ0FDekIsU0FHRyxrQkFDQSxNQUNBLE9BQ0EsV0FDQSxXQUFZLENBQ2YsS0NqRkcsNkpBV2MsQ0FDakIsRUFHRyxxQkFDQSx3QkFDQSxVQUFXLENBQ2QsZ0JBR0csa0JBQW1CLENBQ3RCLE1BR0csV0FDQSxVQUFXLENBQ2QsT0FHRyxpQkFDQSxpQkFBa0IsQ0FDckIsV0FHRyxrQkFBbUIsQ0FDdEIsVUFHRyxZQUNBLFdBQVksQ0FDZixZQzFDRyxXQUNBLFlBQ0Esb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EseUJBQ0EsQUFEQSxzQkFDQSxBQURBLDhCQUNBLHlCQUFtQixBQUFuQixzQkFBbUIsQUFBbkIsa0JBQW1CLENBQ3RCLGVBR0csb0JBQXFCLENBQ3hCLFNDVkcsb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsNEJBQXNCLEFBQXRCLDZCQUFzQixBQUF0QiwwQkFBc0IsQUFBdEIscUJBQXNCLENBQ3pCLDBCQUdHLGFBQ0ksb0JBQ0EsQUFEQSxvQkFDQSxBQURBLGFBQ0EsOEJBQ0EsQUFEQSw2QkFDQSxBQURBLHVCQUNBLEFBREEsbUJBQ0EsY0FBZSxDQUNsQixDQUdMLDBCQUNJLHNCQUNJLFVBQVcsQ0FDZCxDQUdMLGVBQ0ksVUFDQSxvQkFDQSxnQkFBaUIsQ0FDcEIsb0RBSUcsbUJBQU8sQUFBUCxXQUFPLEFBQVAsTUFBTyxDQUNWLGtCQUdHLHFCQUFzQixDQUN6QixRQUdHLG1CQUFvQixDQUN2QixhQUdHLG9CQUFxQixDQUN4QixjQUdHLFdBQ0EsU0FBVSxDQUNiLEtDNUNHLGVBQ0EsWUFBYSxDQUNoQixRQUdHLHk0SEFDQSx3QkFDQSxXQUNBLFdBQVksQ0FDZixVQUdHLGtCQUNBLE1BQ0EsT0FDQSxpQkFDQSxjQUFlLENBQ2xCLGdCQUdHLGdCQUNBLGdCQUFpQixDQUNwQixTQ3RCRyxvQkFDQSxBQURBLG9CQUNBLEFBREEsYUFDQSw4QkFDQSxBQURBLDZCQUNBLEFBREEsdUJBQ0EsQUFEQSxtQkFDQSxlQUNBLDZCQUE4QixDQUNqQyxhQUdHLG9CQUNBLFlBQ0EsWUFBYSxDQUNoQixzRENQRyxpQkFBa0IsQ0FDckIsZ0ZBSUcsa0JBQ0EsY0FDQSxVQUNBLGFBQ0EsT0FDQSxjQUNBLHFCQUNBLHlCQUNBLG9CQUNBLG9DQUNBLHlCQUNBLGtDQUNBLFdBQ0EsY0FDQSwwQ0FBa0MsQUFBbEMsaUNBQWtDLENBQ3JDLDJCQUdHLEtBQ0ksYUFDQSw2QkFDQSx3Q0FDQSwwQkFDQSxxQkFBa0MsQ0FHdEMsR0FDSSxhQUNBLGtDQUNBLHlCQUNBLFdBQ0EsbUNBQWdELENBQUEsQ0FJeEQsQUFwQkMsbUJBR0csS0FDSSxhQUNBLDZCQUNBLHdDQUNBLDBCQUNBLHFCQUFrQyxDQUd0QyxHQUNJLGFBQ0Esa0NBQ0EseUJBQ0EsV0FDQSxtQ0FBZ0QsQ0FBQSxDQUl4RCxhQUNJLGtDQUNJLGtDQUFtQyxDQUN0QyxDQUFBIiwiZmlsZSI6ImFwcC5jc3MifQ== */
\ No newline at end of file
diff --git a/public/assets/css/app.css.br b/public/assets/css/app.css.br
index 075df169db299dfb41f0ab33048461e29f612d9c..25fd3179a1308dcea5b36849b95456e7515557b9 100644
GIT binary patch
literal 4467
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

literal 4387
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
K`CGnODFXn)*pYDn

diff --git a/public/assets/css/app.css.gz b/public/assets/css/app.css.gz
index 861ad285087ba6f1986707d0a75f11309d349d97..50b05659ef8f9f906ef9a2be91d428b82c92d8c6 100644
GIT binary patch
literal 4712
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

literal 4653
zcmb2|=3oE;Cgvw$tkc(6@%+<{xxQ&%wb;DfyQ>>`CY$FT)=Yd-^y7WMkxtS4-Li{4
zAO95EC9?Q+%l1`E+*3YlBu-x#tg9ZkLG=8w7eBV#F#9fluYVDX_?rv!6BJ)8o0T&C
zg~zOx&9S)&tIejIG_taD7M3osy!pbQ!OKEV;dB)5(n7_HksD<t`aV6Kw>k50fHb@7
z6pNOrpGu0IcSI<qtc^doR^!5y+ZwLgFJ=|2yw!aBYWT6Jhc8Yn%yc^4RO*(xFj0IZ
zubTEGy~B;^URy8hnES~_*1tv6+DZGO)Z75Bs<P=54~KN*rreaQzZpH}&XP6S$&clq
zyh{#YV>J@^akwdV+kN+(r{*oMD}?Lkn;Hi@?CRRL)@$L>JOjh$-{Plk5|t0Qd2f+d
zfLTXb(}u$z9-Y~~>d6!bZQrucfB&?67>!sgo|m;KIR<}QQz_uM^W1C61pix+9K4Z1
z-cy@SGa3C9(7GAM9lFRe_Ne!lihIo${Er4dj9YxK-?=@2|6AQNs{>-U7o_+`PO!dX
z%AMwDKK1*ts<H_oN;$u8C(fF+AxKlYIV`O!W8JegbDjOqu73ZvZ<bw<(3_&ymw)UF
z5J<XzW99O&4>?(T<(>37QZ8O)oxbI`aF#$+@}B!5?(OZ{A8Dr__Vb8n@hvHnlbe4x
z>yT`CkgA1L<C2tE&SP_5?^u24;dkA#=YR8FDMdFZ-aW+8<+NC<eCdKp37hBD|J0Ve
zFaP4b_QBx?zkbg!W|QAnwbyq4aZc{vmv7&W?YlPL&PPjos=Y0L*nx%D=2djcu)J^9
zwf)$Xe2VRr=#}g*(JB?(+Bue~)eF5!wqzvizis4m)6sshSar{rs}hMq%h%j=?OgZ4
z@Q#yh_{XqW6N0wYI@>D!viiBUrgf{PR?Ys$@7Ldwt2-KO|0sE~)>+Hz&ca=}_gnWa
z-_S58XL`)vzix9Ymj9p3`h#6(^~Pz9%c6ocS52Agrn;MHci$KL>0SRG{y&h;lg4r|
z)_GgKHOq53>+i2tv&=h{@t6OfIp1qjn{V3rJ{c7}tm)II+bM2xRh=Jg@Z-tXq?3o{
z*H`{MeNxB7`8*RZ=c|8NHC|u+m%i`MI4-}{+C9+w?%z9)AD-Og#dC7{cR4<xIB^*#
zTiqsqJu9i8{QlqmpKG@oX6}F9eE7oo{9@-~uBNZa7w7%jeZj%-Z~UCT*AH)ezs<d4
zYJJSM<|)?ea+aNN=nH)M<t`7)qCOjq969xXM?YUW|9W9vc3dejO2YR5ds5&I9nN>_
ztTi<5%)Na6`~9S<s(C8wy&Im!ZBPpp{@wnPb*n%~{j`t%AGnT7)z3QpYTlh2^$BXv
zThGPsIs5TJ@W%QA!+=FU;_p8D&l$UerEJFfC-JYu8U?u+fB*ku|NneF*Pf3ls{hX`
z8D9Tf-JB}h%ATXpxH@QOmT?99c2<RoLvLG>{`#tvpGswz{^{^FujG<d(|e?@>)tAU
zTjd<zwtkPA{DNoEg4e1I%T90bTfmh!;nchf*>XNN9P`@}<5dDJo^R~<BjlMQbVW93
z%RJ*R_dYl7+_&+USW$;qgzuEce*cp?)(Z8mpX#ydqg(E>!x`!)UIuBuxU3_0MNztA
zxkUPkSw?H;Zq1l+GA(Xea=iG9dtu!7J`34@YPBjAvC5Q-nXP;0eoS3YVD*dZZN4{~
zCGB0l#W#s%_szV)zx@eY`=5Chw`SU$>(yF0dE3+We?K^i{}sI09waZ_{BGjESK_Cc
zL{_X*U=xz~u6^^i9T(S!hvy&Py3Kji;^e=3)%qKgVqKM%&xre#yTj#@-rdu^uM4F1
ztp9ZG^Xel>vt0r@c*5A1m)&$>zWQO+&hpSn=heTr2`_f7f52pRuQ^RaLuJD|7lro!
z2Ksl!dd{2V|GZg$l=X2UlcDqP<X0b>?<9$E&$`^gk!1JVr^oBRwpf>23ipnSn&}F*
zUoP|Yub5X+dt&#s^?uqWihZod(>*VG_=V3udX(?-#ThT(^Q`r{u(xV`#Eo4Ij-C$x
zC3&1)v@h8D=I0Ez+i&s?M&40S+wX06s7d)1$Nv47yI%KbP10R$7_s+JzI>F~yqjNZ
zPCikZGxzJmx4x_wgSrKdFlff?YQFx`H2Tb|I|_Z@of2=(_m!XBT&R`PsQ9jK<)Q3%
z>jSg0(?2DiGL=6f_AGXu)0(HJPac;!{A_K7e66A|SA5=j_qS=W@(W5cmNJG5MO=Ja
z5!@zTnVc@6UU%nJ=_;qnHPZWK{eHOE?~?GF?jlej{KfSSS7fllIZMM;v;S0l+cxR?
zyQ7!V-yhMg)o5mXsvY?(Frz)@?)U9Gv$RDrn#0@~Z}zPbJ0kVF!%}X;H=pDwvfp$H
z<hmyB%ed{AH)C1Oq;21_p8D`)yEbj$e3!Ul*{q}YbiCKRaAE#>=6AP8@Z;SkrHpFr
z+EpD!*)s}1T(Qow*v_>1%+I}1TfcsB+5EOVur>I=w7?B&OuKAFGku$udZoB)*-8Ap
zqIu+)(c570MRM2XoW9Sd@kD#a=@6D_G7H+CwwrbpDapDVSoU7T@-N4^1NV0+JXT%$
zy6jPQ=jQFpYl`_B*RfcN96Y$fV&a!A!Y5~ayi}sef5GRp)V)K8XWyRotElmr?55-4
z#gU;WSN|-n%?#A~q!)j;M}C9gx7aBS0v2qQY;#ms*4kOvUQpQ1sr2bobDW9(OpPtq
zw&%UcHq<bmd}q7yGgr=)m!*Zjb@bn4TBlZ=I{C0o;H1At;-pkNd%Zu!&!4OCt}DP<
zoZVNa;W4LU${eRHC*qgS@^lvz-|Dx)b57NRZ+?fkA9bweeza?Dv-jSNoeAHY8UlIp
z{)=B$c1n>yaLrw6<GwU@{RumsWlf$qabNbsI#s(35itp7vps_P)9$}-j(`8nRc7zT
zwb3d^KN+fVoM?1?ekl69xM*JEdXXi4H>OYBu2HT#$vLs*MEsq;`|H=o>c;COPT1^f
zx3KomMFY(*4~{qHUzyp^FMG$7<(ENj%i2TnwGUT6Gnc$R{qX(c#jC5^MApRnOKHt9
zRkzTzedbi?EW78$iuYbupXs|BvWX}69qO5N_jk?TCv_J}g|<luN2b=v);&Lb*ErO5
zcZk2zzP#eI^B4|)Kk`;I<?3md{6$R9mcG09G>T_cM5R=DMos4wvjVkctl}$weGXo4
z_GO92&3C1FFJqWy?7QvzJ5<Ne{~6PpuX$$$c*Ottwk1k7>~}gm$>{IaSMx0Nm%Ld2
zYzyC>=B{VKj_P}MYyCdQ;aYWsnRU{+tv7F1oKE={7Jq7^`HD6c(G~CBT`^vMKxgG@
z^9{^XIpmXHF7Y{g_<4aer{0ctN6xeqX`7W5i`$(R+!!&br#@gwKz7j4b5VD8Z@Y7J
zWo&CruKkO@$3outWk>dJOqnrva`Fw|Kl^Sx`tPJA6}2<zfaae=Uk?Vq=sViF(_|K#
zWKoQVB}cZR?3`U@5fe76>|JX9@|e2*#cMq_&%a(d5@ey8d&WTXcj49g^%~i-lF@Ak
z=NUGcakR(qn%+y-?)TVNAGCe{8*LHw`(M~9_XjWkJ3~`9ZMnUUxqi@2<_&ItKh8`$
z%g0~)ZKqfL*Yz??vJW#I&za;OW%<2V=i~eHou3wePwm?=<KCpo!nvEXJU?DLx8P^T
zDqDAzj+a;F2fwLWX{(^hrEXBvcyZd+g^4je)0g{7NAL6AHSa+E?u46Ja#3Qcryqah
zvfpy4eQK%E!szy?zb9TUOL@N5YGzTH$eTkm?%TZE`JiIHrd5^SMU6{7-U$*9BxH9>
zwXlBv?aR0|ee$_e_HVw(EOz<b_h8x4f;kE7$M}`cs(+0PzxVNcOH|t>U&TEpjc=A{
zg<4u%c2Ov8Q__~7FvZqV!({=FGl##nOt^Pdll0s>llc>5<L&jlH@~-8d|l<hy;+J6
z4`|&<IuIpQ6xH_T&h#fdh62+P&gU6w6fN&nTR-X5@~4Z>_V)JI^IVPP{e5-S&36KK
z?36cZhtzd7XZ0^z6y?F(sO;Kdp!s6D^Z}_`-77gPYBMePJZ}j-$$vTF!No!YweyeI
zyj)w3?U9(D%_#2>G5Pj2#-2Mndv@D=O}lw%rDw(}x3b_ln;aHe3CEnYJ$s7Pa9&r)
z?iDP{qg>YSE57?_)m24?ny+ymKCK8p^7>=+RyLM)sq)2FE-YBEUj3|Yw$?t~t}8P)
zXqPAZ_6Rg5-3Z<m)Y$WUUSEyYTdQ9$Hj7v<fBR&8c;?jr@$lL@X^GdiQ|%vd9=^Wm
z;q@<^Q{Q%GJelm+n={4s+711zx~GSKC%jQ~3i{%GnZJ0u%+`5d3Zylc=ePfUnfya+
zA;UVa_z8tC%e9VGCe9LFH1luo=8WnstKO}DSbxK~yR{=xf#-f@*8{%SZHHOQzgKmy
z3Hh+kdZuUE-Moz0MgK$g-;Zi~_~1oFdcE?_qHWvE%&mfd3W}!$Y`P=)@<YfExxB~x
zcHfOYIjVa_Ynp%0vHqiTkVT0#WWoXk7G93S;hP0)6f`$Kt55a_X@4TUbKSa%ZHhnb
zzp`7_l;*1@&&qUJlcfG+j$!>nF}WVgd0$^S70RXxx$c>jQM*d;>~>A{bg?Z5Cc7of
zcG}rCNBmTY?>Y{y#t%OC)aLH#JJPAbXx^wdgUi!9?6%~DmW8b@O`nnlEj0E_sk?0A
znHhd@?g8e%3WhhPZ(AfjuQ5JRb4ycdy^7FG#iG?e_E`tL3_lyIsIez|<tdL8rsFGp
zib~vMj@{CZuoafniTC!JH(6)O<AU_`&jq>SufES%SaD3n+$y4ES#npwM6TWDalX@)
zUHeZidA}^WqDI_`YogTcH@m&&9Y6QfHb+bLo8~khzY8)8^GvOS*Qz%QitzkBR9$Ld
z&3)afL)3M5r>y%1-bH`9onm&qu)4D&yY}%VU2k&-dFhwQU&|R^KMt1o=F|VRUMziX
zZr>w=AM5X2f9-eUPVwFg4;kMxW#8JK@XS;B=9?vq`~S79(e&B5sq~ihG~Jh>8!t6n
zdKneh`uVS1-qMcd`ycj3MVM)K+Wz_b>qA=k=V@<4pZlM_^ZxlwfA##o%lLWruivso
zds*iDwcn?1uPWrS`gQe>n_vB`6T0~+-!BJc?OA#EgU<4@{_OATC(kMRao_q6|6b>b
z=FhGA@40SYfA?9yvxmE1#C5H?7al#EcO$#?zG+cAxOm>P<Qram?;ks}_`$RF2aoSO
zQ5pZNP(DK@r}cT(Z(;4pC%0Yt^Vs@j`nRPw{(X5AThjf~fBCJA*SG%m+h`v8?egtP
zqu1QM-{TJR-7DL+#whf&&CWG!d6zQ%R6kVh{Pfksq$)x7Yez2Mq@NAf7A9<qQ(G&^
zS=SMkE1mmB;oYrlhrL4g6qB|^M&DCRv|+Afe*Wda!xh%z`<ym~^3J&JmT++2HWQ}Z
z*OJw)?tJ4>B>zO_sjBo7-jk&VI8SMB66d_#HR&5qjE}<u`R07-?>kI?JX(;<e9SFj
z8rz)rifpnITvwk??Qk^8->{h9(8JN{MSebu->><9_ilMNf2WUo`kgBW_ApGp(PR@4
zx9-S^Jo`(A)4h(bWPDq@<&abi!}W<P?jHD=nNxhGu(LYP_=TM2GvS2#XmiFLA476C
zaUPX%KI6{(*8baW_E_<(J3{AWzIk7nE!OVzAg=iN^<5fw1DI=;<}7=#+HA@>o|?e9
zjov3i^m*q5xotbP*W{hxbYXwKqJ<^8{J*DFy;}M2?9_9CPtUFU*pndP@BO!7+q#DK
z0GoB1aqB+)6@InkO(EX{zCFF>pAMK;+s<vvNarg{GCVcgZAMexx{}4to_pl4HdooD
z_Ls(K*Hx$T2hJC+_pGdWwQgCLf934vlIH5CTq%2V55=wfCe`z``0Ib`?*?~oAOGAo
z`{gs?bNs>Kwq0iC^6LHl)iN9SrslspY#W%dJRp7LtDFmx>aKAY_@CL@S-(+stWBvr
zV0}$kajN}C<zw1BZ~lhQm@i^?ob~2wKFgHt#z(elrfd9XGzj}SgXfd+$>j}<XP76y
z+w*GonV|3Nf4Hx%H_p>Fyf^FT`FjULY^u}e&*rqAmA(7<Bk`Wi8J|DOv3s4cpL;bv
zO73j$gtS*{=YLvx$3txPp{hrQS60sTFfn=k?wQ8bs!DtPqi_E>&k>xLKe6}8^)2V#
z-{w82|HE9-?7%giIc%S@<K0)O?^?0DWXf}f-xEI_HMhGu<xRl92YM52*By`IiAY{A
z)@0FRDLDP)gJSXI`rE%2%zomX{Xj+ceoO7u>DNBaTYFn7^VGAaPOrnx2G4n%m)qJd
z@lE)Y?31fYewtM2tUNNIU8;tOYt7{PRM!{UiuYO!4m-^{*-<s6f;~U_owhsA`QsmU
an%R}#-gtlCk5|9<Gp?4MHpNkgfdK$6>nke&

diff --git a/public/assets/css/app.css.map b/public/assets/css/app.css.map
index 20b8d057..0f09c196 100644
--- a/public/assets/css/app.css.map
+++ b/public/assets/css/app.css.map
@@ -12,5 +12,5 @@
 		"../../../resources/assets/sass/emoji.scss"
 	],
 	"names": [],
-	"mappings": "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"
+	"mappings": "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"
 }
\ No newline at end of file
diff --git a/resources/assets/sass/note-form.scss b/resources/assets/sass/note-form.scss
index e4b7ea85..59255fca 100644
--- a/resources/assets/sass/note-form.scss
+++ b/resources/assets/sass/note-form.scss
@@ -38,6 +38,10 @@
     margin-right: 0.4rem;
 }
 
+.mp-media li {
+    list-style-type: none;
+}
+
 .mp-media img {
     height: 4em;
     width: 4em;
diff --git a/yarn.lock b/yarn.lock
index 4cc8de33..0bd0d349 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -163,14 +163,14 @@ asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -208,12 +208,12 @@ aws4@^1.2.1:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
 babel-cli@^6.18.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.23.0.tgz#52ff946a2b0f64645c35e7bd5eea267aa0948c0f"
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.0.tgz#a05ffd210dca0c288a26d5319c5ac8669a265ad0"
   dependencies:
-    babel-core "^6.23.0"
+    babel-core "^6.24.0"
     babel-polyfill "^6.23.0"
-    babel-register "^6.23.0"
+    babel-register "^6.24.0"
     babel-runtime "^6.22.0"
     commander "^2.8.1"
     convert-source-map "^1.1.0"
@@ -236,15 +236,15 @@ babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.21.0, babel-core@^6.23.0:
-  version "6.23.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
+babel-core@^6.21.0, babel-core@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02"
   dependencies:
     babel-code-frame "^6.22.0"
-    babel-generator "^6.23.0"
+    babel-generator "^6.24.0"
     babel-helpers "^6.23.0"
     babel-messages "^6.23.0"
-    babel-register "^6.23.0"
+    babel-register "^6.24.0"
     babel-runtime "^6.22.0"
     babel-template "^6.23.0"
     babel-traverse "^6.23.1"
@@ -260,9 +260,9 @@ babel-core@^6.21.0, babel-core@^6.23.0:
     slash "^1.0.0"
     source-map "^0.5.0"
 
-babel-generator@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5"
+babel-generator@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
@@ -375,8 +375,8 @@ babel-helpers@^6.23.0:
     babel-template "^6.23.0"
 
 babel-loader@^6.2.10:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.0.tgz#e98c239662a22533b9e7a49594ef216d7635ea28"
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
   dependencies:
     find-cache-dir "^0.1.1"
     loader-utils "^0.2.16"
@@ -491,17 +491,17 @@ babel-plugin-transform-es2015-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-modules-amd@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.22.0.tgz#bf69cd34889a41c33d90dfb740e0091ccff52f21"
+babel-plugin-transform-es2015-modules-amd@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.0.tgz#a1911fb9b7ec7e05a43a63c5995007557bcf6a2e"
   dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.0"
     babel-runtime "^6.22.0"
     babel-template "^6.22.0"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.23.0.tgz#cba7aa6379fb7ec99250e6d46de2973aaffa7b92"
+babel-plugin-transform-es2015-modules-commonjs@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.0.tgz#e921aefb72c2cc26cb03d107626156413222134f"
   dependencies:
     babel-plugin-transform-strict-mode "^6.22.0"
     babel-runtime "^6.22.0"
@@ -516,11 +516,11 @@ babel-plugin-transform-es2015-modules-systemjs@^6.22.0:
     babel-runtime "^6.22.0"
     babel-template "^6.23.0"
 
-babel-plugin-transform-es2015-modules-umd@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.23.0.tgz#8d284ae2e19ed8fe21d2b1b26d6e7e0fcd94f0f1"
+babel-plugin-transform-es2015-modules-umd@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.0.tgz#fd5fa63521cae8d273927c3958afd7c067733450"
   dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
     babel-runtime "^6.22.0"
     babel-template "^6.23.0"
 
@@ -612,9 +612,9 @@ babel-polyfill@^6.23.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-preset-es2015@^6.18.0, babel-preset-es2015@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.22.0.tgz#af5a98ecb35eb8af764ad8a5a05eb36dc4386835"
+babel-preset-es2015@^6.18.0, babel-preset-es2015@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.0.tgz#c162d68b1932696e036cd3110dc1ccd303d2673a"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-transform-es2015-arrow-functions "^6.22.0"
@@ -627,10 +627,10 @@ babel-preset-es2015@^6.18.0, babel-preset-es2015@^6.22.0:
     babel-plugin-transform-es2015-for-of "^6.22.0"
     babel-plugin-transform-es2015-function-name "^6.22.0"
     babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.22.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.0"
     babel-plugin-transform-es2015-modules-systemjs "^6.22.0"
-    babel-plugin-transform-es2015-modules-umd "^6.22.0"
+    babel-plugin-transform-es2015-modules-umd "^6.24.0"
     babel-plugin-transform-es2015-object-super "^6.22.0"
     babel-plugin-transform-es2015-parameters "^6.22.0"
     babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
@@ -655,18 +655,18 @@ babel-preset-es2017@^6.22.0:
     babel-plugin-transform-async-to-generator "^6.22.0"
 
 babel-preset-latest@^6.16.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-latest/-/babel-preset-latest-6.22.0.tgz#47b800531350a3dc69126e8c375a40655cd1eeff"
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-latest/-/babel-preset-latest-6.24.0.tgz#a68d20f509edcc5d7433a48dfaebf7e4f2cd4cb7"
   dependencies:
-    babel-preset-es2015 "^6.22.0"
+    babel-preset-es2015 "^6.24.0"
     babel-preset-es2016 "^6.22.0"
     babel-preset-es2017 "^6.22.0"
 
-babel-register@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3"
+babel-register@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd"
   dependencies:
-    babel-core "^6.23.0"
+    babel-core "^6.24.0"
     babel-runtime "^6.22.0"
     core-js "^2.4.0"
     home-or-tmp "^2.0.0"
@@ -1227,8 +1227,8 @@ date-now@^0.1.4:
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
 debug@^2.1.1, debug@^2.2.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.2.tgz#dfa96a861ee9b8c2f29349b3bcc41aa599a71e0f"
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
   dependencies:
     ms "0.7.2"
 
@@ -1466,8 +1466,8 @@ evp_bytestokey@^1.0.0:
     create-hash "^1.1.1"
 
 execa@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.0.tgz#934fc9f04a9febb4d4b449d976e92cfd95ef4f6e"
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.1.tgz#79eda42ade78c387718b0aad48e0f573b5525cde"
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -1837,8 +1837,8 @@ home-or-tmp@^2.0.0:
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz#7a0d097863d886c0fabbdcd37bf1758d8becf8a5"
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.3.1.tgz#ac439421605f0beb0ea1349de7d8bb28e50be1dd"
 
 http-signature@~1.1.0:
   version "1.1.1"
@@ -2116,9 +2116,10 @@ jsonlint-lines-primitives@~1.6.0:
     nomnom ">= 1.5.x"
 
 jsprim@^1.2.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
   dependencies:
+    assert-plus "1.0.0"
     extsprintf "1.0.2"
     json-schema "0.2.3"
     verror "1.3.6"
@@ -2163,8 +2164,8 @@ levn@~0.3.0:
     type-check "~0.3.2"
 
 lint-staged@^3.2.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-3.3.1.tgz#b725d98a2be1f82cb228069fab682f503c95234d"
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-3.4.0.tgz#52fa85dfc92bb1c6fe8ad0d0d98ca13924e03e4b"
   dependencies:
     app-root-path "^2.0.0"
     cosmiconfig "^1.1.0"
@@ -2173,7 +2174,6 @@ lint-staged@^3.2.1:
     minimatch "^3.0.0"
     npm-which "^3.0.1"
     staged-git-files "0.0.4"
-    which "^1.2.11"
 
 listr-silent-renderer@^1.1.1:
   version "1.1.1"
@@ -2785,8 +2785,8 @@ pako@~0.2.0:
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
 
 parse-asn1@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.0.0.tgz#35060f6d5015d37628c770f4e091a0b5a278bc23"
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -3026,8 +3026,8 @@ read-pkg@^1.0.0:
     path-type "^1.0.0"
 
 readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.3.tgz#9cf49463985df016c8ae8813097a9293a9b33729"
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
   dependencies:
     buffer-shims "^1.0.0"
     core-util-is "~1.0.0"
@@ -3444,12 +3444,12 @@ source-list-map@~0.1.7:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
 source-map-support@^0.4.2:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322"
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
   dependencies:
-    source-map "^0.5.3"
+    source-map "^0.5.6"
 
-"source-map@>= 0.1.2", source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.1, source-map@~0.5.3:
+"source-map@>= 0.1.2", source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
@@ -3697,8 +3697,8 @@ timers-browserify@^2.0.2:
     setimmediate "^1.0.4"
 
 tinyqueue@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-1.1.0.tgz#9c5f76f54a845f4914e754f5aa8d73ef6c011f7b"
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-1.2.2.tgz#947229e5e4197aba988acd27751dcc582e6728ff"
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
@@ -3747,8 +3747,8 @@ typedarray@^0.0.6, typedarray@~0.0.5:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
 uglify-js@^2.7.5:
-  version "2.8.12"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.12.tgz#8a50f5d482243650b7108f6080aa3a6afe2a6c55"
+  version "2.8.14"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.14.tgz#25b15d1af39b21752ee33703adbf432e8bc8f77d"
   dependencies:
     source-map "~0.5.1"
     uglify-to-browserify "~1.0.0"
@@ -3969,7 +3969,7 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@1.2.x, which@^1.2.10, which@^1.2.11, which@^1.2.9:
+which@1.2.x, which@^1.2.10, which@^1.2.9:
   version "1.2.12"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
   dependencies:
@@ -4057,8 +4057,8 @@ y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
 yallist@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.1.tgz#6c11279640abd6ed0a86dd32ed56b03caa9df4f1"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
 yargs-parser@^2.4.1:
   version "2.4.1"

From 905ddabc536fb27ccc82ea97ceca603cbea52b46 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sun, 19 Mar 2017 17:58:29 +0000
Subject: [PATCH 26/26] Update changelog

---
 changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelog.md b/changelog.md
index a6fe7f33..4d08c322 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## Version {next}
+  - Media endpoint added
+
 ## Version 0.3.6 (2017-03-07)
   - Pull in Piwik’s own piwik.js manually, again for CSP