From a02a2027760cd79ff5f5c2777244b2c5b4f66b6f Mon Sep 17 00:00:00 2001 From: kytwb Date: Fri, 7 Jan 2022 02:07:56 +0100 Subject: Eventually get remote recipes updates in internal server --- .../app/Controllers/Http/RecipeController.js | 30 +++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js index daa9356f6..64838b338 100644 --- a/src/internal-server/app/Controllers/Http/RecipeController.js +++ b/src/internal-server/app/Controllers/Http/RecipeController.js @@ -85,10 +85,23 @@ class RecipeController { return response.send(results); } - // Return an empty array - update({ - response, - }) { + async update({ request, response }) { + // eslint-disable-next-line eqeqeq + if (Env.get('CONNECT_WITH_FRANZ') == 'true') { + const body = request.all(); + try { + const remoteUpdates = await fetch(`${RECIPES_URL}/update`, { + method: 'POST', + body: JSON.stringify(body), + headers: {'Content-Type': 'application/json'} + }); + return response.send( + remoteUpdates.ok ? await remoteUpdates.json() : remoteUpdates, + ); + } catch (error) { + return response.send({ error }); + } + } return response.send([]); } @@ -120,15 +133,14 @@ class RecipeController { if (/\.+/.test(service) || /\/+/.test(service)) { return response.send('Invalid recipe name'); } - - // Check if recipe exists in recipes folder - if (await Drive.exists(`${service}.tar.gz`)) { - return response.send(await Drive.get(`${service}.tar.gz`)); - } // eslint-disable-next-line eqeqeq if (Env.get('CONNECT_WITH_FRANZ') == 'true') { return response.redirect(`${RECIPES_URL}/download/${service}`); } + // Check if recipe exists in recipes folder + if (await Drive.exists(`${service}.tar.gz`)) { + return response.send(await Drive.get(`${service}.tar.gz`)); + } return response.status(400).send({ message: 'Recipe not found', code: 'recipe-not-found', -- cgit v1.2.3-54-g00ecf From 1fa9baee81a42992dbc91b3e81faa26d9f6180a0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 7 Jan 2022 01:37:34 +0000 Subject: 5.6.9-nightly.2 [skip ci] --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 247ee0949..56d52ca9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ferdi", - "version": "5.6.9-nightly.1", + "version": "5.6.9-nightly.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ferdi", - "version": "5.6.9-nightly.1", + "version": "5.6.9-nightly.2", "license": "Apache-2.0", "dependencies": { "@adonisjs/ace": "^5.0.8", diff --git a/package.json b/package.json index 25632884d..62eb589db 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.9-nightly.1", + "version": "5.6.9-nightly.2", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "kytwb", "main": "index.js", -- cgit v1.2.3-54-g00ecf From e4c3563e2c01379fcb95f8cf466e0143becd6067 Mon Sep 17 00:00:00 2001 From: kytwb Date: Sat, 8 Jan 2022 13:54:44 +0100 Subject: 5.6.9 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f420f3a2..756e6ab34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ferdi", - "version": "5.6.9-nightly.2", + "version": "5.6.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ferdi", - "version": "5.6.9-nightly.2", + "version": "5.6.9", "license": "Apache-2.0", "dependencies": { "@adonisjs/ace": "^5.0.8", diff --git a/package.json b/package.json index 321b585cf..9c18bb791 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Ferdi", "desktopName": "ferdi.desktop", "appId": "com.kytwb.ferdi", - "version": "5.6.9-nightly.2", + "version": "5.6.9", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "kytwb", "main": "index.js", -- cgit v1.2.3-54-g00ecf