From fff721dd185f5b97f7ae7a6e64189e55887ff590 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 05 Jul 2026 18:36:57 +0000
Subject: [PATCH] =Cleaning up the Square integration (still a bit more to do yet). Also majorly overhauled /rest/ files to ignore a rest request 'user' paramater, and rely on get_current_user_id() instead.

---
 inc/rest/routes/FeedRoutes.php |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/inc/rest/routes/FeedRoutes.php b/inc/rest/routes/FeedRoutes.php
index f4e0ab1..b0fcbe2 100644
--- a/inc/rest/routes/FeedRoutes.php
+++ b/inc/rest/routes/FeedRoutes.php
@@ -70,7 +70,6 @@
 				'context' => 'string',
 				'contextId' => 'string',
 				'favourites' => 'boolean',
-				'user' => 'integer',
 				'highlight' => 'string',
 			])
 			->auth('public')
@@ -89,7 +88,6 @@
 				'context' => 'string',
 				'contextId' => 'string',
 				'favourites' => 'boolean',
-				'user' => 'integer',
 				'highlight' => 'string',
 			])
 			->auth('public')
@@ -543,11 +541,15 @@
 	 */
 	protected function applyFavouritesFilter(array $args, array $data): array
 	{
-		if (empty($data['favourites']) || empty($data['user'])) {
+		if (empty($data['favourites'])) {
 			return $args;
 		}
 
-		$user_id = (int)$data['user'];
+		$user_id = get_current_user_id();
+		if (!$user_id) {
+			//Shouldn't happen, but whatever
+			return $args;
+		}
 		$content = jvbNoBase($args['post_type']);
 
 		// Get user's favourites for this content type

--
Gitblit v1.10.0