First complete version of an integrated panel area, adds new panel.limit config option to set the number of items to display, improved cache handling, other misc improvements.

Author: scottboms

README.md

@@ -56,6 +56,7 @@ If you want to explore the data returned via the plugin to the snippet or that y
 | dateformat      | `M d, Y`        | No        | Adjust date format per PHP datetime formats    |
 | excludereplies  | `true`          | No        | Exclude replies from results?                  |
 | onlymedia       | `false`         | No        | Only show posts with media attachments?        |
+| panel.limit     | `12`            | No        | Number of results to display in the Panel Area |
 
 Date formatting follows the [available format options from PHP](https://php.net/manual/en/function.date.php).
 
@@ -71,6 +72,9 @@ Example Config:
       'cache'      => true,
       'cachettl'   => 300 // 5 minutes
       'onlymedia'  => true,
+      'panel'      => [
+        'limit' => 6
+      ]
     ]
   ]
 ```

src/Helpers/CacheKey.php renamed to classes/CacheKey.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Scottboms\Mastodon\Helpers;
+namespace Scottboms\Mastodon;
 
 use Exception;
 
@@ -32,4 +32,4 @@ public static function forAccountInfo(string $username, string $server): string
 
 		return "account-info-{$username}@{$server}";
 	}
-}
+}

classes/Feed.php

@@ -11,7 +11,7 @@
 use Kirby\Toolkit\Collection;
 use Kirby\Toolkit\Obj;
 use Kirby\Toolkit\Str;
-use Scottboms\Mastodon\Helpers\CacheKey;
+use Scottboms\Mastodon\CacheKey;
 
 use function option;
 
@@ -87,7 +87,7 @@ protected function getUserId(): ?string
 	}
 
 	/*
-	 * factory constructor method
+	 * factory constructor
 	 * @var Array
 	 */
 	public static function build(array $options = []): self
@@ -128,11 +128,14 @@ public function getAccountInfo(): array
 			'id'              => $json['id'] ?? null,
 			'username'        => $json['username'] ?? null,
 			'display_name'    => $json['display_name'] ?? null,
+			'server'          => $this->options['server'] ?? null,
 			'avatar_static'   => $json['avatar_static'] ?? null,
-			'uri'             => $json['uri'] ?? null,
+			'url'             => $json['url'] ?? null,
 			'note'            => $json['note'] ?? null,
 			'followers_count' => $json['followers_count'] ?? null,
 			'following_count' => $json['following_count'] ?? null,
+			'statuses_count'  => $json['statuses_count'] ?? null,
+			'last_status_at'  => $json['last_status_at'] ?? null,
 		];
 
 		// cache the result
@@ -208,17 +211,11 @@ public static function getFeed($feedUrl, array $options = []): array|string
 	/*
 	 * @var Bool
 	 */
-	public static function clearFeedCache(array $options = []): bool
+	public static function clearCache(array $options = []): bool
 	{
-		$instance = static::build($options);
 		$cache = kirby()->cache('scottboms.mastodon');
-
-		$server = $instance->options['server'];
-		$userId = $instance->options['userid'];
-
-		$cacheKey = CacheKey::forFeed($server, $userId);
-
-		return $cache->remove($cacheKey);
+		// flush the entire cache
+		return (bool) $cache->flush();
 	}
 
 	/*

index.css

@@ -13,7 +13,7 @@
 
 load([
 	'Scottboms\Mastodon\Feed' => __DIR__ . '/classes/Feed.php',
-	'Scottboms\Mastodon\Helpers\CacheKey' => __DIR__ . '/src/Helpers/CacheKey.php',
+	'Scottboms\Mastodon\CacheKey' => __DIR__ . '/classes/CacheKey.php',
 ]);
 
 use Scottboms\Mastodon\Feed;
@@ -43,21 +43,24 @@
 			'limit'					 => 20,
 			'dateformat'     => 'M d, Y',
 			'excludereplies' => true,
-			'onlymedia' 		 => false
+			'onlymedia' 		 => false,
+			'panel' => [
+				'limit' => 12
+			],
 		],
 		'api' => [
 			'routes' => require __DIR__ . '/lib/routes.php'
 		],
 		'autoload' => [
 			'psr-4' => [
-				'Scottboms\\Mastodon\\' => __DIR__ . '/src',
+				'Scottboms\\Mastodon\\' => __DIR__ . '/classes',
 			]
 		],
 		'areas' => [
 			'mastodon-feed' => function ($kirby) {
 				return [
 					'label' => 'Mastodon Feed',
-					'icon'  => 'rss',
+					'icon'  => 'mastodon',
 					'breadcrumbLabel' => function() {
 						return 'Mastodon Feed';
 					},
@@ -78,16 +81,15 @@
 								    throw new Exception('Feed did not return a valid collection.');
 								  }
 
-									// debug:
-									//print_r($items->toArray());
-									//die();
+									$panelLimit = (int) option('scottboms.mastodon-feed.panel.limit', 12);
+									$panelLimit = max(1, $panelLimit);
 
 								  return [
 								    'component' => 'k-mastodon-feed-view',
 								    'props' => [
 								      'status' => 'Mastodon feed loaded',
 											'account' => $account,
-								      'items'  => $items->limit(5)->values() // limit to 5 items
+								      'items'  => $items->limit($panelLimit)->values(),
 								    ]
 								  ];
 
@@ -102,7 +104,7 @@
 									];
 								}
 
-								// you can return data from your Feed class here
+								// return data from feed class
 								return [
 									'component' => 'k-mastodon-feed-view',
 									'title' => 'Mastodon Feed',