Working on adding new GEDCOM tags

1 files changed, 15 insertions, 33 deletions

diff --git a/app/Http/RequestHandlers/NotePage.php b/app/Http/RequestHandlers/NotePage.php
index a972c1390a..bd7499f460 100644
--- a/app/Http/RequestHandlers/NotePage.php
+++ b/app/Http/RequestHandlers/NotePage.php
@@ -21,14 +21,11 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Auth;
-use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\Filter;
 use Fisharebest\Webtrees\Http\ViewResponseTrait;
-use Fisharebest\Webtrees\Note;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\ClipboardService;
 use Fisharebest\Webtrees\Tree;
-use Illuminate\Support\Collection;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -69,42 +66,27 @@ class NotePage implements RequestHandlerInterface
         $xref = $request->getAttribute('xref');
         assert(is_string($xref));
 
-        $note = Registry::noteFactory()->make($xref, $tree);
-        $note = Auth::checkNoteAccess($note, false);
+        $record = Registry::noteFactory()->make($xref, $tree);
+        $record = Auth::checkNoteAccess($record, false);
 
         // Redirect to correct xref/slug
-        $slug = Registry::slugFactory()->make($note);
+        $slug = Registry::slugFactory()->make($record);
 
-        if ($note->xref() !== $xref || $request->getAttribute('slug') !== $slug) {
-            return redirect($note->url(), StatusCodeInterface::STATUS_MOVED_PERMANENTLY);
+        if ($record->xref() !== $xref || $request->getAttribute('slug') !== $slug) {
+            return redirect($record->url(), StatusCodeInterface::STATUS_MOVED_PERMANENTLY);
         }
 
         return $this->viewResponse('note-page', [
-            'clipboard_facts'  => $this->clipboard_service->pastableFacts($note),
-            'facts'            => $this->facts($note),
-            'families'         => $note->linkedFamilies('NOTE'),
-            'individuals'      => $note->linkedIndividuals('NOTE'),
-            'note'             => $note,
-            'media_objects'    => $note->linkedMedia('NOTE'),
-            'meta_description' => '',
-            'meta_robots'      => 'index,follow',
-            'sources'          => $note->linkedSources('NOTE'),
-            'text'             => Filter::formatText($note->getNote(), $tree),
-            'title'            => $note->fullName(),
-            'tree'             => $tree,
+            'clipboard_facts'      => $this->clipboard_service->pastableFacts($record),
+            'linked_families'      => $record->linkedFamilies('NOTE'),
+            'linked_individuals'   => $record->linkedIndividuals('NOTE'),
+            'linked_media_objects' => $record->linkedMedia('NOTE'),
+            'linked_sources'       => $record->linkedSources('NOTE'),
+            'meta_description'     => '',
+            'meta_robots'          => 'index,follow',
+            'record'               => $record,
+            'title'                => $record->fullName(),
+            'tree'                 => $tree,
         ]);
     }
-
-    /**
-     * @param Note $record
-     *
-     * @return Collection<Fact>
-     */
-    private function facts(Note $record): Collection
-    {
-        return $record->facts()
-            ->filter(static function (Fact $fact): bool {
-                return $fact->tag() !== 'NOTE:CONT';
-            });
-    }
 }