From fc15d2131478d109e0b54b39294082184fbb1362 Mon Sep 17 00:00:00 2001
From: Richard Dern <richard@athaliasoft.com>
Date: Sat, 11 May 2024 16:35:34 +0200
Subject: [PATCH] Include bundle in view data

---
 app/Classes/AttachmentsManager.php              | 6 +++---
 app/View/Components/BaseMediaComponent.php      | 4 +++-
 resources/views/components/chat/me.blade.php    | 2 +-
 resources/views/components/chat/other.blade.php | 2 +-
 resources/views/components/image.blade.php      | 6 +++---
 resources/views/components/sound.blade.php      | 2 +-
 resources/views/components/spoiler.blade.php    | 2 +-
 resources/views/components/update.blade.php     | 2 +-
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/Classes/AttachmentsManager.php b/app/Classes/AttachmentsManager.php
index 43f0329..d9cca13 100644
--- a/app/Classes/AttachmentsManager.php
+++ b/app/Classes/AttachmentsManager.php
@@ -384,11 +384,11 @@ private function getBladeComponent(array $data, ?array $variant, ?array $options
     {
         switch ($this->kind) {
             case self::Images:
-                return new Image($data, $variant, $options);
+                return new Image($this->bundle, $data, $variant, $options);
             case self::Sounds:
-                return new Sound($data);
+                return new Sound($this->bundle, $data);
             case self::Videos:
-                return new Video($data);
+                return new Video($this->bundle, $data);
             default:
                 throw new Exception(sprintf('Unknown Blade Component for attachment kind "%s"', $this->kind));
         }
diff --git a/app/View/Components/BaseMediaComponent.php b/app/View/Components/BaseMediaComponent.php
index 26f6818..4b10b63 100644
--- a/app/View/Components/BaseMediaComponent.php
+++ b/app/View/Components/BaseMediaComponent.php
@@ -2,6 +2,7 @@
 
 namespace App\View\Components;
 
+use App\Classes\Bundle;
 use Closure;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Storage;
@@ -15,7 +16,7 @@ abstract class BaseMediaComponent extends Component
     /**
      * Create a new component instance.
      */
-    public function __construct(protected array $data, protected ?array $variant = [], protected ?array $options = [])
+    public function __construct(protected Bundle $bundle, protected array $data, protected ?array $variant = [], protected ?array $options = [])
     {
     }
 
@@ -33,6 +34,7 @@ public function render(): View|Closure|string
             'originalData' => $this->data,
             'variantData'  => $this->variant,
             'options'      => $this->options,
+            'bundle'       => $this->bundle,
         ]);
     }
 
diff --git a/resources/views/components/chat/me.blade.php b/resources/views/components/chat/me.blade.php
index a5a9559..d514db7 100644
--- a/resources/views/components/chat/me.blade.php
+++ b/resources/views/components/chat/me.blade.php
@@ -1 +1 @@
-<div class="chat-me markdown-body">{!! (new \App\Services\Markdown\Formatter($slot))->render() !!}</div>
+<div class="chat-me markdown-body">{!! (new \App\Services\Markdown\Formatter($slot, $mainBundle))->render() !!}</div>
diff --git a/resources/views/components/chat/other.blade.php b/resources/views/components/chat/other.blade.php
index b7ee8ea..85c42e1 100644
--- a/resources/views/components/chat/other.blade.php
+++ b/resources/views/components/chat/other.blade.php
@@ -1,3 +1,3 @@
 @props(['name'])
 
-<div class="chat-other markdown-body">{!! (new \App\Services\Markdown\Formatter($slot))->render() !!}</div>
+<div class="chat-other markdown-body">{!! (new \App\Services\Markdown\Formatter($slot, $mainBundle))->render() !!}</div>
diff --git a/resources/views/components/image.blade.php b/resources/views/components/image.blade.php
index f469f42..5b4ab7f 100644
--- a/resources/views/components/image.blade.php
+++ b/resources/views/components/image.blade.php
@@ -1,7 +1,7 @@
 <figure>
     @if (!empty($originalData['prompt']) && empty($options['nolink']))
     <figcaption class="markdown-body">
-        {!! (new \App\Services\Markdown\Formatter($originalData['prompt']))->render() !!}
+        {!! (new \App\Services\Markdown\Formatter($originalData['prompt'], $bundle))->render() !!}
     </figcaption>
     @endif
     @if(!empty($options['nolink']))
@@ -14,10 +14,10 @@
     @if (empty($options['nolink']) && (!empty($originalData['title']) || !empty($originalData['attribution'])))
     <figcaption class="markdown-body">
         @if (!empty($originalData['title']))
-            {!! (new \App\Services\Markdown\Formatter($originalData['title']))->render() !!}
+            {!! (new \App\Services\Markdown\Formatter($originalData['title'], $bundle))->render() !!}
         @endif
         @if (!empty($originalData['attribution']))
-            {!! (new \App\Services\Markdown\Formatter($originalData['attribution']))->render() !!}
+            {!! (new \App\Services\Markdown\Formatter($originalData['attribution'], $bundle))->render() !!}
         @endif
     </figcaption>
     @endif
diff --git a/resources/views/components/sound.blade.php b/resources/views/components/sound.blade.php
index d9b37c1..5e3e610 100644
--- a/resources/views/components/sound.blade.php
+++ b/resources/views/components/sound.blade.php
@@ -4,7 +4,7 @@
     </audio>
     <figcaption class="markdown-body">
         @if (!empty($originalData['title']))
-            {!! (new \App\Services\Markdown\Formatter($originalData['title']))->render() !!}
+            {!! (new \App\Services\Markdown\Formatter($originalData['title'], $bundle))->render() !!}
         @endif
     </figcaption>
 </figure>
diff --git a/resources/views/components/spoiler.blade.php b/resources/views/components/spoiler.blade.php
index 5946f82..2a1a4ff 100644
--- a/resources/views/components/spoiler.blade.php
+++ b/resources/views/components/spoiler.blade.php
@@ -1,4 +1,4 @@
 <details class="spoiler">
     <summary>Spoiler</summary>
-    <div class="markdown-body">{!! (new \App\Services\Markdown\Formatter($slot))->render() !!}</div>
+    <div class="markdown-body">{!! (new \App\Services\Markdown\Formatter($slot, $mainBundle))->render() !!}</div>
 </details>
diff --git a/resources/views/components/update.blade.php b/resources/views/components/update.blade.php
index 87b7e45..d9ef5fa 100644
--- a/resources/views/components/update.blade.php
+++ b/resources/views/components/update.blade.php
@@ -1,4 +1,4 @@
 <details class="update">
     <summary>{{ $title }}</summary>
-    <div class="markdown-body">{!! (new \App\Services\Markdown\Formatter($slot))->render() !!}</div>
+    <div class="markdown-body">{!! (new \App\Services\Markdown\Formatter($slot, $mainBundle))->render() !!}</div>
 </details>