From bad59c66549eb601fed963ed013f9b79305ca003 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 07 Jan 2026 20:09:14 +0000
Subject: [PATCH] =Feedblock integrated with refactored taxonomy selector

---
 inc/rest/routes/NotificationsRoutes.php |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/inc/rest/routes/NotificationsRoutes.php b/inc/rest/routes/NotificationsRoutes.php
index cbf36fc..a6edcb1 100644
--- a/inc/rest/routes/NotificationsRoutes.php
+++ b/inc/rest/routes/NotificationsRoutes.php
@@ -198,7 +198,6 @@
      */
     protected function getItemLink(int $ID, string $content):string
     {
-        error_log('Type: '.print_r($content, true));
         switch ($content) {
             case BASE.'artist':
             case BASE.'artwork':
@@ -379,15 +378,19 @@
     {
         $data = $request->get_params();
         $user_id = $data['user'];
-        if (!$this->userCheck($user_id)) {
-            $this->logError("Invalid user ID for notifications", [
-                'user' => $user_id
-            ], 'warning');
-            return new WP_REST_Response([
-                'success'   => false,
-                'message'   => 'User doesn\'t match. Are you a bot?'
-            ]);
-        }
+		if (!$this->userCheck($user_id)) {
+			$this->logError("Invalid user ID for notifications", ['user' => $user_id], 'warning');
+			return new WP_REST_Response([
+				'success' => false,
+				'message' => 'User doesn\'t match. Are you a bot?'
+			]);
+		}
+
+		// Check HTTP cache headers (includes notification types in timestamp check)
+		$cache_check = $this->checkUserHeaders($request, $user_id, 'notifications');
+		if ($cache_check) {
+			return $cache_check;
+		}
 
         // Step 1: Build status/order/filter params
         $params = $this->getSanitizedData($user_id, $data);
@@ -400,7 +403,8 @@
         $cache_key = "user_{$user_id}_merged_notifications_{$status}_{$type}_{$limit}_{$offset}";
         $cached = $this->cache->get($cache_key);
         if ($cached) {
-            return new WP_REST_Response($cached);
+            $response = new WP_REST_Response($cached);
+			return $this->addCacheHeaders($response);
         }
 
         try {
@@ -444,7 +448,8 @@
 
             // Cache the result
             $this->cache->set($cache_key, $response, 'notifications_' . $user_id);
-            return new WP_REST_Response($response);
+            $response = new WP_REST_Response($response);
+			return $this->addCacheHeaders($response);
         } catch (Exception $e) {
             $this->logError("Error retrieving notifications", [
                 'user_id' => $user_id,

--
Gitblit v1.10.0