Merge branch 'release/0.8.1'

app/Http/Controllers/NotesController.php

@@ -22,14 +22,13 @@ 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');
             }])->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'));
-
-        return view('notes.show', compact('note', 'aslink'));
     }
 
     /**

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' => [

app/Http/Middleware/ActivityStreamLinks.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class ActivityStreamLinks
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $response = $next($request);
+        if ($request->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;
+    }
+}

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.8.1 (2017-09-16)
+  - 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)
   - Allow for “responsive” images (issue#62)

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",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7b89fa65cccb966da1599b715dcea8c09eafc175",
-                "reference": "421088947540b1c7956cd693b032124e2c74eb76",
+                "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",
+                "url": "https://api.github.com/repos/laravel/scout/zipball/681c15a26bbc973528af2e77e0bb61981dc07206",
-                "reference": "84762c8ed51cb57f09b5f465e09993e48baf9d55",
+                "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",

resources/views/master.blade.php

@@ -12,8 +12,6 @@
   <link rel="alternate" type="application/rss+xml" title="Notes RSS Feed" href="/notes/feed.rss">
   <link rel="alternate" type="application/atom+xml" title="Notes Atom Feed" href="/notes/feed.atom">
   <link rel="alternate" type="application/json" title="Notes JSON Feed" href="/notes/feed.json">
-@isset($aslink)  <link rel="alternate" type="application/activity+json" href="{{ $aslink }}">
-@endisset
   <link rel="openid.server" href="https://indieauth.com/openid">
   <link rel="openid.delegate" href="{{ config('app.url') }}">
   <link rel="authorization_endpoint" href="https://indieauth.com/auth">