🐛 fix date handler

Signed-off-by: bnomei <[email protected]>

Author: bnomei

README.md

@@ -113,7 +113,7 @@ return [
 | link                      | `function($page){...}` | callback to return the link             |
 | text                      | `function($page){...}` | callback to return the text             |
 | info                      | `function($page){...}` | callback to return the info             |
-| format                    | `Y/m/d H:i:s`          | date format string                      |
+| format                    | `fn($datetime){...}`   | custom date format callback             |
 | hooks                     | `true`                 | use hooks to track users modified pages |
 | limit                     | `7`                    | limit list and cache items              |
 | expire                    | `1`                    | cache will expire n-minutes             |

composer.json

@@ -3,7 +3,7 @@
   "description": "Kirby Section to display recently modified content pages",
   "license": "MIT",
   "type": "kirby-plugin",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "authors": [
     {
       "name": "Bruno Meilick",

index.php

@@ -6,9 +6,19 @@
 App::plugin('bnomei/recently-modified', [
     'options' => [
         'query' => "site.index(true).sortBy('modified', 'desc').onlyModifiedByUser",
-        'format' => null,
+        'format' => function($datetime): string {
+            $handler = kirby()->option('date.handler') ?? 'date';
+            $formats = [
+                'date' => 'Y/m/d H:i:s',
+                'intl' => 'yyyy/MM/dd HH:mm:ss', // https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax
+                'strftime' => '%Y/%m/%d %H:%M:%S'
+            ];
+            $format = $formats[$handler] ?? $formats['date'];
+
+            return Str::date($datetime, $format, $handler);
+        },
         'info' => function (\Kirby\Cms\Page $page) {
-            return $page->modified(option('bnomei.recently-modified.format'));
+            return option('bnomei.recently-modified.format')($page->modified());
         },
         'link' => function (\Kirby\Cms\Page $page) {
             return $page->panel()->url();
@@ -29,7 +39,7 @@
                     return $user ? (string)$user->nameOrEmail() : '';
                 },
                 'datetime' => function () {
-                    return $this->model()->modified(option('bnomei.recently-modified.format'));
+                    return option('bnomei.recently-modified.format')($this->model()->modified());
                 },
             ],
         ],
@@ -192,28 +202,20 @@
                     $id = explode('?', ltrim(str_replace(['/pages/', '/_drafts/', '+', ' '], ['/', '/', '/', '/'], $id), '/'))[0];
                     $kirby = App::instance(null, true);
 
-                    $handler = $kirby->option('date.handler') ?? 'date';
-                    $formats = [
-                        'date' => 'Y/m/d H:i:s',
-                        'intl' => 'yyyy/MM/dd HH:mm:ss', // https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax
-                        'strftime' => '%Y/%m/%d %H:%M:%S'
-                    ];
-                    $format = $kirby->option('bnomei.recently-modified.format') ?? $formats[$handler] ?? $formats['date'];
-
                     if ($id === 'site') {
                         $user = site()->findRecentlyModifiedByUser();
                         $username = $user ? (string)$user->nameOrEmail() : '';
                         return [
                             'auser' => $username,
-                            'datetime' => Str::date(site()->modifiedTimestamp(), $format, $handler),
+                            'datetime' => option('bnomei.recently-modified.format')(site()->modifiedTimestamp()),
                         ];
                     }
                     if ($page = $kirby->page($id)) {
                         $user = $page->findRecentlyModifiedByUser();
                         $username = $user ? (string)$user->nameOrEmail() : '';
                         return [
                             'auser' => $username,
-                            'datetime' => $page->modified($format, $handler),
+                            'datetime' => option('bnomei.recently-modified.format')($page->modified()),
                         ];
                     }
                     return \Kirby\Http\Response::json([], 404);

vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby3-recently-modified',
-        'pretty_version' => '4.2.0',
-        'version' => '4.2.0.0',
+        'pretty_version' => '4.2.1',
+        'version' => '4.2.1.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby3-recently-modified' => array(
-            'pretty_version' => '4.2.0',
-            'version' => '4.2.0.0',
+            'pretty_version' => '4.2.1',
+            'version' => '4.2.1.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',