=FavouritesManager.php and FavouritesRoutes.php fixes. Moving all logic to ...

Jake Vanderwerf

2 days ago 235ce5716edc2f7cbe80fdccf26eac7269587839

 JVBase.php

@@ -3,8 +3,10 @@

use JVBase\blocks\CustomBlocks;
use JVBase\base\Site;
use JVBase\managers\ApprovalManager;
use JVBase\managers\EmailManager;
use JVBase\managers\ErrorHandler;
use JVBase\managers\FavouritesManager;
use JVBase\managers\InvitationsManager;
use JVBase\managers\LoginManager;
use JVBase\managers\MagicLinkManager;
@@ -149,6 +151,9 @@
         $this->managers['notifications'] = new NotificationManager();
         $this->routes['notifications'] = new NotificationsRoutes();
      }
      if (!empty(Registrar::withFeature('approve_new'))) {
         $this->managers['approvals'] = new ApprovalManager();
      }
      if (Site::has('feed_block') || Site::has('dashboard')) {
         $this->routes['term'] = new TermRoutes();
      }
@@ -168,6 +173,7 @@
      }

      if (Site::has('favourites')) {
         $this->managers['favourites'] = new FavouritesManager();
         $this->routes['favourites'] = new FavouritesRoutes();
      }

@@ -177,13 +183,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();
@@ -213,6 +219,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;
@@ -296,8 +307,9 @@

   public function userCanConnect(string $service, int $userID): bool
   {
      $allowed = JVB_USER[jvbUserRole($userID)]['integrations'] ?? [];
      return user_can($userID, 'manage_options') || in_array($service, $allowed);
      $role = jvbUserRole($userID);
      $registrar = Registrar::getInstance($role);
      return user_can($userID, 'manage_options') || $registrar->hasIntegration($service);
   }

   public function getAvailableServices(bool $keys = true): array
@@ -358,7 +370,7 @@

      if (!empty ($buttons)) {
         ?>
         <section class="additional-actions">
         <section class="main-actions">
            <div class="buttons col">
               <?= implode($buttons); ?>
            </div>
@@ -388,4 +400,9 @@
   {
      return $this->managers['terms'];
   }

   public function approvals ():ApprovalManager|false
   {
      return $this->managers['approvals']??false;
   }
}