Merge branch 'master' into visibility-scoping

# Conflicts:
#	bootstrap.php

extensions/approval/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2017 Toby Zerner
+Copyright (c) 2014-2018 Toby Zerner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

extensions/approval/bootstrap.php

@@ -11,15 +11,24 @@
 
 use Flarum\Approval\Access;
 use Flarum\Approval\Listener;
+use Flarum\Extend;
 use Illuminate\Contracts\Events\Dispatcher;
 
-return function (Dispatcher $events) {
-    $events->subscribe(Listener\AddClientAssets::class);
-    $events->subscribe(Listener\AddPostApprovalAttributes::class);
-    $events->subscribe(Listener\ApproveContent::class);
-    $events->subscribe(Listener\UnapproveNewContent::class);
+return [
+    (new Extend\Assets('forum'))
+        ->defaultAssets(__DIR__)
+        ->bootstrapper('flarum/approval/main'),
+    (new Extend\Assets('admin'))
+        ->asset(__DIR__.'/js/admin/dist/extension.js')
+        ->bootstrapper('flarum/approval/main'),
+    function (Dispatcher $events) {
+        $events->subscribe(Listener\AddPostApprovalAttributes::class);
+        $events->subscribe(Listener\ApproveContent::class);
+        $events->subscribe(Listener\HideUnapprovedContent::class);
+        $events->subscribe(Listener\UnapproveNewContent::class);
 
-    $events->subscribe(Access\TagPolicy::class);
-    $events->subscribe(Access\DiscussionPolicy::class);
-    $events->subscribe(Access\PostPolicy::class);
-};
+        $events->subscribe(Access\TagPolicy::class);
+        $events->subscribe(Access\DiscussionPolicy::class);
+        $events->subscribe(Access\PostPolicy::class);
+    },
+];

extensions/approval/src/Listener/AddClientAssets.php

@@ -1,47 +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\Approval\Listener;
-
-use Flarum\Frontend\Event\Rendering;
-use Illuminate\Contracts\Events\Dispatcher;
-
-class AddClientAssets
-{
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
-    {
-        $events->listen(Rendering::class, [$this, 'addAssets']);
-    }
-
-    /**
-     * @param Rendering $event
-     */
-    public function addAssets(Rendering $event)
-    {
-        if ($event->isForum()) {
-            $event->addAssets([
-                __DIR__.'/../../js/forum/dist/extension.js',
-                __DIR__.'/../../less/forum/extension.less'
-            ]);
-            $event->addBootstrapper('flarum/approval/main');
-        }
-
-        if ($event->isAdmin()) {
-            $event->addAssets([
-                __DIR__.'/../../js/admin/dist/extension.js'
-            ]);
-            $event->addBootstrapper('flarum/approval/main');
-        }
-    }
-}