From 87237f15618e2320967b9380c360b89f7323d2e9 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 30 Aug 2026 16:01:05 +0000
Subject: [PATCH] =Meta overhaul, slight reference fixes in BreadcrumbsManager
---
inc/managers/SEO/BreadcrumbManager.php | 132 ++++++++++++++++++++-----------------------
1 files changed, 62 insertions(+), 70 deletions(-)
diff --git a/inc/managers/SEO/BreadcrumbManager.php b/inc/managers/SEO/BreadcrumbManager.php
index 224569f..9d09ed6 100644
--- a/inc/managers/SEO/BreadcrumbManager.php
+++ b/inc/managers/SEO/BreadcrumbManager.php
@@ -2,6 +2,7 @@
namespace JVBase\managers\SEO;
use JVBase\managers\Cache;
+use JVBase\managers\DirectoryManager;
use JVBase\registrar\Registrar;
use JVBase\base\Site;
use WP_Post;
@@ -20,14 +21,21 @@
class BreadcrumbManager
{
private Cache $cache;
+ private Cache $termCache;
+ private Cache $postCache;
+ private Cache $userCache;
private static ?self $instance = null;
+ private static bool $hasDirectory;
+ private static array $directories;
private function __construct()
{
- $this->cache = Cache::for('breadcrumbs', MONTH_IN_SECONDS)->connect('post')->connect('taxonomy')->connect('user');
- if (JVB_TESTING) {
- $this->cache->flush();
- }
+ $this->cache = Cache::for('breadcrumbs');
+ $this->termCache = Cache::for('breadcrumbs_tax', 'term');
+ $this->postCache = Cache::for('breadcrumbs_post', 'post');
+ $this->userCache = Cache::for('breadcrumbs_user', 'user');
+ self::$hasDirectory = Site::has('is_directory');
+ self::$directories = self::$hasDirectory ? DirectoryManager::getInstance()->directories() : [];
}
public static function getInstance(): self
@@ -50,29 +58,20 @@
}
- switch (true) {
+ $key = match(true) {
+ is_singular() => get_queried_object_id(),
+ is_tax() => get_queried_object()->term_id,
+ is_post_type_archive() => get_queried_object()->name,
+ default => 'home'
+ };
+ $cache = match(true) {
+ is_singular() => $this->postCache,
+ is_tax() => $this->termCache,
+ is_author() => $this->userCache,
+ default => $this->cache
+ };
- case is_singular():
- $key = get_queried_object_id();
- break;
- case is_post_type_archive():
- $obj = get_queried_object();
- $key = $obj->name;
- break;
- case is_tax():
- $obj = get_queried_object();
- $key = $obj->taxonomy;
- break;
- case is_home():
- $obj = get_queried_object();
- $key = $obj->post_type;
- break;
- default:
- $key = 'home';
- break;
- }
-
- return $this->cache->remember(
+ return $cache->remember(
$key,
function() {
$crumbs = $this->buildCrumbs();
@@ -96,6 +95,9 @@
];
$obj = get_queried_object();
+ if (is_null($obj)) {
+ return $crumbs;
+ }
if (is_tax()) {
$crumbs = $this->addTaxonomyCrumbs($crumbs, $obj);
} elseif (is_singular() || is_home()) {
@@ -122,12 +124,11 @@
$content = is_array($registrar->registrar->for) ? $registrar->registrar->for[0] : $registrar->registrar->for;
$contentRegistrar = Registrar::getInstance($content);
- if($contentRegistrar && $contentRegistrar->hasFeature('show_directory')) {
- $directory = JVB()->directories();
- if ($directory && !empty($directory->directories($content)??[])){
+ if(self::$hasDirectory && $contentRegistrar && $contentRegistrar->hasFeature('show_directory')) {
+ if (!empty(self::$directories[$content]??[])){
$crumbs[] = [
- 'name' => $directory->directories($content)['title'],
- 'url' =>$directory->directories($content)['url']
+ 'name' => self::$directories[$content]['title'],
+ 'url' => self::$directories[$content]['url']
];
}
} else {
@@ -145,12 +146,12 @@
// Add directory if exists
- if ($registrar && $registrar->hasFeature('directory')) {
- $directory = JVB()->directories();
- if ($directory && !empty($directory->directories($tax))) {
+ if (self::$hasDirectory && $registrar && $registrar->hasFeature('show_directory')) {
+
+ if (!empty(self::$directories[$tax]??[])) {
$crumbs[] = [
- 'name' => $directory['title'],
- 'url' => $directory['url']
+ 'name' => self::$directories[$tax]['title'],
+ 'url' => self::$directories[$tax]['url']
];
}
}
@@ -172,25 +173,15 @@
$crumbConfig = $registrar->getConfig('breadcrumbs');
}
- if($registrar && $registrar->hasFeature('show_directory')) {
- $directory = JVB()->directories();
- if ($directory && !empty($directory->directories($content)??[])){
- $crumbs[] = [
- 'name' => $directory->directories($content)['title'],
- 'url' =>$directory->directories($content)['url']
- ];
- }
- }
-
// Handle directory posts specially
- if (JVB()->directories() && JVB()->directories()->isDirectory()) {
+ if (self::$hasDirectory && DirectoryManager::getInstance()->isDirectory()) {
$pos = jvbGetDirectoryInfo();
if (!empty($pos)) {
// Special case for map
if ($pos['title'] == 'Map') {
$crumbs[] = [
'name' => 'Tattoo Shops',
- 'url' => JVB()->directories()->directories(BASE.'shop')['url']
+ 'url' => DirectoryManager::getInstance()->directories(BASE.'shop')['url']??''
];
}
@@ -224,17 +215,18 @@
$registrar = Registrar::getInstance($name);
- if($registrar && $registrar->hasFeature('show_directory')) {
- $directory = JVB()->directories();
- if ($directory && !empty($directory->directories($name)??[])){
+ if(self::$hasDirectory && $registrar && $registrar->hasFeature('show_directory')) {
+
+ if (!empty(self::$directories[$name]??[])){
$crumbs[] = [
- 'name' => $directory->directories($name)['title'],
- 'url' =>$directory->directories($name)['url']
+ 'name' => self::$directories[$name]['title'],
+ 'url' => self::$directories[$name]['url']
];
}
} elseif (Site::has('is_directory') && $name === 'directory') {
+
$crumbs[] = [
- 'name' => JVB()->directories()->referAs(true),
+ 'name' => DirectoryManager::getInstance()->referAs(true),
'url' => get_post_type_archive_link($type)
];
} elseif ($registrar) {
@@ -243,11 +235,22 @@
'url' => get_post_type_archive_link($type)
];
} else {
- $postTypeObject = get_post_type_object($type);
- $crumbs[] = [
- 'name' => $postTypeObject->label,
- 'url' => get_post_type_archive_link($type)
- ];
+
+ if (function_exists('is_shop') && is_shop()) {
+ $ID = get_option( 'woocommerce_shop_page_id' );
+ $crumbs[] = [
+ 'name' => get_the_title($ID),
+ 'url' => get_the_permalink($ID)
+ ];
+
+ } else {
+ $postTypeObject = get_post_type_object($type);
+ $crumbs[] = [
+ 'name' => $postTypeObject->label,
+ 'url' => get_post_type_archive_link($type)
+ ];
+ }
+
}
return $crumbs;
@@ -390,17 +393,6 @@
];
}
- /**
- * Invalidate breadcrumb cache for specific object
- */
- public function invalidateCache(?int $objectId = null): void
- {
- if ($objectId) {
- $this->cache->forget($objectId);
- } else {
- $this->cache->flush();
- }
- }
public function addTaxToCrumbs(array $crumbs, string|array $taxonomy):array
{
--
Gitblit v1.10.0