Boyscouting

Author: soatok

src/FaqOff/Endpoints/Admin/Authors.php

@@ -3,7 +3,6 @@
 namespace Soatok\FaqOff\Endpoints\Admin;
 
 use Interop\Container\Exception\ContainerException;
-use ParagonIE\Ionizer\InvalidDataException;
 use Psr\Http\Message\{
     RequestInterface,
     ResponseInterface

src/FaqOff/Endpoints/Admin/CustomContent.php

@@ -19,6 +19,7 @@
     RuntimeError,
     SyntaxError
 };
+
 /**
  * Class CustomContent
  * @package Soatok\FaqOff\Endpoints\Admin

src/FaqOff/Endpoints/Admin/Settings.php

@@ -3,7 +3,6 @@
 namespace Soatok\FaqOff\Endpoints\Admin;
 
 use Interop\Container\Exception\ContainerException;
-use ParagonIE\Ionizer\InvalidDataException;
 use Psr\Http\Message\{
     RequestInterface,
     ResponseInterface
@@ -37,7 +36,6 @@ class Settings extends BackendEndpoint
      * @param string $file
      * @return ResponseInterface
      * @throws ContainerException
-     * @throws InvalidDataException
      * @throws LoaderError
      * @throws RuntimeError
      * @throws SyntaxError
@@ -87,7 +85,6 @@ protected function editFile(
      * @param array $routerParams
      * @return ResponseInterface
      * @throws ContainerException
-     * @throws InvalidDataException
      * @throws LoaderError
      * @throws RuntimeError
      * @throws SyntaxError

src/FaqOff/Endpoints/Admin/Themes.php

@@ -8,11 +8,11 @@
     ResponseInterface
 };
 use Slim\Container;
+use Soatok\FaqOff\BackendEndpoint;
 use Soatok\FaqOff\Filter\{
     CreateThemeFilter,
     EditThemeFilter
 };
-use Soatok\FaqOff\BackendEndpoint;
 use Soatok\FaqOff\MessageOnceTrait;
 use Soatok\FaqOff\Splices\Themes as ThemeSplice;
 use Twig\Error\{

src/FaqOff/Endpoints/GenericError.php

@@ -2,8 +2,10 @@
 declare(strict_types=1);
 namespace Soatok\FaqOff\Endpoints;
 
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\{
+    RequestInterface,
+    ResponseInterface
+};
 use Slim\Http\Request;
 use Soatok\FaqOff\FrontendEndpoint;
 use Soatok\FaqOff\MessageOnceTrait;

src/FaqOff/Endpoints/HomePage.php

@@ -3,17 +3,22 @@
 namespace Soatok\FaqOff\Endpoints;
 
 use Interop\Container\Exception\ContainerException;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\{
+    RequestInterface,
+    ResponseInterface
+};
 use Slim\Container;
-use Soatok\AnthroKit\Endpoint;
 use Soatok\FaqOff\FrontendEndpoint;
 use Soatok\FaqOff\MessageOnceTrait;
-use Soatok\FaqOff\Splices\Authors;
-use Soatok\FaqOff\Splices\Notices;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Error\SyntaxError;
+use Soatok\FaqOff\Splices\{
+    Authors,
+    Notices
+};
+use Twig\Error\{
+    LoaderError,
+    RuntimeError,
+    SyntaxError
+};
 
 /**
  * Class HomePage

src/FaqOff/Endpoints/Manage/AJAX.php

@@ -3,8 +3,10 @@
 namespace Soatok\FaqOff\Endpoints\Manage;
 
 use League\CommonMark\CommonMarkConverter;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\{
+    RequestInterface,
+    ResponseInterface
+};
 use Slim\Http\StatusCode;
 use Soatok\FaqOff\BackendEndpoint;
 use Soatok\FaqOff\Filter\ContributorAjaxFilter;

src/FaqOff/Endpoints/Manage/Author.php

@@ -8,12 +8,12 @@
     ResponseInterface
 };
 use Slim\Container;
+use Soatok\FaqOff\BackendEndpoint;
 use Soatok\FaqOff\Filter\{
     CreateAuthorFilter,
     CreateCollectionFilter,
     EditAuthorFilter
 };
-use Soatok\FaqOff\BackendEndpoint;
 use Soatok\FaqOff\MessageOnceTrait;
 use Soatok\FaqOff\Splices\{
     Authors,

src/FaqOff/Endpoints/Manage/Entries.php

@@ -115,7 +115,10 @@ protected function createEntry(
                 $post['attach-to'] ?? [],
                 $post['index-me'],
                 $post['question_box'],
-                $question['questionid'] ?? null
+                $question['questionid'] ?? null,
+                !empty($post['opengraph_image_url'])
+                    ? $post['opengraph_image_url']
+                    : null
             );
             if ($newEntryId) {
                 $this->messageOnce('Entry created successfully', 'success');

src/FaqOff/Endpoints/Manage/Invite.php

@@ -16,7 +16,6 @@
 };
 use Soatok\FaqOff\BackendEndpoint;
 use Soatok\FaqOff\MessageOnceTrait;
-use Soatok\FaqOff\Splices\Accounts;
 
 /**
  * Class Invite

src/FaqOff/Splices/Entry.php

@@ -101,6 +101,7 @@ public function countHit(
      * @param bool $indexMe
      * @param bool $allowQuestions
      * @param int|null $questionId
+     * @param string|null $opengraphImageUrl
      * @return int|null
      * @throws \Exception
      */
@@ -112,7 +113,8 @@ public function create(
         array $attachTo,
         bool $indexMe = false,
         bool $allowQuestions = false,
-        ?int $questionId = null
+        ?int $questionId = null,
+        ?string $opengraphImageUrl = null
     ): ?int {
         $now = (new \DateTime())->format(\DateTime::ISO8601);
         $newEntryId = $this->db->insertGet(
@@ -126,9 +128,7 @@ public function create(
                 'modified' => $now,
                 'contents' => $contents,
                 'uniqueid' => Base32::encode(random_bytes(20)),
-                'opengraph_image_url' => !empty($postData['opengraph_image_url'])
-                    ? $postData['opengraph_image_url']
-                    : null,
+                'opengraph_image_url' => $opengraphImageUrl,
                 'allow_questions' => $allowQuestions,
             ],
             'entryid'
@@ -492,8 +492,8 @@ public function update(int $entryId, array $post): bool
                 'options' => json_encode($options),
                 'modified' => (new \DateTime())
                     ->format(\DateTime::ISO8601),
-                'opengraph_image_url' => !empty($postData['opengraph_image_url'])
-                    ? $postData['opengraph_image_url']
+                'opengraph_image_url' => !empty($post['opengraph_image_url'])
+                    ? $post['opengraph_image_url']
                     : null,
                 'allow_questions' => $post['question_box']
             ],

src/FaqOff/Splices/EntryCollection.php

@@ -45,8 +45,8 @@ public function create(int $authorId, array $data): ?int
                 'theme' => $data['theme'] < 1 ? null : $data['theme'],
                 'title' => $data['title'],
                 'url' => $url,
-                'opengraph_image_url' => !empty($postData['opengraph_image_url'])
-                    ? $postData['opengraph_image_url']
+                'opengraph_image_url' => !empty($data['opengraph_image_url'])
+                    ? $data['opengraph_image_url']
                     : null,
                 'allow_questions' => $data['question_box']
             ],