Merge branch 'nightly' into release

2 files changed, 2 insertions, 1 deletions

diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
index 7e35e6831..d7ca716bb 100644
--- a/src/internal-server/app/Controllers/Http/RecipeController.js
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -14,7 +14,7 @@ class RecipeController {
   // List official and custom recipes
   async list({ response }) {
     const recipesUrlFetch = await fetch(RECIPES_URL);
-    const officialRecipes = JSON.parse(await recipesUrlFetch).text();
+    const officialRecipes = JSON.parse(await recipesUrlFetch.text());
     const allRecipes = await Recipe.all();
     const customRecipesArray = allRecipes.rows;
     const customRecipes = customRecipesArray.map(recipe => ({
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index a3add4464..54cc69eb0 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -125,6 +125,7 @@ class ServiceController {
       do {
         iconId = uuid() + uuid();
       } while (fs.existsSync(path.join(Env.get('USER_PATH'), 'icons', iconId)));
+      iconId = `${iconId}.${icon.extname}`;
 
       await icon.move(path.join(Env.get('USER_PATH'), 'icons'), {
         name: iconId,