=Still working away at the Integrations overhaul

Jake Vanderwerf

5 days ago 0dfe1d8afafc59c4a5559c498342668d5a58d6ef

 JVBase.php

@@ -1,52 +1,53 @@
<?php
namespace JVBase;

use JVBase\blocks\CustomBlocks;
use JVBase\admin\SEOAdmin;
use JVBase\base\SchemaHelper;
use JVBase\base\Site;
use JVBase\blocks\CustomBlocks;
use JVBase\managers\AdminPages;
use JVBase\managers\ApprovalManager;
use JVBase\managers\Dashboard\DashboardManager;
use JVBase\managers\DirectoryManager;
use JVBase\managers\EmailManager;
use JVBase\managers\ErrorHandler;
use JVBase\managers\FavouritesManager;
use JVBase\managers\InvitationsManager;
use JVBase\managers\LoginManager;
use JVBase\managers\MagicLinkManager;
use JVBase\managers\NotificationManager;
use JVBase\managers\queue\Queue;
use JVBase\managers\DashboardManager;
use JVBase\managers\DirectoryManager;
use JVBase\managers\ReferralManager;
use JVBase\managers\RoleManager;
use JVBase\managers\SEO\render\SchemaOutput;
use JVBase\admin\SEOAdmin;
use JVBase\managers\AdminPages;
use JVBase\managers\NotificationManager;
use JVBase\managers\TaxonomyRelationships;
use JVBase\managers\UserTermsManager;
use JVBase\registrar\Registrar;
use JVBase\rest\routes\FeedRoutes;
use JVBase\rest\routes\FavouritesRoutes;
use JVBase\rest\routes\IntegrationsSquareRoutes;
use JVBase\rest\routes\IntegrationsHelcimRoutes;
use JVBase\rest\routes\NotificationsRoutes;
use JVBase\rest\routes\AdminRoutes;
use JVBase\rest\routes\ApprovalRoutes;
use JVBase\rest\routes\ContentRoutes;
use JVBase\rest\routes\TermRoutes;
use JVBase\rest\routes\UploadRoutes;
use JVBase\rest\routes\SettingsRoutes;
use JVBase\rest\routes\ContentTermsRoutes;
use JVBase\rest\routes\SEORoutes;
use JVBase\rest\routes\QueueRoutes;
use JVBase\rest\routes\ErrorRoutes;
use JVBase\rest\routes\FavouritesRoutes;
use JVBase\rest\routes\FeedRoutes;
use JVBase\rest\routes\FormRoutes;
use JVBase\rest\routes\IntegrationsHelcimRoutes;
use JVBase\rest\routes\IntegrationsRoutes;
use JVBase\rest\routes\IntegrationsSquareRoutes;
use JVBase\rest\routes\Invitations;
use JVBase\rest\routes\LoginRoutes;
use JVBase\rest\routes\NewsRoutes;
use JVBase\rest\routes\NotificationsRoutes;
use JVBase\rest\routes\OptionsRoutes;
use JVBase\rest\routes\QueueRoutes;
use JVBase\rest\routes\ReferralRoutes;
use JVBase\rest\routes\ResponseRoutes;
use JVBase\rest\routes\OptionsRoutes;
use JVBase\rest\routes\SEORoutes;
use JVBase\rest\routes\SettingsRoutes;
use JVBase\rest\routes\TermRoutes;
use JVBase\rest\routes\UploadRoutes;
use JVBase\rest\routes\VoteRoutes;
use JVBase\rest\routes\Invitations;
use JVBase\rest\routes\ApprovalRoutes;
use JVBase\rest\routes\AdminRoutes;
use JVBase\rest\routes\IntegrationsRoutes;
use JVBase\base\SchemaHelper;
use UserRoutes;

if (!defined('ABSPATH')) {
   exit;
@@ -64,16 +65,16 @@
   protected CustomBlocks $customBlocks;

   protected array $serviceMap = [
      'maps' => 'JVBase\integrations\GoogleMaps',
      'square' => 'JVBase\integrations\Square',
      'facebook' => 'JVBase\integrations\Facebook',
      'helcim' => 'JVBase\integrations\Helcim',
      'instagram' => 'JVBase\integrations\Instagram',
      'bluesky' => 'JVBase\integrations\BlueSky',
      'gmb' => 'JVBase\integrations\GoogleMyBusiness',
      'cloudflare' => 'JVBase\integrations\Cloudflare',
      'umami' => 'JVBase\integrations\Umami',
      'postmark' => 'JVBase\integrations\PostMark',
      'maps' => 'JVBase\integrations\services\GoogleMaps',
      'square' => 'JVBase\integrations\services\Square',
      'facebook' => 'JVBase\integrations\services\Facebook',
      'helcim' => 'JVBase\integrations\services\Helcim',
      'instagram' => 'JVBase\integrations\services\Instagram',
      'bluesky' => 'JVBase\integrations\services\BlueSky',
      'gmb' => 'JVBase\integrations\services\GoogleMyBusiness',
      'cloudflare' => 'JVBase\integrations\services\Cloudflare',
      'umami' => 'JVBase\integrations\services\Umami',
      'postmark' => 'JVBase\integrations\services\PostMark',
   ];

   public static function getInstance(): JVB
@@ -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,22 @@

   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);
//    if ($userID) {
//       if (!$this->userCanConnect($service, $userID)) {
//          return null;
//       }
//
//       if (!array_key_exists($service, $this->integrations)) {
//          return null;
//       }
//
//       return $this->serviceMap[$service]::getInstance($userID);
//    }
      $instance = $this->integrations[$service]??null;
      if ($instance) {
         $instance->switchUser($userID);
      }
      return (array_key_exists($service, $this->integrations)) ? $this->integrations[$service] : null;
      return $instance;
   }

   public function userCanConnect(string $service, int $userID): bool
@@ -365,12 +379,12 @@

      if (!empty ($buttons)) {
         ?>
         <section class="additional-actions">
         <section class="main-actions">
            <div class="buttons col">
               <?= implode($buttons); ?>
               <?= implode('', $buttons); ?>
            </div>
            <div class="actions">
               <?= implode($contents); ?>
               <?= implode('', $contents); ?>
            </div>
         </section>
         <?php