Merge branch 'release/0.0.13.5'

app/Http/Controllers/MicropubClientController.php

@@ -166,17 +166,11 @@ class MicropubClientController extends Controller
                 ];
             }
         }
-        if ($request->input('confirmlocation')) {
+        if ($request->input('location')) {
-            $latLng = $request->input('location');
+            if ($request->input('location') !== 'no-location') {
-            $geoURL = 'geo:' . str_replace(' ', '', $latLng);
-            $multipart[] = [
-                'name' => 'location',
-                'contents' => $geoURL,
-            ];
-            if ($request->input('address') != '') {
                 $multipart[] = [
-                    'name' => 'place_name',
+                    'name' => 'location',
-                    'contents' => $request->input('address'),
+                    'contents' => $request->input('location'),
                 ];
             }
         }
@@ -319,7 +313,6 @@ class MicropubClientController extends Controller
             return response()->json([
                 'error' => true,
                 'error_description' => 'The endpoint returned a non-good response',
-                'error_stack' => $e->getMessage()
             ], 400);
         }
 

app/Http/Controllers/MicropubController.php

@@ -118,7 +118,7 @@ class MicropubController extends Controller
                 return response()->json([
                     'response' => 'error',
                     'error' => 'invalid_token',
-                    'error_description' => 'The provided token did not pass validation'
+                    'error_description' => 'The provided token did not pass validation',
                 ], 400);
             }
             //we have a valid token, is `syndicate-to` set?
@@ -149,6 +149,9 @@ class MicropubController extends Controller
                 );
                 $distance = (count($matches[0]) == 3) ? 100 * $matches[0][2] : 1000;
                 $places = Place::near($matches[0][0], $matches[0][1], $distance);
+                foreach ($places as $place) {
+                    $place->uri = config('app.url') . '/place/' . $place->slug;
+                }
 
                 return response()->json([
                     'response' => 'places',

app/Providers/AppServiceProvider.php

@@ -48,14 +48,8 @@ class AppServiceProvider extends ServiceProvider
 
         //allow micropub use in development
         if (env('APP_DEBUG') == true) {
-            $tokenService = new \App\Services\TokenService();
-            $token = $tokenService->getNewToken([
-                'me' => 'https://jonnybarnes.localhost',
-                'client_id' => 'https://jonnybarnes.localhost/notes/new',
-                'scope' => 'post'
-            ]);
             session(['me' => 'https://jonnybarnes.localhost']);
-            session(['token' => 'abc123']);
+            session(['token' => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJtZSI6Imh0dHBzOlwvXC9qb25ueWJhcm5lcy5sb2NhbGhvc3QiLCJjbGllbnRfaWQiOiJodHRwczpcL1wvam9ubnliYXJuZXMubG9jYWxob3N0XC9ub3Rlc1wvbmV3Iiwic2NvcGUiOiJwb3N0IiwiZGF0ZV9pc3N1ZWQiOjE0NzU1MTI0NDgsIm5vbmNlIjoiYzE0MzNmNzg5ZTY4Y2M1OSJ9.7Bj9yLnWJOyVre8BPihAom2G0MEsmS3tIUraDI-GRNg']);
         }
     }
 

app/Services/NoteService.php

@@ -22,14 +22,14 @@ class NoteService
         if ($request->header('Content-Type') == 'application/json') {
             $content = $request->input('properties.content')[0];
             $inReplyTo = $request->input('properties.in-reply-to')[0];
-            $placeSlug = $request->input('properties.location');
+            $place = $request->input('properties.location');
-            if (is_array($placeSlug)) {
+            if (is_array($place)) {
-                $placeSlug = $placeSlug[0];
+                $place = $place[0];
             }
         } else {
             $content = $request->input('content');
             $inReplyTo = $request->input('in-reply-to');
-            $placeSlug = $request->input('location');
+            $place = $request->input('location');
         }
 
         $note = Note::create(
@@ -40,10 +40,24 @@ class NoteService
             ]
         );
 
-        if ($placeSlug !== null && $placeSlug !== 'no-location') {
+        if ($place !== null && $place !== 'no-location') {
-            $place = Place::where('slug', '=', $placeSlug)->first();
+            if (substr($place, 0, strlen(config('app.url'))) == config('app.url')) {
-            $note->place()->associate($place);
+                //uri of form http://host/place/slug, we want slug so chop off start
-            $note->save();
+                //that’s the app’s url plus `/place/`
+                $slug = mb_substr($place, mb_strlen(config('app.url')) + 7);
+                $placeModel = Place::where('slug', '=', $slug)->first();
+                $note->place()->associate($placeModel);
+                $note->save();
+            }
+            if (substr($place, 0, 4) == 'geo:') {
+                preg_match_all(
+                    '/([0-9\.\-]+)/',
+                    $place,
+                    $matches
+                );
+                $note->location = $matches[0][0] . ', ' . $matches[0][1];
+                $note->save();
+            }
         }
 
         //add images to media library

app/Services/TokenService.php

@@ -38,9 +38,6 @@ class TokenService
      */
     public function validateToken($token)
     {
-        if (env('APP_DEBUG') == true) {
-            return true;
-        }
         $signer = new Sha256();
         try {
             $token = (new Parser())->parse((string) $token);

changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.0.13.5 (2016-10-05)
+  - Places can now be added to a new note created via micropub
+
 ## Version 0.0.13.4 (2016-10-03)
   - Better working code for places in newnote.js (issue#21)
     * In aid of this add ability to run micropub code locally

resources/assets/js/newnote.js

@@ -34,8 +34,8 @@ function addPlacesMap(latitude, longitude, uncertainty) {
             for (i = 0; i < j.places.length; ++i) {
                 var latlng = parseLocation(j.places[i].location);
                 var name = j.places[i].name;
-                var slug = j.places[i].slug;
+                var uri = j.places[i].uri;
-                places.push([name, slug, latlng[0], latlng[1]]);
+                places.push([name, uri, latlng[0], latlng[1]]);
             }
             //add a map with the nearby places
             addMap(latitude, longitude, places);