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/blocks/CustomBlocks.php |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/inc/blocks/CustomBlocks.php b/inc/blocks/CustomBlocks.php
index 00613e1..93e16ac 100644
--- a/inc/blocks/CustomBlocks.php
+++ b/inc/blocks/CustomBlocks.php
@@ -3,7 +3,7 @@
 
 use DateTime;
 use DOMDocument;
-use JVBase\managers\CacheManager;
+use JVBase\managers\Cache;
 use WP_Block;
 use WP_Query;
 
@@ -13,10 +13,11 @@
 
 class CustomBlocks
 {
-    protected CacheManager $cache;
+    protected Cache $cache;
     public function __construct()
     {
-        $this->cache = CacheManager::for('blocks', WEEK_IN_SECONDS);
+        $this->cache = Cache::for('blocks', WEEK_IN_SECONDS);
+		$this->cache->connect('post')->connect('taxonomy');
 		add_filter('render_block', [$this, 'render'], 999, 3);
 
         add_action('init', [$this, 'registerBlockStyles']);
@@ -72,16 +73,16 @@
 		if (function_exists($function)) {
 			return $function($block, $content);
 //			return $this->cache->remember(
-//				$block,
+//				get_the_ID(),
 //				function () use ($function, $block, $content) {
 //					return $function($block, $content);
 //				}
 //			);
 		} else if (method_exists($this, $method)) {
 			return $this->$method($block, $content);
-
+//
 //			return $this->cache->remember(
-//				$block,
+//				get_the_ID(),
 //				function () use ($method, $block, $content) {
 //					return $this->$method($block, $content);
 //				}
@@ -397,7 +398,7 @@
 		if ($cite !== '') {
 			$content = $this->stripTagContents('cite', $content);
 		}
-		$content = apply_filters('the_content', $content);
+		$content = jvb_filter_content( $content);
 
 		return '<blockquote'.$this->getClassesAndStyles($block['attrs'], ['pull']).'>'.
         	$content.
@@ -632,14 +633,14 @@
 		global $post;
 		$ID = get_post_thumbnail_id($post->ID);
 		$aOpen = $aClose = '';
-		if(!is_single($ID)) {
+		if(!is_single($post->ID)) {
 			$aOpen = '<a href="'.get_the_permalink($post->ID).'">';
 			$aClose = '</a>';
 		}
 
-        return $aOpen.'<figure'.$this->getClassesAndStyles($block['attrs']).'>'.
+        return '<figure'.$this->getClassesAndStyles($block['attrs']).'>'.$aOpen.
                apply_filters('jvbCoreFeaturedImage', $this->image($ID), $post->post_type).
-               '</figure>'.$aClose;
+				$aClose.'</figure>';
     }
     //core_post_navigation_link
     //core_post_template
@@ -654,7 +655,7 @@
 					$out .= '<li>'.$block['attrs']['prefix'].'</li>';
 				}
 				foreach($terms as $term) {
-					$out .= '<li><a href="'.get_term_link($term).'" rel="tag">'.$term->name.'</a></li>';
+					$out .= '<li><a href="'.get_term_link($term).'" rel="tag">'.html_entity_decode($term->name).'</a></li>';
 				}
 			if (array_key_exists('suffix', $block['attrs'])) {
 				$out .= '<li>'.$block['attrs']['suffix'].'</li>';

--
Gitblit v1.10.0