From 3fe9c6e4f9da4aa08b0c6db8f933d2f0a7071b55 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 16 Sep 2017 18:22:54 +0100 Subject: [PATCH 1/4] composer update --- composer.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 3f639063..e4d03966 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.36.7", + "version": "3.36.9", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "421088947540b1c7956cd693b032124e2c74eb76" + "reference": "7b89fa65cccb966da1599b715dcea8c09eafc175" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/421088947540b1c7956cd693b032124e2c74eb76", - "reference": "421088947540b1c7956cd693b032124e2c74eb76", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7b89fa65cccb966da1599b715dcea8c09eafc175", + "reference": "7b89fa65cccb966da1599b715dcea8c09eafc175", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "s3", "sdk" ], - "time": "2017-09-13T18:56:17+00:00" + "time": "2017-09-15T19:12:04+00:00" }, { "name": "barnabywalters/mf-cleaner", @@ -2085,16 +2085,16 @@ }, { "name": "laravel/scout", - "version": "v3.0.9", + "version": "v3.0.10", "source": { "type": "git", "url": "https://github.com/laravel/scout.git", - "reference": "84762c8ed51cb57f09b5f465e09993e48baf9d55" + "reference": "681c15a26bbc973528af2e77e0bb61981dc07206" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/scout/zipball/84762c8ed51cb57f09b5f465e09993e48baf9d55", - "reference": "84762c8ed51cb57f09b5f465e09993e48baf9d55", + "url": "https://api.github.com/repos/laravel/scout/zipball/681c15a26bbc973528af2e77e0bb61981dc07206", + "reference": "681c15a26bbc973528af2e77e0bb61981dc07206", "shasum": "" }, "require": { @@ -2146,7 +2146,7 @@ "laravel", "search" ], - "time": "2017-09-13T18:24:31+00:00" + "time": "2017-09-14T12:32:30+00:00" }, { "name": "laravel/tinker", From 53abe5a42d3374ccda50071332f4ad9e070bcb8f Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 16 Sep 2017 18:27:02 +0100 Subject: [PATCH 2/4] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 5582aafcd32fed704e217801e67051c0adecb710 Author: Jonny Barnes Date: Sat Sep 16 18:26:43 2017 +0100 update changelog commit a10ad1695382316ef88cd0630b0dd3437a974127 Author: Jonny Barnes Date: Sat Sep 16 18:25:54 2017 +0100 order notes by “latest” --- app/Http/Controllers/NotesController.php | 2 +- changelog.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index dbf5adc7..37e4c60b 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -22,7 +22,7 @@ class NotesController extends Controller return (new ActivityStreamsService)->siteOwnerResponse(); } - $notes = Note::orderBy('id', 'desc') + $notes = Note::latest() ->with('place', 'media', 'client') ->withCount(['webmentions As replies' => function ($query) { $query->where('type', 'in-reply-to'); diff --git a/changelog.md b/changelog.md index 56bd18b4..76ad8935 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # Changelog +## Version {next} + - Order notes by latest (issue#70) + ## Version 0.8 (2017-09-16) - Improve embedding of tweets (issue#66) - Allow for “responsive” images (issue#62) From 309864ba76b8bfc91f163df3feb72fd3dc9879da Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 16 Sep 2017 18:45:06 +0100 Subject: [PATCH 3/4] Squashed commit of the following: commit f02ac2b94326054a842a65ed5a2b851351c1d533 Author: Jonny Barnes Date: Sat Sep 16 18:44:52 2017 +0100 update changelog commit 2e77668cae03246189d8ce931f9ab29d2531d522 Author: Jonny Barnes Date: Sat Sep 16 18:44:45 2017 +0100 Add a middleware for adding AS2.0 header links commit 931ba1fe5dd2eacf32e4da3eefec081173dee8de Author: Jonny Barnes Date: Sat Sep 16 18:44:16 2017 +0100 remove references to AS2.0 links --- app/Http/Controllers/NotesController.php | 7 ++---- app/Http/Kernel.php | 1 + app/Http/Middleware/ActivityStreamLinks.php | 28 +++++++++++++++++++++ changelog.md | 1 + resources/views/master.blade.php | 2 -- 5 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 app/Http/Middleware/ActivityStreamLinks.php 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 From 3e9f3d0f88e424e58fca5231ec66712dc3e37808 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 16 Sep 2017 19:55:43 +0100 Subject: [PATCH 4/4] Bump version number to 0.8.1 --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 6122e74f..f5b38ea3 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## Version {next} +## Version 0.8.1 (2017-09-16) - Order notes by latest (issue#70) - AcitivtyStream support is now indicated with HTTP Link headers