From 235ce5716edc2f7cbe80fdccf26eac7269587839 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 08 Jun 2026 04:38:18 +0000
Subject: [PATCH] =FavouritesManager.php and FavouritesRoutes.php fixes. Moving all logic to FavouritesManager.php. Still some left to do

---
 inc/rest/_setup.php |   84 +++++++++++++++++++++++++-----------------
 1 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/inc/rest/_setup.php b/inc/rest/_setup.php
index 14e88b5..f1e28bb 100644
--- a/inc/rest/_setup.php
+++ b/inc/rest/_setup.php
@@ -1,62 +1,78 @@
 <?php
-use JVBase\utility\Features;
 
-require(JVB_DIR . '/inc/rest/RateLimiter.php');
-require(JVB_DIR . '/inc/rest/RestRouteManager.php');
-require(JVB_DIR . '/inc/rest/RegisterRoutes.php');
+use JVBase\registrar\Registrar;
+use JVBase\base\Site;
 
-if (Features::forSite()->has('feed_block')) {
+//NEW METHOD
+require(JVB_DIR . '/inc/rest/Route.php');
+require(JVB_DIR . '/inc/rest/PermissionHandler.php');
+require(JVB_DIR . '/inc/rest/Response.php');
+require(JVB_DIR . '/inc/rest/Rest.php');
+require(JVB_DIR . '/inc/rest/RateLimits.php');
+
+//OLD METHOD
+//require(JVB_DIR . '/inc/rest/RateLimiter.php');
+//require(JVB_DIR . '/inc/rest/RestRouteManager.php');
+//require(JVB_DIR . '/inc/rest/RegisterRoutes.php');
+
+//if (Site::has('feed_block')) {
 	require(JVB_DIR . '/inc/rest/routes/FeedRoutes.php');
-}
-if (Features::forSite()->has('magicLink')) {
-	require(JVB_DIR . '/inc/rest/routes/MagicLinkRoutes.php');
-}
-if (Features::forSite()->has('favourites')) {
+//}
+//if (Site::has('magicLink')) {
+//	require(JVB_DIR . '/inc/rest/routes/MagicLinkRoutes.php');
+//}
+//if (Site::has('favourites')) {
 	require(JVB_DIR . '/inc/rest/routes/FavouritesRoutes.php');
-}
-
-if (Features::forMembership()->has('notifications')) {
+//}
+//$membership = Site::membership();
+//if ($membership && $membership->has('notifications')) {
 	require(JVB_DIR . '/inc/rest/routes/NotificationsRoutes.php');
-}
+//}
 
-if (Features::forSite()->hasAny(['feed_block', 'dashboard'])) {
+//if (Site::hasAny(['feed_block', 'dashboard'])) {
 	require(JVB_DIR . '/inc/rest/routes/TermRoutes.php');
-}
+//}
 
 require(JVB_DIR . '/inc/rest/routes/QueueRoutes.php');
+require(JVB_DIR . '/inc/rest/routes/SEORoutes.php');
 require(JVB_DIR . '/inc/rest/routes/ErrorRoutes.php');
 require(JVB_DIR . '/inc/rest/routes/UploadRoutes.php');
 require(JVB_DIR . '/inc/rest/routes/SettingsRoutes.php');
-if (Features::forSite()->has('dashboard')) {
+//if (Site::has('dashboard')) {
 	require(JVB_DIR . '/inc/rest/routes/AdminRoutes.php');
 	require(JVB_DIR . '/inc/rest/routes/ContentRoutes.php');
-	require(JVB_DIR . '/inc/rest/routes/BioRoutes.php');
-	require(JVB_DIR . '/inc/rest/routes/ShopRoutes.php');
-}
-if (Features::forMembership()->has('forum')) {
+	require(JVB_DIR . '/inc/rest/routes/ContentTermsRoutes.php');
+//	require(JVB_DIR . '/inc/rest/routes/BioRoutes.php');
+//	require(JVB_DIR . '/inc/rest/routes/ShopRoutes.php');
+//}
+//if ($membership && $membership->has('forum')) {
 	require(JVB_DIR . '/inc/rest/routes/NewsRoutes.php');
-}
-if (Features::forSite()->has('referrals')) {
+//}
+//if (Site::has('referrals')) {
 	require(JVB_DIR . '/inc/rest/routes/ReferralRoutes.php');
-}
-if (Features::anyContentHas('response') || Features::anyTaxonomyHas('response')) {
+//}
+//if (!empty(Registrar::withFeature('has_responses'))) {
 	require(JVB_DIR . '/inc/rest/routes/ResponseRoutes.php');
-}
+//}
 
-if (Features::anyContentHas('karma') || Features::anyTaxonomyHas('karma') || Features::anyUserHas('karma')) {
+//if (!empty(Registrar::withFeature('karma'))) {
 	require(JVB_DIR . '/inc/rest/routes/VoteRoutes.php');
-}
+//}
 
-if (Features::forMembership()->has('can_invite')) {
+//if ($membership && $membership->has('can_invite')) {
 	require(JVB_DIR . '/inc/rest/routes/Invitations.php');
-}
-if (Features::forMembership()->has('member_verified')) {
+//}
+//if ($membership && $membership->has('member_verified')) {
 	require(JVB_DIR . '/inc/rest/routes/ApprovalRoutes.php');
-}
+//}
 
-if (Features::hasIntegration('square')) {
+//if (Site::hasIntegration('square')) {
 	require(JVB_DIR . '/inc/rest/routes/IntegrationsSquareRoutes.php');
-}
+//}
+
+//if (Site::hasIntegration('helcim')) {
+	require(JVB_DIR . '/inc/rest/routes/IntegrationsHelcimRoutes.php');
+//}
 
 require(JVB_DIR .'/inc/rest/routes/OptionsRoutes.php');
 require(JVB_DIR .'/inc/rest/routes/FormRoutes.php');

--
Gitblit v1.10.0