From 6c9b92400e21558c39f85a7b921f2f089a868ac6 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 24 Mar 2024 18:32:56 +0000 Subject: [PATCH] GET recipes/name/tiddlers.json should use include_deleted parameter --- plugins/tiddlywiki/multiwikiclient/multiwikiclientadaptor.js | 3 ++- .../modules/routes/handlers/get-recipe-tiddlers-json.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/tiddlywiki/multiwikiclient/multiwikiclientadaptor.js b/plugins/tiddlywiki/multiwikiclient/multiwikiclientadaptor.js index c93a321a4..45f551c30 100644 --- a/plugins/tiddlywiki/multiwikiclient/multiwikiclientadaptor.js +++ b/plugins/tiddlywiki/multiwikiclient/multiwikiclientadaptor.js @@ -175,7 +175,8 @@ MultiWikiClientAdaptor.prototype.getUpdatedTiddlers = function(syncer,callback) $tw.utils.httpRequest({ url: this.host + "recipes/" + this.recipe + "/tiddlers.json", data: { - last_known_tiddler_id: this.last_known_tiddler_id + last_known_tiddler_id: this.last_known_tiddler_id, + include_deleted: "true" }, callback: function(err,data) { // Check for errors diff --git a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js index 2c68669a4..f30088971 100644 --- a/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js +++ b/plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddlers-json.js @@ -3,7 +3,7 @@ title: $:/plugins/tiddlywiki/multiwikiserver/routes/handlers/get-recipe-tiddlers type: application/javascript module-type: mws-route -GET /recipes/:recipe_name/tiddlers.json?last_known_tiddler_id=:last_known_tiddler_id +GET /recipes/:recipe_name/tiddlers.json?last_known_tiddler_id=:last_known_tiddler_id&include_deleted=true|false \*/ (function() { @@ -22,6 +22,7 @@ exports.handler = function(request,response,state) { if(recipe_name) { // Get the tiddlers in the recipe, optionally since the specified last known tiddler_id var recipeTiddlers = $tw.mws.store.getRecipeTiddlers(recipe_name,{ + include_deleted: state.queryParameters.include_deleted === "true", last_known_tiddler_id: state.queryParameters.last_known_tiddler_id }); if(recipeTiddlers) {