From 0afb2c0046b55c123eafb4ab9ee77efa68d12463 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sat, 06 Jun 2026 17:15:31 +0000
Subject: [PATCH] =Starting the Favourites.js setup, converting previous Northeh stuff to new Registrar, fixing up Square.php integration to match
---
inc/registrar/Registrar.php | 292 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 265 insertions(+), 27 deletions(-)
diff --git a/inc/registrar/Registrar.php b/inc/registrar/Registrar.php
index 593a8c6..19b92fd 100644
--- a/inc/registrar/Registrar.php
+++ b/inc/registrar/Registrar.php
@@ -49,6 +49,10 @@
public ?string $rewrite_taxonomy = null;
public bool $add_image_column = false;
+ public bool $prefix_post_type = false;
+ public string $prefix_with = 'by';
+
+ public bool $system = false;
protected static array $allFlags = [
//Shared Flags
@@ -56,9 +60,11 @@
//Post Flags
'hide_single', 'redirect_to_author', 'is_calendar', 'single_image', 'is_timeline', 'is_gallery', 'is_faq', 'is_glossary', 'rewrite_taxonomy', 'add_image_column',
//Taxonomy Flags
- 'is_content', 'is_ownable', 'verify_entry', 'track_changes', 'associate_user_content',
+ 'is_content', 'is_ownable', 'verify_entry', 'track_changes', 'associate_user_content', 'prefix_post_type',
//User Flags
- 'has_dashboard', 'can_register', 'can_create', 'keep_stats', 'can_favourite', 'member_verified', 'profile_link', 'manage_others'
+ 'has_dashboard', 'can_register', 'can_create', 'keep_stats', 'can_favourite', 'member_verified', 'profile_link', 'manage_others',
+ //System
+ 'system'
];
/**********************************************************************************************
SHARED FLAGS
@@ -142,12 +148,12 @@
/**
* @var bool Whether users/content need to request the owner for admission
*/
- protected bool $verify_entry;
+ protected bool $verify_entry = false;
protected ?MakeVerification $verifyEntryHandler = null;
/**
* @var bool Whether we should track post movements from term to term (ie. artists in tattoo shops)
*/
- protected bool $track_changes;
+ protected bool $track_changes = false;
protected ?MakeTrackChanges $trackChangesHandler = null;
/**
@@ -185,7 +191,7 @@
/**
* @var array|string
*/
- protected array|string $can_create = [];
+ protected array $can_create = [];
/**
* @var array slugs of other user roles this role can manage
*/
@@ -236,6 +242,59 @@
add_filter('jvbDashboardPage', [$this, 'renderDashPage'], 10, 3);
}
+ public static function maybeExcludeSingles(array $IDs):array
+ {
+ self::ensureInstanced();
+
+ $features = ['hide_single', 'is_timeline'];
+ foreach ($features as $feature) {
+ foreach (self::withFeature($feature) as $instance) {
+ $instance = self::getInstance($instance);
+ $cache = Cache::for('tsf')->connect($instance->getType());
+ $cache->flush();
+
+ $exclude = $cache->remember(
+ $feature,
+ function () use ($instance, $feature) {
+ switch ($feature) {
+ case 'hide_single':
+ return $instance->excludeSingle();
+ case 'is_timeline':
+ return $instance->excludeTimeline();
+ default:
+ return [];
+ }
+ }
+ );
+
+ if (!empty($exclude)) {
+ $IDs = array_merge($IDs, $exclude);
+ }
+ }
+ }
+
+ return $IDs;
+ }
+ protected function excludeSingle():array
+ {
+ return get_posts([
+ 'post_type' => $this->based,
+ 'posts_per_page'=> -1,
+ 'fields' => 'ids',
+ 'post_status' => 'publish',
+ ]);
+ }
+ protected function excludeTimeline():array
+ {
+ return get_posts([
+ 'post_type' => $this->based,
+ 'posts_per_page'=> -1,
+ 'fields' => 'ids',
+ 'post_status' => 'publish',
+ 'post_parent__not_in' => [0], // Only get posts with a parent
+ ]);
+ }
+
protected function initRegistrar():void {
$this->registrar = match ($this->type) {
'post' => new Posts($this->slug, $this->singular, $this->plural),
@@ -410,7 +469,7 @@
return $this->integrationConfigs;
}
public function hasIntegration(string $integration) {
- return in_array($integration, $this->integrationConfigs);
+ return array_key_exists($integration, $this->integrationConfigs);
}
public function hasAnyIntegrations(array $integrations = []):bool
{
@@ -503,6 +562,11 @@
}
return $this;
}
+ public function prefixWith(string $prefix):self
+ {
+ $this->prefix_with = sanitize_title($prefix);
+ return $this;
+ }
public function removeAll(array $flags):self
{
$flags = array_filter($flags, function($flag) {
@@ -522,8 +586,20 @@
}
return isset($this->$feature) && $this->$feature === true;
}
+
+ /**
+ * @deprecated use withFeature
+ * @param string $feature
+ * @param string|null $type
+ * @return array
+ */
public static function getFeatured(string $feature, ?string $type = null):array
{
+ return self::withFeature($feature, $type);
+ }
+
+ public static function withFeature(string $feature, ?string $type = null):array
+ {
self::ensureInstanced();
if (!in_array($feature, static::$allFlags)) {
@@ -532,13 +608,30 @@
}
return array_map(function($inst) { return $inst->slug; },array_filter(self::$instances, function ($inst) use ($feature, $type){
- if (!is_null($type) && $inst->type !== $type) {
+ if ((!is_null($type) && $inst->type !== $type) || $inst->system) {
return false;
}
return property_exists($inst, $feature) && isset($inst->$feature) && $inst->$feature === true;
}));
}
+ public static function withIntegration(string $integration, ?string $type = null):array
+ {
+ self::ensureInstanced();
+
+ if (!Site::has($integration)) {
+ error_log('[Registrar]::withIntegration Integration not available to fetch: '.$integration);
+ return [];
+ }
+
+ return array_map(function($inst) { return $inst->slug; },array_filter(self::$instances, function ($inst) use ($integration, $type){
+ if (!is_null($type) && $inst->type !== $type) {
+ return false;
+ }
+ return array_key_exists($integration, $this->integrationConfigs);
+ }));
+ }
+
public function config(string $config):mixed
{
$allowed = ['breadcrumbs','calendar','dashboard','directory','feed','management','has_responses','seo','trackchanges','verification'];
@@ -702,6 +795,10 @@
}
}
+ if ($this->prefix_post_type) {
+ $this->addPostTypeRewrites();
+ }
+
if ($this->registrar) {
$this->registrar->register();
}
@@ -736,7 +833,7 @@
{
self::ensureInstanced();
$instances = ($type) ? array_filter(static::$instances, function($instance) use ($type) {
- return $instance->type === $type;
+ return $instance->type === $type && !$instance->system;
}) : static::$instances;
return array_keys($instances);
}
@@ -750,19 +847,22 @@
}, static::$instances);
}
- public function getCreatable():array
+ public function getCreatable(bool $based = false):array
{
if ($this->type !== 'user') {
return [];
}
- return $this->can_create;
+ return $based ? array_map(function ($item) { return jvbCheckBase($item); },$this->can_create) : $this->can_create;
}
public function setCreatable(string|array $creatable):self
{
- $this->can_create = $creatable;
+ $this->can_create = is_string($creatable) ? [jvbNoBase($creatable)] : array_map(function ($type) {
+ return jvbNoBase($type);
+ }, $creatable);
return $this;
}
+
public function getManageOthers():array
{
if ($this->type !== 'user'){
@@ -838,8 +938,8 @@
}
public function addTermCreatedMeta(int $termId):void
{
- $meta = Meta::forTerm($termId);
- $meta->set('date_published', date('Y-m-d H:i:s'));
+ update_term_meta($termId, BASE . 'date_published', date('Y-m-d H:i:s'));
+ update_term_meta($termId, BASE . 'date_modified', date('Y-m-d H:i:s'));
}
public function handleContentTermMetaChange(int $meta_id, int $term_id, string $meta_key, $meta_value):void
{
@@ -853,8 +953,14 @@
}
public function addTermUpdatedMeta(int $termId):void
{
- $meta = Meta::forTerm($termId);
- $meta->set('date_modified', date('Y-m-d H:i:s'));
+
+ static $processing = [];
+ if (isset($processing[$termId])) return;
+ $processing[$termId] = true;
+
+ update_term_meta($termId, BASE . 'date_modified', date('Y-m-d H:i:s'));
+
+ unset($processing[$termId]);
}
public function renderContent(string $content, array $block):string
{
@@ -868,24 +974,85 @@
Cache::for($this->slug)->flush();
}
- $out = Cache::for($this->slug)->remember(
- get_the_ID(),
- function() {
+ $per_page = 10;
+ $page = $_GET['tp']??1;
- $items = get_terms([
- 'taxonomy' => jvbCheckBase($this->slug),
+ $args = apply_filters('jvb_content_tax_args_'.$this->slug, [
+ 'taxonomy' => $this->based,
// 'hide_empty' => true,
- 'fields' => 'ids',
+ 'fields' => 'ids',
+ 'number' => $per_page,
+ 'offset' => ($page - 1) * $per_page,
+ 'meta_key' => BASE.'date_modified',
+ 'meta_type' => 'DATETIME',
+ 'orderby' => 'meta_value',
+ 'order' => 'desc',
+ ]);
+
+ $cache = Cache::for($this->slug)->connect('taxonomy');
+ $max = $cache->remember(
+ 'max',
+ function () {
+ $max = get_terms([
+ 'taxonomy' => $this->based,
+ 'fields' => 'ids',
+ 'number' => 0,
+ 'hide_empty' => true
]);
+ return count($max??[]);
+ }
+ );
+
+
+ $totalPages = floor($max/$per_page);
+
+ global $wp;
+ $current = get_home_url(null, '/'.$wp->request.'/');
+
+ $pages = '';
+ for ($i = 1; $i<=$totalPages; $i++) {
+ $pages .= (int)$page === $i ?
+ sprintf(
+ '<li class="current">%s</li>',
+ $i
+ ): sprintf(
+ '<li><a href="%s">%s</a></li>',
+ add_query_arg('tp', $i, $current),
+ $i
+ );
+ }
+
+ $nav = sprintf(
+ '<nav class="pagination">%s<ul>%s</ul>%s</nav>',
+ $page > 1 ? '<a href="'.add_query_arg('tp', $page-1, $current).'" title="Next Page" class="btn">'.jvbIcon('arrow-circle-left').'<span class="screen-reader-text">Previous Page</span></a>' : '',
+ $pages,
+ $page < $totalPages ? '<a href="'.add_query_arg('tp', $page+1, $current).'" title="Next Page" class="btn">'.jvbIcon('arrow-circle-right').'<span class="screen-reader-text">Next Page</span></a>' : '',
+ );
+
+
+ $out = $nav. Cache::for($this->slug)->remember(
+ $cache->generateKey(['type' =>'contentArchive', ... $args]),
+ function() use ($args) {
+
+
+ $items = get_terms($args);
$out = [];
+
+
+ $method = BASE.'render_'.$this->slug.'_content';
if ($items && !is_wp_error($items)) {
- foreach ($items as $item) {
- $meta = Meta::forTerm($item);
+ foreach ($items as $termID) {
+ $meta = Meta::forTerm($termID);
+ if (function_exists($method)) {
+ $out[] = $method($termID);
+ continue;
+ }
+ $meta = Meta::forTerm($termID);
$slug = sanitize_title($meta->get('name'));
$item = sprintf(
- '<li id="%s"><h2><a href="%s">%s</a></h2><p>%s</p><ul class="item-grid">',
+ '<li id="%s"><h2><a href="%s">%s</a></h2><p>%s</p><ul class="loop scroll">',
$slug,
- get_term_link($item, jvbCheckBase($this->slug))??'',
+ get_term_link($termID, $this->based)??'',
$meta->get('name'),
$meta->get('description')
);
@@ -895,6 +1062,12 @@
'post_status' => 'publish',
'posts_per_page' => 3,
'fields' => 'ids',
+ 'tax_query' => [
+ [
+ 'taxonomy' => $this->based,
+ 'terms' => $termID
+ ]
+ ]
]);
if ($posts->have_posts()) {
while($posts->have_posts()) {
@@ -917,9 +1090,13 @@
$out[] = $item;
}
}
- return empty($out) ? '' : '<ul class="content-term-list">'.implode('',$out).'</ul>';
+
+ $before = apply_filters(BASE.'before_'.$this->slug.'_content','');
+ $out = empty($out) ? '' : '<ul class="content-term-list">'.implode('',$out).'</ul>';
+ $after = apply_filters(BASE.'after_'.$this->slug.'_content', '');
+ return $before.$out.$after;
}
- );
+ ).$nav;
error_log('Built the '.$this->slug.' page content.');
return $content . $out;
}
@@ -961,6 +1138,18 @@
return self::getInstance($this->profile);
}
+ public static function getProfileTypes():array
+ {
+ $hasProfiles = self::withFeature('profile_link');
+ if (empty($hasProfiles)) {
+ return [];
+ }
+ return array_filter(array_map(function($profile) {
+ $instance = self::getInstance($profile);
+ return $instance->getProfile()->based??false;
+ }, $hasProfiles));
+ }
+
public function setUserSubtype(string $type):self
{
$this->user_subtype = sanitize_text_field($type);
@@ -987,4 +1176,53 @@
echo get_the_post_thumbnail($postID, 'tiny');
}
}
+
+ protected function addPostTypeRewrites():void
+ {
+ $for = $this->registrar->for;
+ foreach ($for as $type) {
+ $registrar = Registrar::getInstance($type);
+ if ($registrar) {
+ $base = $registrar->registrar->rewrite['slug']??$registrar->slug;
+
+ $prefix = empty($this->prefix_with) ? '' : '/'.$this->prefix_with;
+ $prefix = str_replace('//', '/', $prefix);
+
+ $slug = str_contains($this->slug, '_') ? str_replace('_','-', $this->slug) : $this->slug;
+ add_rewrite_rule(
+ $base.$prefix.'/'.$slug.'/([a-z0-9-]+)/?$',
+ 'index.php?post_type='.$registrar->getBased().'&'.$this->based.'=$matches[1]',
+ 'top'
+ );
+ add_rewrite_rule(
+ $base.$prefix.'/'.$slug.'/([a-z0-9-]+)/page/([0-9-]+)/?$',
+ 'index.php?post_type='.$registrar->getBased().'&'.$this->based.'=$matches[1]&paged=$matches[2]',
+ 'top'
+ );
+ }
+ }
+ }
+
+ public function getFeedFields():array
+ {
+ $config = $this->getConfig('feed');
+ $all = $this->getFields();
+ $img = $config['images']??['post_thumbnail'];
+ $f = $config['fields']??['post_title', 'post_date', 'post_excerpt'];
+
+ $f = array_filter($f, function($field) use ($img) {
+ return !in_array($field, $img);
+ });
+ $images = [];
+ $fields = [];
+
+ foreach($img as $i) {
+ $images[] = $all[$i];
+ }
+ foreach ($f as $x) {
+ $fields[] = $all[$x];
+ }
+
+ return [$images,$fields];
+ }
}
--
Gitblit v1.10.0