From 3d25ad7de4fdbb3eba2cde2a62422e6be5d79a0a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 25 Aug 2026 22:57:22 +0000
Subject: [PATCH] =It's been a minute. I went through the Routes and associated Managers and ensured they played together well. Reworked the Cache.php, and I think I caught all the references. Moving away from JVBase() root class, to individuall classes that are Instanced. Double checked for the ABSPATH check in every file, and added index.php to every directory that didn't already have it. Also still working on the MenuBlock to work with WooCommerce for now for Northeh
---
inc/managers/InvitationsManager.php | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/inc/managers/InvitationsManager.php b/inc/managers/InvitationsManager.php
index da6cec1..45178b4 100644
--- a/inc/managers/InvitationsManager.php
+++ b/inc/managers/InvitationsManager.php
@@ -2,10 +2,13 @@
namespace JVBase\managers;
use Exception;
+use JVBase\Instance;
use JVBase\managers\queue\executors\InvitationExecutor;
use JVBase\managers\queue\TypeConfig;
use JVBase\registrar\Registrar;
use JVBase\base\Site;
+use JVBase\rest\Rest;
+use JVBase\rest\routes\Invitations;
use WP_Error;
if (!defined('ABSPATH')) {
@@ -14,16 +17,22 @@
class InvitationsManager
{
+ use Instance;
protected array $inviteConfig;
protected CustomTable $table;
protected int $expiryDays = 14;
protected Cache $cache;
- public function __construct()
+ protected Rest $route;
+
+ private function __construct()
{
$this->defineTable();
if (!isset($this->table)) {
return;
}
+ if (Site::membership() && Site::membership()->has('can_invite')) {
+ $this->route = Invitations::getInstance();
+ }
$this->setInviteConfig();
$this->cache = Cache::for('invitations')->user();
add_action('init', [$this, 'registerInvitationExecutors'], 5);
@@ -118,7 +127,7 @@
*/
public function registerInvitationExecutors(): void
{
- $registry = JVB()->queue()->registry();
+ $registry = Queue::getInstance()->registry();
$executor = new InvitationExecutor();
// Create invitations - chunked at 20
@@ -214,7 +223,7 @@
}
// User must be owner or manager of the term
- return JVB()->roles()->isManager($userID, $termID);
+ return Roles::getInstance()()->isManager($userID, $termID);
}
/**
@@ -554,9 +563,9 @@
}
$termText = implode('', $termContent);
- $button = JVB()->email()->button($signupUrl, 'Join the Scene!');
- $link = JVB()->email()->link($signupUrl);
- $signature = JVB()->email()->signature();
+ $button = Emails::getInstance()->button($signupUrl, 'Join the Scene!');
+ $link = Emails::getInstance()->link($signupUrl);
+ $signature = Emails::getInstance()->signature();
$message = sprintf(
'<p>Hi %s!</p>
@@ -593,7 +602,7 @@
$signature
);
- JVB()->email()->sendEmail($email, $subject, $message);
+ Emails::getInstance()->sendEmail($email, $subject, $message);
}
/**
@@ -671,7 +680,7 @@
$this->notifyInvitersOfAcceptance($invitation, $userID);
// Invalidate cache
- Cache::for('invitations')->forget('user_' . $userID);
+ $this->cache->forget('user_' . $userID);
return true;
}
@@ -681,7 +690,7 @@
*/
protected function processTermMembership(int $userID, object $invitation): void
{
- foreach (JVB()->roles()->getInvitableTaxonomies() as $taxonomy) {
+ foreach (Roles::getInstance()()->getInvitableTaxonomies() as $taxonomy) {
$column = 'to_' . $taxonomy;
if (isset($invitation->$column) && $invitation->$column) {
$termID = (int) $invitation->$column;
@@ -706,7 +715,7 @@
$userData = get_userdata($userID);
foreach ($inviters as $inviter) {
- JVB()->notification()->addNotification(
+ NotificationManager::getInstance()->addNotification(
$inviter['user_id'],
'invitation_accepted',
[
@@ -732,7 +741,7 @@
);
// Clear cache after cleanup
- Cache::for('invitations')->flush();
+ $this->cache->flush();
}
/*****************************************************************
@@ -760,7 +769,7 @@
$name
);
- JVB()->email()->sendEmail($email, $subject, $content, 'INVITATION REVOKED');
+ Emails::getInstance()->sendEmail($email, $subject, $content, 'INVITATION REVOKED');
}
/**
--
Gitblit v1.10.0