diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index 37e4c60b..9801c8ea 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -27,9 +27,8 @@ class NotesController extends Controller ->withCount(['webmentions As replies' => function ($query) { $query->where('type', 'in-reply-to'); }])->paginate(10); - $aslink = config('app.url'); - return view('notes.index', compact('notes', 'aslink')); + return view('notes.index', compact('notes')); } /** @@ -46,9 +45,7 @@ class NotesController extends Controller return (new ActivityStreamsService)->singleNoteResponse($note); } - $aslink = $note->longurl; - - return view('notes.show', compact('note', 'aslink')); + return view('notes.show', compact('note')); } /** diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index b2fa4ba4..1f67d385 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -38,6 +38,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\LinkHeadersMiddleware::class, //\App\Http\Middleware\DevTokenMiddleware::class, \App\Http\Middleware\LocalhostSessionMiddleware::class, + \App\Http\Middleware\ActivityStreamLinks::class, ], 'api' => [ diff --git a/app/Http/Middleware/ActivityStreamLinks.php b/app/Http/Middleware/ActivityStreamLinks.php new file mode 100644 index 00000000..4c240759 --- /dev/null +++ b/app/Http/Middleware/ActivityStreamLinks.php @@ -0,0 +1,28 @@ +path() === '/') { + $response->header('Link', '<' . config('app.url') . '>; rel="application/activity+json"', false); + } + if ($request->is('notes/*')) { + $response->header('Link', '<' . $request->url() . '>; rel="application/activity+json"', false); + } + + return $response; + } +} diff --git a/changelog.md b/changelog.md index 76ad8935..6122e74f 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,7 @@ ## Version {next} - Order notes by latest (issue#70) + - AcitivtyStream support is now indicated with HTTP Link headers ## Version 0.8 (2017-09-16) - Improve embedding of tweets (issue#66) diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index 0c9855dc..fbe53414 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -12,8 +12,6 @@ -@isset($aslink) -@endisset