From 1c1e50dbdafe61d98e81d42575c96b4c8329aca5 Mon Sep 17 00:00:00 2001
From: Brendan <b.oconnell14@gmail.com>
Date: Sat, 9 Dec 2023 14:41:26 +0000
Subject: [PATCH 1/3] Rearrange defineComponent to remove warnings

---
 frontend/pages/admin/site-settings.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/pages/admin/site-settings.vue b/frontend/pages/admin/site-settings.vue
index 433674c69da..0c71d6c3e11 100644
--- a/frontend/pages/admin/site-settings.vue
+++ b/frontend/pages/admin/site-settings.vue
@@ -216,6 +216,7 @@ interface CheckApp extends CheckAppConfig {
 }
 
 export default defineComponent({
+    components: { AppLoader },
     layout: "admin",
     setup() {
         // ==========================================================
@@ -465,8 +466,7 @@ export default defineComponent({
         return {
             title: this.$t("settings.site-settings") as string,
         };
-    },
-    components: { AppLoader }
+    }
 });
 </script>
 

From e7e5c9d62d67ed7644da42a786d508010b32f586 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Mon, 11 Dec 2023 03:28:00 +0000
Subject: [PATCH 2/3] fix dev settings

---
 .devcontainer/devcontainer.json | 3 ++-
 .vscode/settings.json           | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 32bd1e18a1f..20f008b2667 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -41,7 +41,8 @@
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": [
     3000,
-    9000
+    9000,
+    24678 // used by nuxt when hot-reloading using polling
   ],
   // Use 'onCreateCommand' to run commands at the end of container creation.
   // Use 'postCreateCommand' to run commands after the container is created.
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7a225c846d5..646a06fbdea 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,8 +14,8 @@
     "webp"
   ],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.organizeImports": false
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "never"
   },
   "editor.formatOnSave": true,
   "eslint.workingDirectories": [

From 275bb9617ac3e9bba146ec66e764571a7c3293ff Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Mon, 11 Dec 2023 04:37:00 +0000
Subject: [PATCH 3/3] use scraper URL instead of og tag

---
 mealie/services/scraper/scraper_strategies.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/mealie/services/scraper/scraper_strategies.py b/mealie/services/scraper/scraper_strategies.py
index fd51498023a..b9aa8978415 100644
--- a/mealie/services/scraper/scraper_strategies.py
+++ b/mealie/services/scraper/scraper_strategies.py
@@ -208,10 +208,6 @@ async def parse(self):
 
 
 class RecipeScraperOpenGraph(ABCScraperStrategy):
-    """
-    Abstract class for all recipe parsers.
-    """
-
     async def get_html(self, url: str) -> str:
         return await safe_scrape_html(url)
 
@@ -241,7 +237,7 @@ def og_fields(properties: list[tuple[str, str]], field_name: str) -> list[str]:
             "recipeIngredient": ["Could not detect ingredients"],
             "recipeInstructions": [{"text": "Could not detect instructions"}],
             "slug": slugify(og_field(properties, "og:title")),
-            "orgURL": og_field(properties, "og:url"),
+            "orgURL": self.url,
             "categories": [],
             "tags": og_fields(properties, "og:article:tag"),
             "dateAdded": None,