Supporting routing of URL with nothing after the discussion ID

closes flarum/core#181

framework/core/js/forum/src/initializers/routes.js

@@ -14,6 +14,7 @@ export default function(app) {
     'index': { path: '/', component: IndexPage.component() },
     'index.filter': { path: '/:filter', component: IndexPage.component() },
 
+    'discussion.id': { path: '/d/:id', component: DiscussionPage.component() },
     'discussion': { path: '/d/:id/:slug', component: DiscussionPage.component() },
     'discussion.near': { path: '/d/:id/:slug/:near', component: DiscussionPage.component() },
 

framework/core/src/Forum/ForumServiceProvider.php

@@ -59,7 +59,7 @@ class ForumServiceProvider extends ServiceProvider
         );
 
         $routes->get(
-            '/d/{id:\d+}/{slug}[/{near}]',
+            '/d/{id:\d+}[/{slug}[/{near}]]',
             'flarum.forum.discussion',
             $this->action('Flarum\Forum\Actions\DiscussionAction')
         );

framework/core/src/Support/ClientAction.php

@@ -71,6 +71,7 @@ abstract class ClientAction extends HtmlAction
     /**
      * @param Client $apiClient
      * @param LocaleManager $locales
+     * @param SettingsRepository $settings
      */
     public function __construct(Client $apiClient, LocaleManager $locales, SettingsRepository $settings)
     {