From 6782ea268993276da2daf67e6d23b9e462db6533 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 10 Feb 2023 18:20:57 +0100
Subject: [PATCH] many small fixes

---
 Controller/ApiController.php       | 50 +++++++++++++++++++++++++-----
 Theme/Backend/Lang/api.de.lang.php | 16 ----------
 Theme/Backend/Lang/api.en.lang.php | 16 ----------
 3 files changed, 42 insertions(+), 40 deletions(-)
 delete mode 100755 Theme/Backend/Lang/api.de.lang.php
 delete mode 100755 Theme/Backend/Lang/api.en.lang.php

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 3780021..41cda01 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -189,10 +189,20 @@ final class ApiController extends Controller
             $collection = null;
 
             foreach ($uploaded as $media) {
-                MediaMapper::create()->execute($media);
-                CommentMapper::writer()->createRelationTable('media', [$media->getId()], $comment->getId());
+                $this->createModelRelation(
+                    $request->header->account,
+                    $comment->getId(),
+                    $media->getId(),
+                    CommentMapper::class,
+                    'media',
+                    '',
+                    $request->getOrigin()
+                );
 
-                $accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/Comments/' . $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m') . '/' . $comment->getId();
+                $accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login
+                    . '/Comments/'
+                    . $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m')
+                    . '/' . $comment->getId();
 
                 $ref            = new Reference();
                 $ref->name      = $media->name;
@@ -200,7 +210,7 @@ final class ApiController extends Controller
                 $ref->createdBy = new NullAccount($request->header->account);
                 $ref->setVirtualPath($accountPath);
 
-                ReferenceMapper::create()->execute($ref);
+                $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
 
                 if ($collection === null) {
                     $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
@@ -210,7 +220,15 @@ final class ApiController extends Controller
                     );
                 }
 
-                CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());
+                $this->createModelRelation(
+                    $request->header->account,
+                    $collection->getId(),
+                    $ref->getId(),
+                    CollectionMapper::class,
+                    'sources',
+                    '',
+                    $request->getOrigin()
+                );
             }
         }
 
@@ -220,7 +238,15 @@ final class ApiController extends Controller
             foreach ($mediaFiles as $file) {
                 /** @var \Modules\Media\Models\Media $media */
                 $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
-                CommentMapper::writer()->createRelationTable('media', [$media->getId()], $comment->getId());
+                $this->createModelRelation(
+                    $request->header->account,
+                    $comment->getId(),
+                    $media->getId(),
+                    CommentMapper::class,
+                    'media',
+                    '',
+                    $request->getOrigin()
+                );
 
                 $ref            = new Reference();
                 $ref->name      = $media->name;
@@ -228,7 +254,7 @@ final class ApiController extends Controller
                 $ref->createdBy = new NullAccount($request->header->account);
                 $ref->setVirtualPath($path);
 
-                ReferenceMapper::create()->execute($ref);
+                $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
 
                 if ($collection === null) {
                     $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
@@ -238,7 +264,15 @@ final class ApiController extends Controller
                     );
                 }
 
-                CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());
+                $this->createModelRelation(
+                    $request->header->account,
+                    $collection->getId(),
+                    $ref->getId(),
+                    CollectionMapper::class,
+                    'sources',
+                    '',
+                    $request->getOrigin()
+                );
             }
         }
     }
diff --git a/Theme/Backend/Lang/api.de.lang.php b/Theme/Backend/Lang/api.de.lang.php
deleted file mode 100755
index a154311..0000000
--- a/Theme/Backend/Lang/api.de.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Karaka
- *
- * PHP Version 8.1
- *
- * @package   Modules\Comments
- * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
- * @version   1.0.0
- * @link      https://jingga.app
- */
-declare(strict_types=1);
-
-return ['Comments' => [
-]];
diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php
deleted file mode 100755
index a154311..0000000
--- a/Theme/Backend/Lang/api.en.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Karaka
- *
- * PHP Version 8.1
- *
- * @package   Modules\Comments
- * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
- * @version   1.0.0
- * @link      https://jingga.app
- */
-declare(strict_types=1);
-
-return ['Comments' => [
-]];