From f19e24a377d9c33fa093b8fc43e949bef631a9d7 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 27 Dec 2017 16:15:21 +1030
Subject: [PATCH] Fix class names, view namespace

---
 extensions/embed/bootstrap.php                  |  5 ++++-
 .../src/{EmbedWebApp.php => EmbedFrontend.php}  |  6 +++---
 .../embed/src/EmbeddedDiscussionController.php  |  3 +--
 .../FlushEmbedAssetsWhenSettingsAreChanged.php  | 17 ++++++++---------
 4 files changed, 16 insertions(+), 15 deletions(-)
 rename extensions/embed/src/{EmbedWebApp.php => EmbedFrontend.php} (85%)

diff --git a/extensions/embed/bootstrap.php b/extensions/embed/bootstrap.php
index 0ecaf69bb..bf472cd09 100644
--- a/extensions/embed/bootstrap.php
+++ b/extensions/embed/bootstrap.php
@@ -11,8 +11,11 @@
 
 use Flarum\Embed\Listener;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Contracts\View\Factory;
 
-return function (Dispatcher $events) {
+return function (Dispatcher $events, Factory $view) {
     $events->subscribe(Listener\AddEmbedRoute::class);
     $events->subscribe(Listener\FlushEmbedAssetsWhenSettingsAreChanged::class);
+
+    $view->addNamespace('flarum-embed', __DIR__.'/views');
 };
diff --git a/extensions/embed/src/EmbedWebApp.php b/extensions/embed/src/EmbedFrontend.php
similarity index 85%
rename from extensions/embed/src/EmbedWebApp.php
rename to extensions/embed/src/EmbedFrontend.php
index 348a5a45b..67f91cf8a 100644
--- a/extensions/embed/src/EmbedWebApp.php
+++ b/extensions/embed/src/EmbedFrontend.php
@@ -10,9 +10,9 @@
 
 namespace Flarum\Embed;
 
-use Flarum\Forum\WebApp;
+use Flarum\Forum\Frontend;
 
-class EmbedWebApp extends WebApp
+class EmbedFrontend extends Frontend
 {
     /**
      * {@inheritdoc}
@@ -25,7 +25,7 @@ class EmbedWebApp extends WebApp
         $view->getCss()->addFile(__DIR__.'/../less/forum/extension.less');
 
         $view->loadModule('flarum/embed/main');
-        $view->layout = __DIR__.'/../views/embed.blade.php';
+        $view->layout = 'flarum-embed::embed';
 
         return $view;
     }
diff --git a/extensions/embed/src/EmbeddedDiscussionController.php b/extensions/embed/src/EmbeddedDiscussionController.php
index 91203a668..6321ae4c6 100644
--- a/extensions/embed/src/EmbeddedDiscussionController.php
+++ b/extensions/embed/src/EmbeddedDiscussionController.php
@@ -12,7 +12,6 @@ namespace Flarum\Embed;
 
 use Flarum\Api\Client;
 use Flarum\Forum\Controller\DiscussionController;
-use Flarum\Forum\Frontend;
 use Flarum\Http\UrlGenerator;
 use Illuminate\Contracts\Events\Dispatcher;
 
@@ -21,7 +20,7 @@ class EmbeddedDiscussionController extends DiscussionController
     /**
      * {@inheritdoc}
      */
-    public function __construct(Frontend $frontend, Dispatcher $events, Client $api, UrlGenerator $url)
+    public function __construct(EmbedFrontend $frontend, Dispatcher $events, Client $api, UrlGenerator $url)
     {
         parent::__construct($frontend, $events, $api, $url);
     }
diff --git a/extensions/embed/src/Listener/FlushEmbedAssetsWhenSettingsAreChanged.php b/extensions/embed/src/Listener/FlushEmbedAssetsWhenSettingsAreChanged.php
index 1fd24b564..01d9be516 100644
--- a/extensions/embed/src/Listener/FlushEmbedAssetsWhenSettingsAreChanged.php
+++ b/extensions/embed/src/Listener/FlushEmbedAssetsWhenSettingsAreChanged.php
@@ -10,8 +10,7 @@
 
 namespace Flarum\Embed\Listener;
 
-use Flarum\Embed\DiscussionController;
-use Flarum\Embed\EmbedWebApp;
+use Flarum\Embed\EmbedFrontend;
 use Flarum\Extension\Event\Disabled;
 use Flarum\Extension\Event\Enabled;
 use Flarum\Settings\Event\Saved;
@@ -20,16 +19,16 @@ use Illuminate\Contracts\Events\Dispatcher;
 class FlushEmbedAssetsWhenSettingsAreChanged
 {
     /**
-     * @var DiscussionController
+     * @var EmbedFrontend
      */
-    protected $webApp;
+    protected $frontend;
 
     /**
-     * @param EmbedWebApp $webApp
+     * @param EmbedFrontend $frontend
      */
-    public function __construct(EmbedWebApp $webApp)
+    public function __construct(EmbedFrontend $frontend)
     {
-        $this->webApp = $webApp;
+        $this->frontend = $frontend;
     }
 
     /**
@@ -48,12 +47,12 @@ class FlushEmbedAssetsWhenSettingsAreChanged
     public function flushCss(Saved $event)
     {
         if (preg_match('/^theme_|^custom_less$/i', $event->key)) {
-            $this->webApp->getAssets()->flushCss();
+            $this->frontend->getAssets()->flushCss();
         }
     }
 
     public function flushAssets()
     {
-        $this->webApp->getAssets()->flush();
+        $this->frontend->getAssets()->flush();
     }
 }