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

---
 activate.php |   41 ++++++++++++++++-------------------------
 1 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/activate.php b/activate.php
index a87076f..af0f7a1 100644
--- a/activate.php
+++ b/activate.php
@@ -1,15 +1,14 @@
 <?php
 
-use JVBase\integrations\Umami;
 use JVBase\managers\Cache;
 use JVBase\managers\CustomTable;
+use JVBase\base\Site;
+use JVBase\managers\DashboardManager;
 use JVBase\managers\DirectoryManager;
 use JVBase\managers\queue\Queue;
 use JVBase\managers\ReferralManager;
 use JVBase\managers\RoleManager;
-use JVBase\managers\SEO\SEOAdminPage;
 use JVBase\registrar\Registrar;
-use JVBase\utility\Features;
 
 if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
@@ -17,7 +16,6 @@
 
 function jvbActivatePlugin():void
 {
-
 //	$validator = new JVBase\utility\Validator();
 //	$validation = $validator->validateAll();
 //	error_log('Validation result: '.print_r($validation, true));
@@ -32,8 +30,9 @@
     do_action(BASE.'activation');
 	error_log('Action done!');
 	error_log('Checking custom tables...');
-	Queue::defineTables();
 	CustomTable::ensureTables();
+	error_log('Dashboard is setup: '.print_r(JVB()->dashboard(), true));
+
 //    (new JVBase\registry\CheckCustomTables())->maybeCreateTables();
 	error_log('Tables created!');
 
@@ -42,24 +41,16 @@
 	error_log('Starting schedules...');
     jvbSchedules();
 	error_log('Schedules done!');
-	error_log('checking Admin capabilities...');
 
-	jvb_register_do_once('admin_caps', 'jvbAddAdminCaps');
+	RoleManager::activate();
 
-	error_log('Admin caps done!');
-	error_log('Removing unneeded roles...');
-    remove_role('contributor');
-    remove_role('author');
-    remove_role('editor');
-	error_log('Roles removed!');
-	error_log('New Roles done!');
 	jvbRegisterAdminPages();
-	if (array_key_exists('integrations', JVB_SITE) && array_key_exists('umami', JVB_SITE['integrations']) && JVB_SITE['integrations']['umami']=== true) {
-		error_log('Adding Umami tables');
-		Umami::createTables();
-	}
+//	if (array_key_exists('integrations', JVB_SITE) && array_key_exists('umami', JVB_SITE['integrations']) && JVB_SITE['integrations']['umami']=== true) {
+//		error_log('Adding Umami tables');
+//		Umami::createTables();
+//	}
 
-//	if (Features::forSite()->has('is_directory')) {
+//	if (Site::has('is_directory')) {
 //		error_log('Activating DirectoryManager');
 //		jvb_register_do_once('buildDirectory', ['JVBase\managers\DirectoryManager', 'activate']);
 //	}
@@ -73,7 +64,7 @@
 
 	$role = get_role('administrator');
 	$users = get_users(['role' => 'administrator']);
-    foreach (array_merge(Registrar::getRegistered('post'), Registrar::getFeatured('is_content')) as $slug) {
+    foreach (array_merge(Registrar::getRegistered('post'), Registrar::withFeature('is_content')) as $slug) {
 		error_log('Adding administrative roles to '.$slug);
 		$plural = $roleManager->getContentPlural($slug);
 		$capabilities = [
@@ -114,7 +105,7 @@
 	$roleManager = new RoleManager();
 	$users = get_users(['role' => 'administrator']);
 
-	foreach (array_merge(Registrar::getRegistered('post'), Registrar::getFeatured('is_content', 'term')) as $slug) {
+	foreach (array_merge(Registrar::getRegistered('post'), Registrar::withFeature('is_content', 'term')) as $slug) {
 
 		foreach ($users as $user) {
 			// These methods should check if post type exists before adding caps
@@ -160,16 +151,16 @@
             'time'              => '12:03am tomorrow',
         ],
         //NotificationManager.php
-        'jvb_notification_digest_daily' =>
+        BASE.'notification_digest_daily' =>
             [
                 'time'  => '8:08am tomorrow',
             ],
-        'jvb_notification_digest_weekly' =>
+        BASE.'notification_digest_weekly' =>
             [
                 'time'       => 'monday 6:07am',
                 'recurrence' => 'weekly',
             ],
-        'jvb_notification_digest_monthly' =>
+        BASE.'notification_digest_monthly' =>
             [
                 'time'       => '2025-05-05 9:00am',
                 'recurrence' => 'monthly',
@@ -277,7 +268,7 @@
 
 function jvbRegisterAdminPages():void
 {
-	if (Features::forSite()->has('referrals')){
+	if (Site::has('referrals')){
 		ReferralManager::addSubpage();
 	}
 //	SEOAdminPage::addSubpage();

--
Gitblit v1.10.0