From c68aefb847b09daa0697de7684d3451e2e68ce1e Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 09 Jul 2026 23:10:23 +0000
Subject: [PATCH] =Refactor of Integrations.php to be a bit more useful with a suite of methods for create, update, delete back and forths for integrations where sharing is enabled. Also considering a single instance with a connect method to connect as the site (no user) vs connecting as an individual user - rather than recreating instances for every user.
---
JVBase.php | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/JVBase.php b/JVBase.php
index f0b0c3d..e771147 100644
--- a/JVBase.php
+++ b/JVBase.php
@@ -11,7 +11,7 @@
use JVBase\managers\LoginManager;
use JVBase\managers\MagicLinkManager;
use JVBase\managers\queue\Queue;
-use JVBase\managers\DashboardManager;
+use JVBase\managers\Dashboard\DashboardManager;
use JVBase\managers\DirectoryManager;
use JVBase\managers\ReferralManager;
use JVBase\managers\RoleManager;
@@ -47,6 +47,7 @@
use JVBase\rest\routes\AdminRoutes;
use JVBase\rest\routes\IntegrationsRoutes;
use JVBase\base\SchemaHelper;
+use UserRoutes;
if (!defined('ABSPATH')) {
exit;
@@ -85,7 +86,7 @@
}
- public function __construct()
+ private function __construct()
{
$this->customBlocks = new CustomBlocks();
$this->managers = [
@@ -120,10 +121,11 @@
'queue' => new QueueRoutes(),
'settings' => new SettingsRoutes(),
'upload' => new UploadRoutes(),
- 'forms' => new FormRoutes()
+ 'forms' => new FormRoutes(),
+ 'user' => new UserRoutes()
];
- if (Site::has('magicLink')) {
+ if (Site::has('magic_link')) {
// $this->routes['magicLink'] = new MagicLinkRoutes();
$this->managers['magicLink'] = new MagicLinkManager();
}
@@ -132,9 +134,6 @@
$this->routes['referral'] = new ReferralRoutes();
}
- if (Site::has('dashboard')) {
- $this->managers['dash'] = new DashboardManager();
- }
if (Site::hasIntegration('square')) {
$this->routes['square'] = new IntegrationsSquareRoutes();
@@ -151,7 +150,7 @@
$this->managers['notifications'] = new NotificationManager();
$this->routes['notifications'] = new NotificationsRoutes();
}
- if (!empty(Registrar::getFeatured('approve_new'))) {
+ if (!empty(Registrar::withFeature('approve_new'))) {
$this->managers['approvals'] = new ApprovalManager();
}
if (Site::has('feed_block') || Site::has('dashboard')) {
@@ -183,13 +182,13 @@
if ($membership && $membership->has('invitable')) {
$this->managers['invitations'] = new InvitationsManager();
}
- if (!empty(Registrar::getFeatured('has_responses'))) {
+ if (!empty(Registrar::withFeature('has_responses'))) {
$this->routes['comments'] = new ResponseRoutes();
}
- if (!empty(Registrar::getFeatured('karma'))) {
+ if (!empty(Registrar::withFeature('karma'))) {
$this->routes['vote'] = new VoteRoutes();
}
- if (!empty(Registrar::getFeatured('karma'))
+ if (!empty(Registrar::withFeature('karma'))
|| ($membership && $membership->has('member_verified')) ||
($membership && $membership->has('term_approval'))) {
$this->routes['approvals'] = new ApprovalRoutes();
@@ -198,6 +197,11 @@
$this->routes['invites'] = new Invitations();
}
+
+ if (Site::has('dashboard')) {
+ $this->managers['dash'] = new DashboardManager();
+ }
+
$this->setupIntegrations();
add_action('wp_footer', [$this, 'additionalActions']);
@@ -210,7 +214,7 @@
protected function setupIntegrations(): void
{
foreach(array_keys(Site::getIntegrations()) as $integration) {
- $this->integrations[$integration] = new $this->serviceMap[$integration]();
+ $this->integrations[$integration] = $this->serviceMap[$integration]::getInstance();
}
}
@@ -219,6 +223,11 @@
return array_merge(array_keys($this->content), array_keys($this->taxonomies));
}
+ public function favourites(): FavouritesManager|false
+ {
+ return $this->managers['favourites'] ?? false;
+ }
+
public function dashboard(): DashboardManager|false
{
return $this->managers['dash'] ?? false;
@@ -287,17 +296,20 @@
public function connect(string $service, ?int $userID = null): mixed
{
- if ($userID) {
- if (!$this->userCanConnect($service, $userID)) {
- return null;
- }
-
- if (!array_key_exists($service, $this->integrations)) {
- return null;
- }
- return new $this->serviceMap[$service]($userID);
- }
- return (array_key_exists($service, $this->integrations)) ? $this->integrations[$service] : null;
+// if ($userID) {
+// if (!$this->userCanConnect($service, $userID)) {
+// return null;
+// }
+//
+// if (!array_key_exists($service, $this->integrations)) {
+// return null;
+// }
+//
+// return $this->serviceMap[$service]::getInstance($userID);
+// }
+ return is_null($userID) ?
+ $this->integrations[$service]??null :
+ (array_key_exists($service, $this->integrations) ? $this->serviceMap[$service]::getInstance($userID) : null);
}
public function userCanConnect(string $service, int $userID): bool
@@ -367,10 +379,10 @@
?>
<section class="main-actions">
<div class="buttons col">
- <?= implode($buttons); ?>
+ <?= implode('', $buttons); ?>
</div>
<div class="actions">
- <?= implode($contents); ?>
+ <?= implode('', $contents); ?>
</div>
</section>
<?php
--
Gitblit v1.10.0