Stop resolving too early #7

Author: karaok491

src/Listeners/ModifyContentHtml.php

@@ -15,29 +15,12 @@
 use Flarum\Api\Serializer\BasicPostSerializer;
 use Flarum\Formatter\Event\Configuring;
 use Flarum\Http\UrlGenerator;
-use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class ModifyContentHtml
 {
     private $regex = '/<img src="http:\/\/(.+?)" title="(.*?)" alt="(.*?)">/';
 
-    /**
-     * @var UrlGenerator
-     */
-    private $url;
-
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    private $settings;
-
-    public function __construct(UrlGenerator $url, SettingsRepositoryInterface $settings)
-    {
-        $this->url = $url;
-        $this->settings = $settings;
-    }
-
     public function subscribe(Dispatcher $events)
     {
         $events->listen(Configuring::class, [$this, 'configuring']);
@@ -64,7 +47,7 @@ public function configuring(Configuring $configuring)
 
             $tag->attributes['src']->filterChain
                 ->append([$this, 'replaceUrl'])
-                ->addParameterByValue($this->url->to('api')->path('fof/secure-https/'));
+                ->addParameterByValue(app(UrlGenerator::class)->to('api')->path('fof/secure-https/'));
         }
     }
 
@@ -75,6 +58,6 @@ public function replaceUrl($attrValue, $proxyUrl)
 
     private function isProxyEnabled()
     {
-        return (bool) $this->settings->get('fof-secure-https.proxy');
+        return (bool) app('flarum.settings')->get('fof-secure-https.proxy');
     }
 }