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/ContentRoutes.php | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/inc/rest/routes/ContentRoutes.php b/inc/rest/routes/ContentRoutes.php
index d3f3068..9375fa2 100644
--- a/inc/rest/routes/ContentRoutes.php
+++ b/inc/rest/routes/ContentRoutes.php
@@ -88,12 +88,11 @@
'dateFrom' => 'string',
'dateTo' => 'string',
])
- ->rateLimit(20)
+ ->rateLimit(30)
->post([$this, 'postContent'])
->auth(PermissionHandler::combine(['user', 'nonce', ['actionNonce'=>'dash-']]))
- ->rateLimit(30)
+ ->rateLimit()
->args([
- 'user' => 'int|required',
'posts' => 'required',
'content' => 'string',
])
@@ -147,7 +146,7 @@
$allFields = $registrar->getFields()??[];
return array_keys(array_filter($allFields, function ($field) {
- if (!array_key_exists('for_all', $field) || $field['for_all'] === false) {
+ if (!array_key_exists('for_all', $field) || is_null($field['for_all']) || $field['for_all'] === false) {
return true;
}
return false;
@@ -163,7 +162,7 @@
public function postContent(WP_REST_Request $request): WP_REST_Response
{
$data = $request->get_params();
- $user_id = $data['user'];
+ $user_id = get_current_user_id();
if (!array_key_exists('posts', $data) || !is_array($data['posts'])) {
return Response::success(['message'=>'No posts found in request']);
@@ -172,7 +171,6 @@
$count = count($data['posts']);
$operationId = $data['id'];
- unset($data['user']);
unset($data['id']);
error_log('[CONTENT]:'.print_r($data, true));
@@ -533,7 +531,7 @@
'modified' => $post->post_modified,
'thumbnail' => get_the_post_thumbnail_url($post->ID),
'alt' => get_post_meta(get_post_thumbnail_id(), '_wp_attachment_image_alt', true),
- 'icon' => $this->post_type,
+ 'icon' => $registrar->getIcon(),
'taxonomies' => [],
'fields' => $fields,
'images' => [],
@@ -598,7 +596,7 @@
$item['fields'] = $mainMeta->getAll($this->timelineSharedFields);
//Step 2: Get the fields for each individual posts
- $children = get_children(['post_parent' => $post->ID, 'orderby' => 'date', 'order' => 'ASC', 'post_status' => ['publish', 'draft'], 'fields' => 'ids']);
+ $children = jvbTimelinePoints($post->ID, $post->post_type,['publish', 'draft']);
array_unshift($children, $post->ID);
$subFields = [];
@@ -611,7 +609,7 @@
$images[$f['post_thumbnail']] = jvbImageData((int)$f['post_thumbnail']);
}
- $item['fields']['timeline'] = $subFields;
+ $item['fields']['timeline_gallery'] = $subFields;
$item['images'] = $item['images'] + $images;
$item['number'] = $mainMeta->get('number');
--
Gitblit v1.10.0