From ccf5e61a075c35d24befc175994b5cb8957ca322 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 26 Aug 2026 21:45:53 +0000
Subject: [PATCH] =Extra JVB() calls replaced, minor tweaks

---
 inc/rest/routes/Invitations.php |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/inc/rest/routes/Invitations.php b/inc/rest/routes/Invitations.php
index 7cccb3e..9dbb49f 100644
--- a/inc/rest/routes/Invitations.php
+++ b/inc/rest/routes/Invitations.php
@@ -1,6 +1,8 @@
 <?php
 namespace JVBase\rest\routes;
 
+use JVBase\Instance;
+use JVBase\managers\InvitationsManager;
 use JVBase\rest\Rest;
 use JVBase\managers\CustomTable;
 use JVBase\rest\Route;
@@ -20,6 +22,7 @@
  */
 class Invitations extends Rest
 {
+	use Instance;
 	protected array $inviteConfig;
 	protected CustomTable $table;
 
@@ -29,7 +32,7 @@
 		parent::__construct();
 
 		// Get invitation configuration
-		$this->inviteConfig = JVB()->invitations()->getInviteConfig();
+		$this->inviteConfig = InvitationsManager::getInstance()->getInviteConfig();
 		$this->table = CustomTable::for('invitations');
 
 		// Cache connections
@@ -43,7 +46,6 @@
 		Route::for('invitations')
 			->get([$this, 'getInvitations'])
 			->args([
-				'user' => 'int|required',
 				'to_term' => 'int',
 				'taxonomy' => 'string',
 				'status' => 'string|enum:all,pending,accepted,rejected,expired,revoked|default:all',
@@ -54,13 +56,13 @@
 
 			->post([$this, 'createInvitationRequest'])
 			->args([
-				'user' => 'int|required',
 				'action' => 'string|enum:create,revoke,refresh|default:create',
 				'invites' => 'array',
 				'invitation_id' => 'int'
 			])
 			->auth('verified')
-			->rateLimit(10, 300);
+			->rateLimit(10, 300)
+			->register();
 	}
 
 	/**
@@ -68,12 +70,12 @@
 	 */
 	public function getInvitations(WP_REST_Request $request): WP_REST_Response
 	{
-		$userID = $request->get_param('user');
+		$userID = get_current_user_id();
 		$termID = $request->get_param('to_term');
 		$taxonomy = $request->get_param('taxonomy');
 
 		// Validate user
-		if (get_current_user_id() !== $userID) {
+		if (!$userID) {
 			return $this->unauthorized('Invalid user');
 		}
 
@@ -86,8 +88,8 @@
 		];
 
 		// Check cache
-		$key = $this->cache->generateKey($args);
-		if ($cached = $this->cache->get($key)) {
+
+		if ($cached = $this->cache->get($args)) {
 			return $this->success($cached);
 		}
 
@@ -97,7 +99,7 @@
 			: $this->getUserInvitations($args);
 
 		// Cache result
-		$this->cache->set($key, $result);
+		$this->cache->set($args, $result);
 
 		return $this->success($result);
 	}
@@ -105,10 +107,10 @@
 	/**
 	 * Get invitations for a specific term
 	 */
-	protected function getTermInvitations(array $args): array
+	public function getTermInvitations(array $args): array
 	{
 		// Check permission
-		if (!JVB()->roles()->isManager($args['user'], $args['to_term'])) {
+		if (!Roles::getInstance()()->isManager($args['user'], $args['to_term'])) {
 			return $this->forbidden('You cannot view invitations for this ' . $args['taxonomy'])->get_data();
 		}
 
@@ -184,11 +186,11 @@
 	 */
 	public function createInvitationRequest(WP_REST_Request $request): WP_REST_Response
 	{
-		$userID = $request->get_param('user');
+		$userID = get_current_user_id();
 		$action = $request->get_param('action');
 
 		// Validate user
-		if (get_current_user_id() !== $userID) {
+		if (!$userID) {
 			return $this->unauthorized('Invalid user');
 		}
 
@@ -214,7 +216,7 @@
 		}
 
 		// Queue using fluent interface
-		$op = JVB()->queue()->add(
+		$op = Queue::getInstance()->add(
 			'invitation_create',
 			$userID,
 			['invitations' => $validated],
@@ -232,7 +234,7 @@
 	 */
 	protected function validateInvitations(int $userID, array $invites): array
 	{
-		return JVB()->invitations()->validateInvitations($userID, $invites);
+		return InvitationsManager::getInstance()->validateInvitations($userID, $invites);
 	}
 
 
@@ -249,7 +251,7 @@
 			return $this->error('Invitation ID required');
 		}
 
-		$op = JVB()->queue()->add(
+		$op = Queue::getInstance()->add(
 			'invitation_revoke',
 			$userID,
 			['invitation_id' => $invitationID],
@@ -270,7 +272,7 @@
 			return $this->error('Invitation ID required');
 		}
 
-		$op = JVB()->queue()->add(
+		$op = Queue::getInstance()->add(
 			'invitation_resend',
 			$userID,
 			['invitation_id' => $invitationID],
@@ -309,7 +311,7 @@
 		];
 
 		// Add term information if present
-		foreach (JVB()->roles()->getInvitableTaxonomies() as $taxonomy) {
+		foreach (Roles::getInstance()()->getInvitableTaxonomies() as $taxonomy) {
 			$column = 'to_' . $taxonomy;
 			if (isset($invitation->$column) && $invitation->$column) {
 				$termID = (int) $invitation->$column;

--
Gitblit v1.10.0