Major refactor and improvements

- Reorganised all namespaces and class names for consistency and structure. Following PSR bylaws (Abstract prefix, Interface/Trait suffix).
  - Move models into root of Core, because writing `use Flarum\Core\Discussion` is nice. Namespace the rest by type. (Namespacing by entity was too arbitrary.)
  - Moved some non-domain stuff out of Core: Database, Formatter, Settings.
  - Renamed config table and all references to "settings" for consistency.
  - Remove Core class and add url()/isInstalled()/inDebugMode() as instance methods of Foundation\Application.
  - Cleanup, docblocking, etc.

- Improvements to HTTP architecture
  - API and forum/admin Actions are now actually all the same thing (simple PSR-7 Request handlers), renamed to Controllers.
  - Upgrade to tobscure/json-api 0.2 branch.
  - Where possible, moved generic functionality to tobscure/json-api (e.g. pagination links). I'm quite happy with the backend balance now re: #262

- Improvements to other architecture
  - Use Illuminate's Auth\Access\Gate interface/implementation instead of our old Locked trait. We still use events to actually determine the permissions though. Our Policy classes are actually glorified event subscribers.
  - Extract model validation into Core\Validator classes.
  - Make post visibility permission stuff much more efficient and DRY.

- Renamed Flarum\Event classes for consistency. ref #246
  - `Configure` prefix for events dedicated to configuring an object.
  - `Get` prefix for events whose listeners should return something.
  - `Prepare` prefix when a variable is passed by reference so it can be modified.
  - `Scope` prefix when a query builder is passed.

- Miscellaneous improvements/bug-fixes. I'm easily distracted!
  - Increase default height of post composer.
  - Improve post stream redraw flickering in Safari by keying loading post placeholders with their IDs. ref #451
  - Use a PHP JavaScript minification library for minifying TextFormatter's JavaScript, instead of ClosureCompilerService (can't rely on external service!)
  - Use UrlGenerator properly in various places. closes #123
  - Make Api\Client return Response object. closes #128
  - Allow extensions to specify custom icon images.
  - Allow external API/admin URLs to be optionally specified in config.php. If the value or "url" is an array, we look for the corresponding path inside. Otherwise, we append the path to the base URL, using the corresponding value in "paths" if present. closes #244

framework/core/src/Http/AbstractServer.php

@@ -0,0 +1,41 @@
+<?php
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http;
+
+use Flarum\Foundation\Application;
+use Zend\Diactoros\Server;
+use Flarum\Foundation\AbstractServer as BaseAbstractServer;
+use Zend\Stratigility\MiddlewareInterface;
+
+abstract class AbstractServer extends BaseAbstractServer
+{
+    public function listen()
+    {
+        $app = $this->getApp();
+
+        $server = Server::createServer(
+            $this->getMiddleware($app),
+            $_SERVER,
+            $_GET,
+            $_POST,
+            $_COOKIE,
+            $_FILES
+        );
+
+        $server->listen();
+    }
+
+    /**
+     * @param Application $app
+     * @return MiddlewareInterface
+     */
+    abstract protected function getMiddleware(Application $app);
+}

framework/core/src/Http/AbstractUrlGenerator.php

@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http;
+
+use Flarum\Foundation\Application;
+
+class AbstractUrlGenerator
+{
+    /**
+     * @var Application
+     */
+    protected $app;
+
+    /**
+     * @var RouteCollection
+     */
+    protected $routes;
+
+    /**
+     * @var string|null
+     */
+    protected $path;
+
+    /**
+     * @param Application $app
+     * @param RouteCollection $routes
+     */
+    public function __construct(Application $app, RouteCollection $routes)
+    {
+        $this->app = $app;
+        $this->routes = $routes;
+    }
+
+    /**
+     * Generate a URL to a named route.
+     *
+     * @param string $name
+     * @param array $parameters
+     * @return string
+     */
+    public function toRoute($name, $parameters = [])
+    {
+        $path = $this->routes->getPath($name, $parameters);
+        $path = ltrim($path, '/');
+
+        return $this->toBase() . '/' . $path;
+    }
+
+    /**
+     * Generate a URL to a path.
+     *
+     * @param string $path
+     * @return string
+     */
+    public function toPath($path)
+    {
+        return $this->toBase() . '/' . $path;
+    }
+
+    /**
+     * Get the base URL.
+     *
+     * @return string
+     */
+    public function toBase()
+    {
+        return $this->app->url($this->path);
+    }
+}

