From 772462eeca3002a1d52508aeba485aab2b4742ad Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 03 Mar 2026 19:06:19 +0000
Subject: [PATCH] =MAJOR OVERHAUL. Likely should have made a new branch ages ago. Key changes: Registrar.php is the base for custom post types, taxonomies, and user roles. Replaces JVB_CONTENT, JVB_TAXONOMY, and JVB_USER constants, eliminates most of Features.php (except for JVB_SITE, JVB_MEMBERSHIP), and has built in sanitizing and validation via sub-classes. Also started a major overhaul of the Schema output. Created a shit ton of property traits and classes to help sanitize and ensure proper data for different schema types. Still a bunch to do, but better to be starting committing changes here on this other branch.

---
 inc/managers/SEO/BreadcrumbManager.php |   70 +++++++++++++++++++++--------------
 1 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/inc/managers/SEO/BreadcrumbManager.php b/inc/managers/SEO/BreadcrumbManager.php
index 9fb5d6d..8d3288e 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\registrar\Registrar;
 use JVBase\utility\Features;
 use WP_Post;
 use WP_Term;
@@ -24,6 +25,7 @@
 	private function __construct()
 	{
 		$this->cache = Cache::for('breadcrumbs', MONTH_IN_SECONDS)->connect('post')->connect('taxonomy')->connect('user');
+		$this->cache->flush();
 		if (JVB_TESTING) {
 			$this->cache->flush();
 		}
@@ -83,7 +85,7 @@
 
 		// Always start with home
 		$crumbs[] = [
-			'name' => 'Home',
+			'name' => get_bloginfo('name'),
 			'icon' => jvbIcon('house'),
 			'url'  => get_home_url(),
 		];
@@ -108,23 +110,27 @@
 	private function addTaxonomyCrumbs(array $crumbs, WP_Term $term): array
 	{
 		$tax = jvbNoBase($term->taxonomy);
-		$config = Features::getConfig($tax, 'term');
-
+		$registrar = Registrar::getInstance($tax);
 		// Add parent content archive if taxonomy is for single content type
-		if (count($config['for_content']) === 1) {
-			$contentConfig = JVB_CONTENT[$config['for_content'][0]];
-			$crumbs[] = [
-				'name' => $contentConfig['breadcrumb'] ?? $contentConfig['plural'],
-				'url'  => get_post_type_archive_link(jvbCheckBase($config['for_content'][0])),
-			];
-			$crumbs[] = [
-				'name' => 'By ' . $config['singular'],
-				'url'  => false,
-			];
+		if ($registrar) {
+			if (count($registrar->registrar->for) === 1){
+				$content = is_array($registrar->registrar->for) ? $registrar->registrar->for[0] : $registrar->registrar->for;
+				$contentRegistrar = Registrar::getInstance($content);
+
+				$crumbs[] = [
+					'name' => $contentRegistrar->getConfig('breadcrumbs')['title']??$contentRegistrar->getPlural(),
+					'url'  => get_post_type_archive_link(jvbCheckBase($content)),
+				];
+				$crumbs[] = [
+					'name' => 'By ' . $registrar->getSingular(),
+					'url'  => false,
+				];
+			}
 		}
 
+
 		// Add directory if exists
-		if (Features::forTaxonomy($tax)->has('directory')) {
+		if ($registrar && $registrar->hasFeature('directory')) {
 			$directory = JVB()->directories()?->directories($tax);
 			$crumbs[] = [
 				'name' => $directory['title'],
@@ -143,8 +149,12 @@
 	{
 		// Add directory if exists
 		$content = jvbNoBase($post->post_type);
-		if(Features::forContent($content)->has('show_directory')) {
-			$directory = JVB()->directories()->getDirectoryList()[$content]??[];
+		$registrar = Registrar::getInstance($content);
+		if ($registrar){
+			$crumbConfig = $registrar->getConfig('breadcrumbs');
+		}
+		if($registrar && $registrar->hasFeature('show_directory')) {
+			$directory = JVB()->directories()?->directories($content)??[];
 			if (!empty($directory)) {
 				$crumbs[] = [
 					'name'	=> $directory['title'],
@@ -154,7 +164,7 @@
 		}
 
 		// Handle directory posts specially
-		if (JVB()->directories()->isDirectory()) {
+		if (JVB()->directories() && JVB()->directories()->isDirectory()) {
 			$pos = jvbGetDirectoryInfo();
 			if (!empty($pos)) {
 				// Special case for map
@@ -171,9 +181,9 @@
 				];
 			}
 		} else {
-			$name = jvbNoBase($post->post_type);
-			if (array_key_exists($name, JVB_CONTENT) && array_key_exists('addCrumb', JVB_CONTENT[$name])) {
-				$crumbs = $this->addTaxToCrumbs($crumbs, JVB_CONTENT[$name]['addCrumb']);
+
+			if ($registrar && !empty($crumbConfig['addCrumb'])) {
+				$crumbs = $this->addTaxToCrumbs($crumbs, $crumbConfig['addCrumb']);
 			}
 			// Add post hierarchy
 			$crumbs = array_merge($crumbs, $this->buildPostHierarchy($post));
@@ -190,14 +200,16 @@
 		$type = is_singular() ? $obj->post_type : $obj->name;
 		$name = jvbNoBase($type);
 
+		$registrar = Registrar::getInstance($name);
 		if (Features::forSite()->has('is_directory') && $name === 'directory') {
 			$crumbs[] = [
 				'name'	=> JVB()->directories()->referAs(true),
 				'url'	=> get_post_type_archive_link($type)
 			];
-		} elseif ((is_post_type_archive() || !Features::forContent($name)->has('show_directory')) && array_key_exists($name, JVB_CONTENT)) {
+		} elseif (is_post_type_archive() && $registrar && $registrar->hasFeature('show_directory')) {
+
 			$crumbs[] = [
-				'name' => JVB_CONTENT[$name]['breadcrumb'] ?? JVB_CONTENT[$name]['plural'],
+				'name' => $registrar->getConfig('breadcrumb')['title'] ?? $registrar->getPlural(),
 				'url'  => get_post_type_archive_link($type)
 			];
 		}
@@ -317,17 +329,19 @@
 		$items = [];
 		$position = 1;
 
+		global $wp;
+		$current = home_url( add_query_arg( $_GET, $wp->request ) );
 		foreach ($crumbs as $crumb) {
 			// Schema requires a URL
 			if ($crumb['url'] === false) {
-				$crumb['url'] = get_permalink();
+				$crumb['url'] = $current;
 			}
 
 			$items[] = [
-				'@type'    => 'ListItem',
-				'position' => $position,
-				'name'     => $crumb['name'],
-				'item'     => $crumb['url'],
+				'@type'    	=> 'ListItem',
+				'@id'		=> $crumb['url'],
+				'position' 	=> $position,
+				'name'     	=> $crumb['name'],
 			];
 
 			$position++;
@@ -335,7 +349,7 @@
 
 		return [
 			'@type'           => 'BreadcrumbList',
-			'@id'             => get_permalink() . '/#breadcrumbs',
+			'@id'             => $current . '/#breadcrumbs',
 			'itemListElement' => $items
 		];
 	}

--
Gitblit v1.10.0