Merge branch 'feature/webmentions' into develop

app/Exceptions/Handler.php

@@ -6,6 +6,7 @@ use Exception;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Auth\Access\AuthorizationException;
+use Symfony\Component\Debug\Exception\FlattenException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
@@ -78,10 +79,11 @@ class Handler extends ExceptionHandler
         });
         $whoops->pushHandler($handler);
 
+        $flattened = FlattenException::create($exc);
         return new \Illuminate\Http\Response(
             $whoops->handleException($exc),
-            $exc->getStatusCode(),
-            $exc->getHeaders()
+            $flattened->getStatusCode(),
+            $flattened->getHeaders()
         );
     }
 }

app/Http/Controllers/NotesAdminController.php

@@ -9,6 +9,12 @@ use App\Services\NoteService;
 
 class NotesAdminController extends Controller
 {
+    protected $noteService;
+
+    public function __construct(NoteService $noteService = null)
+    {
+        $this->noteService = $noteService ?? new NoteService();
+    }
     /**
      * Show the form to make a new note.
      *

app/Http/Controllers/WebMentionsController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
 use App\Note;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use App\Jobs\SendWebMentions;
 use App\Jobs\ProcessWebMention;
 use Jonnybarnes\IndieWeb\Numbers;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -64,37 +63,4 @@ class WebMentionsController extends Controller
                 break;
         }
     }
-
-    /**
-     * Send a webmention.
-     *
-     * @param  \App\Note  $note
-     * @return array   An array of successful then failed URLs
-     */
-    public function send(Note $note)
-    {
-        //grab the URLs
-        $urlsInReplyTo = explode(' ', $note->in_reply_to);
-        $urlsNote = $this->getLinks($note->note);
-        $urls = array_filter(array_merge($urlsInReplyTo, $urlsNote)); //filter out none URLs
-        foreach ($urls as $url) {
-            $this->dispatch(new SendWebMentions($url, $note->longurl));
-        }
-    }
-
-    /**
-     * Get the URLs from a note.
-     */
-    private function getLinks($html)
-    {
-        $urls = [];
-        $dom = new \DOMDocument();
-        $dom->loadHTML($html);
-        $anchors = $dom->getElementsByTagName('a');
-        foreach ($anchors as $anchor) {
-            $urls[] = ($anchor->hasAttribute('href')) ? $anchor->getAttribute('href') : false;
-        }
-
-        return $urls;
-    }
 }

app/Jobs/SendWebMentions.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Note;
 use GuzzleHttp\Client;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,18 +12,20 @@ class SendWebMentions extends Job implements ShouldQueue
 {
     use InteractsWithQueue, SerializesModels;
 
-    protected $url;
-    protected $source;
+    protected $note;
+    protected $guzzle;
 
     /**
-     * Create a new job instance.
+     * Create the job instance, inject dependencies.
      *
+     * @param  User $user
+     * @param  Note $note
      * @return void
      */
-    public function __construct($url, $source)
+    public function __construct(Note $note, Client $guzzle = null)
     {
-        $this->url = $url;
-        $this->source = $source;
+        $this->note = $note;
+        $this->guzzle = $guzzle ?? new Client();
     }
 
     /**
@@ -30,18 +33,24 @@ class SendWebMentions extends Job implements ShouldQueue
      *
      * @return void
      */
-    public function handle(Client $client)
+    public function handle(Note $note)
     {
-        $endpoint = $this->discoverWebmentionEndpoint($this->url, $client);
+        //grab the URLs
+        $urlsInReplyTo = explode(' ', $this->note->in_reply_to);
+        $urlsNote = $this->getLinks($this->note->note);
+        $urls = array_filter(array_merge($urlsInReplyTo, $urlsNote)); //filter out none URLs
+        foreach ($urls as $url) {
+            $endpoint = $this->discoverWebmentionEndpoint($url);
             if ($endpoint) {
-            $client->post($endpoint, [
+                $this->guzzle->post($endpoint, [
                     'form_params' => [
-                    'source' => $this->source,
-                    'target' => $this->url,
-                ],
+                        'source' => $this->note->longurl,
+                        'target' => $url
+                    ]
                 ]);
             }
         }
+    }
 
     /**
      * Discover if a URL has a webmention endpoint.
@@ -50,11 +59,16 @@ class SendWebMentions extends Job implements ShouldQueue
      * @param  \GuzzleHttp\Client $client
      * @return string  The webmention endpoint URL
      */
-    private function discoverWebmentionEndpoint($url, $client)
+    private function discoverWebmentionEndpoint($url)
     {
+        //let’s not send webmentions to myself
+        if (parse_url($url, PHP_URL_HOST) == env('LONG_URL', 'localhost')) {
+            return false;
+        }
+
         $endpoint = null;
 
-        $response = $client->get($url);
+        $response = $this->guzzle->get($url);
         //check HTTP Headers for webmention endpoint
         $links = \GuzzleHttp\Psr7\parse_header($response->getHeader('Link'));
         foreach ($links as $link) {
@@ -83,4 +97,20 @@ class SendWebMentions extends Job implements ShouldQueue
 
         return false;
     }
+
+    /**
+     * Get the URLs from a note.
+     */
+    private function getLinks($html)
+    {
+        $urls = [];
+        $dom = new \DOMDocument();
+        $dom->loadHTML($html);
+        $anchors = $dom->getElementsByTagName('a');
+        foreach ($anchors as $anchor) {
+            $urls[] = ($anchor->hasAttribute('href')) ? $anchor->getAttribute('href') : false;
+        }
+
+        return $urls;
+    }
 }

app/Services/NoteService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 use App\Note;
 use App\Place;
 use Illuminate\Http\Request;
+use App\Jobs\SendWebMentions;
 use App\Jobs\SyndicateToTwitter;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use App\Http\Controllers\WebMentionsController;
@@ -45,10 +46,7 @@ class NoteService
             }
         }
 