framework/core/src/Http/Controller/AbstractClientController.php

@@ -0,0 +1,325 @@
+<?php
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http\Controller;
+
+use Flarum\Api\Client;
+use Flarum\Asset\AssetManager;
+use Flarum\Asset\JsCompiler;
+use Flarum\Asset\LessCompiler;
+use Flarum\Core;
+use Flarum\Core\User;
+use Flarum\Event\ConfigureClientView;
+use Flarum\Foundation\Application;
+use Flarum\Locale\JsCompiler as LocaleJsCompiler;
+use Flarum\Locale\LocaleManager;
+use Flarum\Settings\SettingsRepository;
+use Illuminate\Contracts\Events\Dispatcher;
+use Psr\Http\Message\ServerRequestInterface as Request;
+
+/**
+ * This action sets up a ClientView, and preloads it with the assets necessary
+ * to boot a Flarum client.
+ *
+ * Subclasses should set a $clientName, $layout, and $translationKeys. The
+ * client name will be used to locate the client assets (or alternatively,
+ * subclasses can overwrite the addAssets method), and set up asset compilers
+ * which write to the assets directory. Configured LESS customizations will be
+ * appended.
+ *
+ * A locale compiler is set up for the actor's locale, including the
+ * translations specified in $translationKeys. Additionally, an event is fired
+ * before the ClientView is returned, giving extensions an opportunity to add
+ * assets, translations, or alter the view.
+ */
+abstract class AbstractClientController extends AbstractHtmlController
+{
+    /**
+     * The name of the client. This is used to locate assets within the js/
+     * and less/ directories. It is also used as the filename of the compiled
+     * asset files.
+     *
+     * @var string
+     */
+    protected $clientName;
+
+    /**
+     * The name of the view to include as the page layout.
+     *
+     * @var string
+     */
+    protected $layout;
+
+    /**
+     * The keys of the translations that should be included in the compiled
+     * locale file.
+     *
+     * @var array
+     */
+    protected $translationKeys = [];
+
+    /**
+     * @var \Flarum\Foundation\Application
+     */
+    protected $app;
+
+    /**
+     * @var Client
+     */
+    protected $api;
+
+    /**
+     * @var LocaleManager
+     */
+    protected $locales;
+
+    /**
+     * @var \Flarum\Settings\SettingsRepository
+     */
+    protected $settings;
+
+    /**
+     * @var Dispatcher
+     */
+    protected $events;
+
+    /**
+     * @param \Flarum\Foundation\Application $app
+     * @param Client $api
+     * @param LocaleManager $locales
+     * @param \Flarum\Settings\SettingsRepository $settings
+     * @param Dispatcher $events
+     */
+    public function __construct(
+        Application $app,
+        Client $api,
+        LocaleManager $locales,
+        SettingsRepository $settings,
+        Dispatcher $events
+    ) {
+        $this->app = $app;
+        $this->api = $api;
+        $this->locales = $locales;
+        $this->settings = $settings;
+        $this->events = $events;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return ClientView
+     */
+    public function render(Request $request)
+    {
+        $actor = $request->getAttribute('actor');
+        $assets = $this->getAssets();
+        $locale = $this->getLocale($actor, $request);
+        $localeCompiler = $locale ? $this->getLocaleCompiler($locale) : null;
+
+        $view = new ClientView(
+            $this->api,
+            $request,
+            $actor,
+            $assets,
+            $this->layout,
+            $localeCompiler
+        );
+
+        $view->setVariable('locales', $this->locales->getLocales());
+        $view->setVariable('locale', $locale);
+
+        // Now that we've set up the ClientView instance, we can fire an event
+        // to give extensions the opportunity to add their own assets and
+        // translations. We will pass an array to the event which specifies
+        // which translations should be included in the locale file. Afterwards,
+        // we will filter all of the translations for the actor's locale and
+        // compile only the ones we need.
+        $keys = $this->translationKeys;
+
+        $this->events->fire(
+            new ConfigureClientView($this, $view, $keys)
+        );
+
+        if ($localeCompiler) {
+            $translations = $this->locales->getTranslations($locale);
+
+            $translations = $this->filterTranslations($translations, $keys);
+
+            $localeCompiler->setTranslations($translations);
+        }
+
+        return $view;
+    }
+
+    /**
+     * Flush the client's assets so that they will be regenerated from scratch
+     * on the next render.
+     *
+     * @return void
+     */
+    public function flushAssets()
+    {
+        $this->getAssets()->flush();
+
+        $locales = array_keys($this->locales->getLocales());
+
+        foreach ($locales as $locale) {
+            $this->getLocaleCompiler($locale)->flush();
+        }
+    }
+
+    /**
+     * Set up the asset manager, preloaded with a JavaScript compiler and a LESS
+     * compiler. Automatically add the files necessary to boot a Flarum client,
+     * as well as any configured LESS customizations.
+     *
+     * @return \Flarum\Asset\AssetManager
+     */
+    protected function getAssets()
+    {
+        $public = $this->getAssetDirectory();
+
+        $assets = new AssetManager(
+            new JsCompiler($public, "$this->clientName.js"),
+            new LessCompiler($public, "$this->clientName.css", $this->app->storagePath().'/less')
+        );
+
+        $this->addAssets($assets);
+        $this->addCustomizations($assets);
+
+        return $assets;
+    }
+
+    /**
+     * Add the assets necessary to boot a Flarum client, found within the
+     * directory specified by the $clientName property.
+     *
+     * @param \Flarum\Asset\AssetManager $assets
+     */
+    protected function addAssets(AssetManager $assets)
+    {
+        $root = __DIR__.'/../../..';
+
+        $assets->addFile("$root/js/$this->clientName/dist/app.js");
+        $assets->addFile("$root/less/$this->clientName/app.less");
+    }
+
+    /**
+     * Add any configured JS/LESS customizations to the asset manager.
+     *
+     * @param \Flarum\Asset\AssetManager $assets
+     */
+    protected function addCustomizations(AssetManager $assets)
+    {
+        $assets->addLess(function () {
+            $less = '';
+
+            foreach ($this->getLessVariables() as $name => $value) {
+                $less .= "@$name: $value;";
+            }
+
+            $less .= $this->settings->get('custom_less');
+
+            return $less;
+        });
+    }
+
+    /**
+     * Get the values of any LESS variables to compile into the CSS, based on
+     * the forum's configuration.
+     *
+     * @return array
+     */
+    protected function getLessVariables()
+    {
+        return [
+            'config-primary-color'   => $this->settings->get('theme_primary_color') ?: '#000',
+            'config-secondary-color' => $this->settings->get('theme_secondary_color') ?: '#000',
+            'config-dark-mode'       => $this->settings->get('theme_dark_mode') ? 'true' : 'false',
+            'config-colored-header'  => $this->settings->get('theme_colored_header') ? 'true' : 'false'
+        ];
+    }
+
+    /**
+     * Set up the locale compiler for the given locale.
+     *
+     * @param string $locale
+     * @return LocaleJsCompiler
+     */
+    protected function getLocaleCompiler($locale)
+    {
+        $compiler = new LocaleJsCompiler($this->getAssetDirectory(), "$this->clientName-$locale.js");
+
+        foreach ($this->locales->getJsFiles($locale) as $file) {
+            $compiler->addFile($file);
+        }
+
+        return $compiler;
+    }
+
+    /**
+     * Get the name of the locale to use.
+     *
+     * @param User $actor
+     * @param Request $request
+     * @return string
+     */
+    protected function getLocale(User $actor, Request $request)
+    {
+        if ($actor->exists) {
+            $locale = $actor->getPreference('locale');
+        } else {
+            $locale = array_get($request->getCookieParams(), 'locale');
+        }
+
+        if (! $locale || ! $this->locales->hasLocale($locale)) {
+            $locale = $this->settings->get('default_locale', 'en');
+        }
+
+        if ($this->locales->hasLocale($locale)) {
+            return $locale;
+        }
+    }
+
+    /**
+     * Get the path to the directory where assets should be written.
+     *
+     * @return string
+     */
+    protected function getAssetDirectory()
+    {
+        return public_path().'/assets';
+    }
+
+    /**
+     * Take a selection of keys from a collection of translations.
+     *
+     * @param array $translations
+     * @param array $keys
+     * @return array
+     */
+    protected function filterTranslations(array $translations, array $keys)
+    {
+        $filtered = [];
+
+        foreach ($keys as $key) {
+            $parts = explode('.', $key);
+            $level = &$filtered;
+
+            foreach ($parts as $part) {
+                $level = &$level[$part];
+            }
+
+            $level = array_get($translations, $key);
+        }
+
+        return $filtered;
+    }
+}

framework/core/src/Http/Controller/AbstractHtmlController.php

@@ -0,0 +1,38 @@
+<?php
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http\Controller;
+
+use Flarum\Http\Controller\ControllerInterface;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Zend\Diactoros\Response;
+
+abstract class AbstractHtmlController implements ControllerInterface
+{
+    /**
+     * @param Request $request
+     * @return \Zend\Diactoros\Response
+     */
+    public function handle(Request $request)
+    {
+        $view = $this->render($request);
+
+        $response = new Response;
+        $response->getBody()->write($view->render());
+
+        return $response;
+    }
+
+    /**
+     * @param Request $request
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    abstract protected function render(Request $request);
+}

framework/core/src/Http/Controller/ClientView.php

@@ -0,0 +1,347 @@
+<?php
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http\Controller;
+
+use Flarum\Api\Client;
+use Flarum\Asset\AssetManager;
+use Flarum\Core\User;
+use Illuminate\Contracts\Support\Renderable;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Flarum\Locale\JsCompiler;
+
+/**
+ * This class represents a view which boots up Flarum's client.
+ */
+class ClientView implements Renderable
+{
+    /**
+     * The user who is using the client.
+     *
+     * @var User
+     */
+    protected $actor;
+
+    /**
+     * The title of the document, displayed in the <title> tag.
+     *
+     * @var null|string
+     */
+    protected $title;
+
+    /**
+     * The SEO content of the page, displayed in <noscript> tags.
+     *
+     * @var string
+     */
+    protected $content;
+
+    /**
+     * The path to the client layout view to display.
+     *
+     * @var string
+     */
+    protected $layout;
+
+    /**
+     * An API response that should be preloaded into the page.
+     *
+     * @var null|array|object
+     */
+    protected $document;
+
+    /**
+     * Other variables to preload into the page.
+     *
+     * @var array
+     */
+    protected $variables = [];
+
+    /**
+     * An array of JS modules to import before booting the app.
+     *
+     * @var array
+     */
+    protected $bootstrappers = ['locale'];
+
+    /**
+     * An array of strings to append to the page's <head>.
+     *
+     * @var array
+     */
+    protected $headStrings = [];
+
+    /**
+     * An array of strings to prepend before the page's </body>.
+     *
+     * @var array
+     */
+    protected $footStrings = [];
+
+    /**
+     * @var Client
+     */
+    protected $api;
+
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * @var \Flarum\Asset\AssetManager
+     */
+    protected $assets;
+
+    /**
+     * @var JsCompiler
+     */
+    protected $locale;
+
+    /**
+     * @param Client $api
+     * @param Request $request
+     * @param User $actor
+     * @param \Flarum\Asset\AssetManager $assets
+     * @param string $layout
+     * @param JsCompiler $locale
+     */
+    public function __construct(
+        Client $api,
+        Request $request,
+        User $actor,
+        AssetManager $assets,
+        $layout,
+        JsCompiler $locale = null
+    ) {
+        $this->api = $api;
+        $this->request = $request;
+        $this->actor = $actor;
+        $this->assets = $assets;
+        $this->layout = $layout;
+        $this->locale = $locale;
+    }
+
+    /**
+     * The title of the document, to be displayed in the <title> tag.
+     *
+     * @param null|string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+
+    /**
+     * Set the SEO content of the page, to be displayed in <noscript> tags.
+     *
+     * @param null|string $content
+     */
+    public function setContent($content)
+    {
+        $this->content = $content;
+    }
+
+    /**
+     * Set the name of the client layout view to display.
+     *
+     * @param string $layout
+     */
+    public function setLayout($layout)
+    {
+        $this->layout = $layout;
+    }
+
+    /**
+     * Add a string to be appended to the page's <head>.
+     *
+     * @param string $string
+     */
+    public function addHeadString($string)
+    {
+        $this->headStrings[] = $string;
+    }
+
+    /**
+     * Add a string to be prepended before the page's </body>.
+     *
+     * @param string $string
+     */
+    public function addFootString($string)
+    {
+        $this->footStrings[] = $string;
+    }
+
+    /**
+     * Set an API response to be preloaded into the page. This should be a
+     * JSON-API document.
+     *
+     * @param null|array|object $document
+     */
+    public function setDocument($document)
+    {
+        $this->document = $document;
+    }
+
+    /**
+     * Set a variable to be preloaded into the app.
+     *
+     * @param string $name
+     * @param mixed $value
+     */
+    public function setVariable($name, $value)
+    {
+        $this->variables[$name] = $value;
+    }
+
+    /**
+     * Add a JavaScript module to be imported before the app is booted.
+     *
+     * @param string $string
+     */
+    public function addBootstrapper($string)
+    {
+        $this->bootstrappers[] = $string;
+    }
+
+    /**
+     * Get the view's asset manager.
+     *
+     * @return \Flarum\Asset\AssetManager
+     */
+    public function getAssets()
+    {
+        return $this->assets;
+    }
+
+    /**
+     * Get the string contents of the view.
+     *
+     * @return string
+     */
+    public function render()
+    {
+        $view = app('view')->file(__DIR__.'/../../../views/app.blade.php');
+
+        $forum = $this->getForumDocument();
+        $data = $this->getDataFromDocument($forum);
+
+        if ($this->actor->exists) {
+            $user = $this->getUserDocument();
+            $data = array_merge($data, $this->getDataFromDocument($user));
+        }
+
+        $view->app = [
+            'preload' => [
+                'data' => $data,
+                'session' => $this->getSession(),
+                'document' => $this->document
+            ]
+        ] + $this->variables;
+        $view->bootstrappers = $this->bootstrappers;
+
+        $noJs = array_get($this->request->getQueryParams(), 'nojs');
+
+        $view->title = ($this->title ? $this->title . ' - ' : '') . $forum->data->attributes->title;
+        $view->forum = $forum->data;
+        $view->layout = app('view')->file($this->layout, [
+            'forum' => $forum->data,
+            'content' => app('view')->file(__DIR__.'/../../../views/content.blade.php', [
+                'content' => $this->content,
+                'noJs' => $noJs,
+                'forum' => $forum->data
+            ])
+        ]);
+        $view->noJs = $noJs;
+
+        $view->styles = [$this->assets->getCssFile()];
+        $view->scripts = [$this->assets->getJsFile()];
+
+        if ($this->locale) {
+            $view->scripts[] = $this->locale->getFile();
+        }
+
+        $view->head = implode("\n", $this->headStrings);
+        $view->foot = implode("\n", $this->footStrings);
+
+        return $view->render();
+    }
+
+    /**
+     * Get the string contents of the view.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->render();
+    }
+
+    /**
+     * Get the result of an API request to show the forum.
+     *
+     * @return object
+     */
+    protected function getForumDocument()
+    {
+        return json_decode($this->api->send('Flarum\Api\Controller\ShowForumController', $this->actor)->getBody());
+    }
+
+    /**
+     * Get the result of an API request to show the current user.
+     *
+     * @return object
+     */
+    protected function getUserDocument()
+    {
+        // TODO: calling on the API here results in an extra query to get
+        // the user + their groups, when we already have this information on
+        // $this->actor. Can we simply run the CurrentUserSerializer
+        // manually? Or can we somehow inject this data into the ShowDiscussionController?
+        $document = json_decode($this->api->send(
+            'Flarum\Api\Controller\ShowUserController',
+            $this->actor,
+            ['id' => $this->actor->id]
+        )->getBody());
+
+        return $document;
+    }
+
+    /**
+     * Get an array of data by merging the 'data' and 'included' keys of a
+     * JSON-API document.
+     *
+     * @param object $document
+     * @return array
+     */
+    protected function getDataFromDocument($document)
+    {
+        $data[] = $document->data;
+
+        if (isset($document->included)) {
+            $data = array_merge($data, $document->included);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Get information about the current session.
+     *
+     * @return array
+     */
+    protected function getSession()
+    {
+        return [
+            'userId' => $this->actor->id,
+            'token' => array_get($this->request->getCookieParams(), 'flarum_remember'),
+        ];
+    }
+}

framework/core/src/Http/Controller/ControllerInterface.php

@@ -0,0 +1,22 @@
+<?php
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http\Controller;
+
+use Psr\Http\Message\ServerRequestInterface;
+
+interface ControllerInterface
+{
+    /**
+     * @param ServerRequestInterface $request
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    public function handle(ServerRequestInterface $request);
+}

framework/core/src/Http/Exception/RouteNotFoundException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Http;
+namespace Flarum\Http\Exception;
 
 use Exception;
 

framework/core/src/Http/GenerateRouteHandlerTrait.php

@@ -0,0 +1,39 @@
+<?php
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http;
+
+use Flarum\Http\Controller\ControllerInterface;
+use Illuminate\Contracts\Container\Container;
+use Psr\Http\Message\ServerRequestInterface;
+
+trait GenerateRouteHandlerTrait
+{
+    /**
+     * @return \Closure
+     */
+    protected function getHandlerGenerator(Container $container)
+    {
+        return function ($class) use ($container) {
+            return function (ServerRequestInterface $request, $routeParams) use ($class, $container) {
+                $controller = $container->make($class);
+
+                if (! ($controller instanceof ControllerInterface)) {
+                    throw new \InvalidArgumentException('Route handler must be an instance of '
+                        . ControllerInterface::class);
+                }
+
+                $request = $request->withQueryParams(array_merge($request->getQueryParams(), $routeParams));
+
+                return $controller->handle($request);
+            };
+        };
+    }
+}

framework/core/src/Http/Middleware/AuthenticateWithCookie.php

@@ -0,0 +1,66 @@
+<?php
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http\Middleware;
+
+use Flarum\Api\AccessToken;
+use Flarum\Core\Guest;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Zend\Stratigility\MiddlewareInterface;
+
+class AuthenticateWithCookie implements MiddlewareInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(Request $request, Response $response, callable $out = null)
+    {
+        $request = $this->logIn($request);
+
+        return $out ? $out($request, $response) : $response;
+    }
+
+    /**
+     * Set the application's actor instance according to the request token.
+     *
+     * @param Request $request
+     * @return Request
+     */
+    protected function logIn(Request $request)
+    {
+        if ($token = $this->getToken($request)) {
+            if (! $token->isValid()) {
+                // TODO: https://github.com/flarum/core/issues/253
+            } elseif ($user = $token->user) {
+                $user->updateLastSeen()->save();
+
+                return $request->withAttribute('actor', $user);
+            }
+        }
+
+        return $request->withAttribute('actor', new Guest);
+    }
+
+    /**
+     * Get the access token referred to by the request cookie.
+     *
+     * @param Request $request
+     * @return AccessToken|null
+     */
+    protected function getToken(Request $request)
+    {
+        $token = array_get($request->getCookieParams(), 'flarum_remember');
+
+        if ($token) {
+            return AccessToken::find($token);
+        }
+    }
+}

framework/core/src/Http/Middleware/DispatchRoute.php

@@ -9,14 +9,16 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Http;
+namespace Flarum\Http\Middleware;
 
 use FastRoute\Dispatcher;
 use FastRoute\RouteParser;
+use Flarum\Http\RouteCollection;
+use Flarum\Http\Exception\RouteNotFoundException;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
-class RouterMiddleware
+class DispatchRoute
 {
     /**
      * @var RouteCollection

framework/core/src/Http/Middleware/HandleErrors.php

@@ -0,0 +1,60 @@
+<?php
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http\Middleware;
+
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Zend\Diactoros\Response\HtmlResponse;
+use Zend\Stratigility\ErrorMiddlewareInterface;
+
+class HandleErrors implements ErrorMiddlewareInterface
+{
+    /**
+     * @var string
+     */
+    protected $templateDir;
+
+    /**
+     * @param string $templateDir
+     */
+    public function __construct($templateDir)
+    {
+        $this->templateDir = $templateDir;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke($error, Request $request, Response $response, callable $out = null)
+    {
+        $status = 500;
+        $errorCode = $error->getCode();
+
+        // If it seems to be a valid HTTP status code, we pass on the
+        // exception's status.
+        if (is_int($errorCode) && $errorCode >= 400 && $errorCode < 600) {
+            $status = $errorCode;
+        }
+
+        $errorPage = $this->getErrorPage($status);
+
+        return new HtmlResponse($errorPage, $status);
+    }
+
+    protected function getErrorPage($status)
+    {
+        if (! file_exists($errorPage = $this->templateDir."/$status.html")) {
+            $errorPage = $this->templateDir.'/500.html';
+        }
+
+        return file_get_contents($errorPage);
+    }
+}

framework/core/src/Http/Middleware/ParseJsonBody.php

@@ -0,0 +1,32 @@
+<?php
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Flarum\Http\Middleware;
+
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Zend\Stratigility\MiddlewareInterface;
+
+class ParseJsonBody implements MiddlewareInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(Request $request, Response $response, callable $out = null)
+    {
+        if (str_contains($request->getHeaderLine('content-type'), 'json')) {
+            $input = json_decode($request->getBody(), true);
+
+            $request = $request->withParsedBody($input ?: []);
+        }
+
+        return $out ? $out($request, $response) : $response;
+    }
+}

framework/core/src/Http/UrlGenerator.php

@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Flarum\Http;
-
-use Flarum\Core;
-
-class UrlGenerator
-{
-    protected $routes;
-
-    protected $prefix;
-
-    public function __construct(RouteCollection $routes)
-    {
-        $this->routes = $routes;
-    }
-
-    public function toRoute($name, $parameters = [])
-    {
-        $path = $this->routes->getPath($name, $parameters);
-        $path = ltrim($path, '/');
-
-        return Core::url($this->prefix) . "/$path";
-    }
-
-    public function toAsset($path)
-    {
-        return Core::url($this->prefix) . "/assets/$path";
-    }
-}