-        if ($request->input('webmentions')) {
-            $wmc = new WebMentionsController();
-            $wmc->send($note);
-        }
+        $this->dispatch(new SendWebMentions($note));
 
         if (//micropub request, syndication sent as array
             (is_array($request->input('mp-syndicate-to'))

changelog.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Version {next}
+  - Automatically send webmentions
 
 ## Version 0.0.4 (2016-06-21)
   - Move bower components into their own subdir

resources/views/templates/new-note-form.blade.php

@@ -4,7 +4,6 @@
   	<legend>New Note</legend>
     <label for="in-reply-to" accesskey="r">Reply-to: </label><input type="text" name="in-reply-to" id="in-reply-to" placeholder="in-reply-to-1 in-reply-to-2 …" value="{{ old('in-reply-to') }}">
     <label for="content" accesskey="n">Note: </label><textarea name="content" id="content" placeholder="Note" autofocus>{{ old('content') }}</textarea>
-    <label for="webmentions" accesskey="w">Send webmentions: </label><input type="checkbox" name="webmentions" id="webmentions" checked="checked"><br>
 @if ($micropub === true)
     <label for="syndication" accesskey="s">Syndication: </label>@if($syndication)<ul class="syndication-targets-list" name="syndication">@foreach($syndication as $target)<li><input type="checkbox" name="mp-syndicate-to[]" id="{{ $target }}" value="{{ $target }}" checked="checked"> <label for="{{ $target }}">{{ $target }}</label></li>@endforeach</ul>@endif
     <a href="/refresh-syndication-targets">Refresh Syndication Targets</a><br>

tests/MicropubTest.php

@@ -38,7 +38,7 @@ class MicropubTest extends TestCase
     public function testMicropubRequestWithValidToken()
     {
         $this->call('GET', $this->appurl . '/api/post', [], [], [], ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);
-        $this->see('me=https%3A%2F%2Fjbl5.dev');
+        $this->see('me=https%3A%2F%2Fjonnybarnes.localhost');
     }
 
     public function testMicropubRequestForSyndication()
@@ -79,8 +79,6 @@ class MicropubTest extends TestCase
 
     public function testMicropubRequestCreateNewPlace()
     {
-        $faker = \Faker\Factory::create();
-        $note = $faker->text;
         $this->call(
             'POST',
             $this->appurl . '/api/post',
@@ -101,7 +99,7 @@ class MicropubTest extends TestCase
         $signer = new Sha256();
         $token = (new Builder())
             ->set('client_id', 'https://quill.p3k.io')
-            ->set('me', 'https://jbl5.dev')
+            ->set('me', 'https://jonnybarnes.localhost')
             ->set('scope', 'post')
             ->set('issued_at', time())
             ->sign($signer, env('APP_KEY'))

tests/NotesAdminTest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Tests;
+
+use TestCase;
+use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+
+class NotesAdminTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    protected $appurl;
+    protected $notesAdminController;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->appurl = config('app.url');
+        $this->notesAdminController = new \App\Http\Controllers\NotesAdminController();
+    }
+
+    public function testCreatedNoteDispatchesSendWebmentionsJob()
+    {
+        $this->expectsJobs(\App\Jobs\SendWebMentions::class);
+
+        $this->withSession(['loggedin' => true])
+             ->visit($this->appurl . '/admin/note/new')
+             ->type('Mentioning', 'content')
+             ->press('Submit');
+    }
+}