feat: extend Apprise JSON notification functionality with programmati…

…c data (#1355)

* Fixed incorrect generic deleted notification text

* Added custom "event_source" header for json notifs

* Added internal reference data to event notifs

* Added event listeners to shopping list items

* Fixed type issues

* moved JSON event source k:v pairs to message body

* added hook for all supported custom endpoints
fixed bug that excluded non-custom notification types

* created event_source class to replace loosely-typed dict

* fixed silent error when dispatching a null task

* moved url updates to static function

* added unit tests for event_source url manipulation

* removed array from event bus (it's unsupported)

mealie/lang/messages/af-ZA.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/ar-SA.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/bg-BG.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/ca-ES.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/cs-CZ.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/da-DK.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} blev opdateret",
         "generic-created-with-url": "{name} er oprettet, {url}",
         "generic-updated-with-url": "{name} er blevet opdateret, {url}",
-        "generic-deleted": "{name} er oprettet"
+        "generic-deleted": "{name} er slettet"
     }
 }

mealie/lang/messages/de-DE.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} wurde aktualisiert",
         "generic-created-with-url": "{name} wurde erstellt, {url}",
         "generic-updated-with-url": "{name} wurde aktualisiert, {url}",
-        "generic-deleted": "{name} wurde erstellt"
+        "generic-deleted": "{name} wurde gelöscht"
     }
 }

mealie/lang/messages/el-GR.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/en-GB.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/en-US.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/es-ES.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/fi-FI.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/fr-CA.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/fr-FR.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} a été mis à jour",
         "generic-created-with-url": "{name} a été créé, {url}",
         "generic-updated-with-url": "{name} a été mis à jour, {url}",
-        "generic-deleted": "{name} a été créé"
+        "generic-deleted": "{name} a été supprimée"
     }
 }

mealie/lang/messages/he-IL.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/hu-HU.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/it-IT.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} è stato aggiornato",
         "generic-created-with-url": "{name} è stato creato, {url}",
         "generic-updated-with-url": "{name} è stato aggiornato, {url}",
-        "generic-deleted": "{name} è stato creato"
+        "generic-deleted": "{name} è stato cancellato"
     }
 }

mealie/lang/messages/ja-JP.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/ko-KR.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/nl-NL.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/no-NO.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/pl-PL.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/pt-BR.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/pt-PT.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/ro-RO.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/ru-RU.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/sk-SK.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/sr-SP.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/sv-SE.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/tr-TR.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/uk-UA.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} оновлено",
         "generic-created-with-url": "{name} створено, {url}",
         "generic-updated-with-url": "{name} оновлено, {url}",
-        "generic-deleted": "{name} створено"
+        "generic-deleted": "{name} видалено"
     }
 }

mealie/lang/messages/vi-VN.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/zh-CN.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/lang/messages/zh-TW.json

@@ -17,6 +17,6 @@
         "generic-updated": "{name} was updated",
         "generic-created-with-url": "{name} has been created, {url}",
         "generic-updated-with-url": "{name} has been updated, {url}",
-        "generic-deleted": "{name} has been created"
+        "generic-deleted": "{name} has been deleted"
     }
 }

mealie/routes/groups/controller_cookbooks.py

@@ -8,7 +8,7 @@
 from mealie.routes._base.mixins import HttpRepo
 from mealie.schema import mapper
 from mealie.schema.cookbook import CreateCookBook, ReadCookBook, RecipeCookBook, SaveCookBook, UpdateCookBook
-from mealie.services.event_bus_service.event_bus_service import EventBusService
+from mealie.services.event_bus_service.event_bus_service import EventBusService, EventSource
 from mealie.services.event_bus_service.message_types import EventTypes
 
 router = APIRouter(prefix="/groups/cookbooks", tags=["Groups: Cookbooks"])
@@ -53,6 +53,7 @@ def create_one(self, data: CreateCookBook):
                 self.deps.acting_user.group_id,
                 EventTypes.cookbook_created,
                 msg=self.t("notifications.generic-created", name=val.name),
+                event_source=EventSource(event_type="create", item_type="cookbook", item_id=val.id, slug=val.slug),
             )
         return val
 
@@ -94,6 +95,7 @@ def update_one(self, item_id: str, data: CreateCookBook):
                 self.deps.acting_user.group_id,
                 EventTypes.cookbook_updated,
                 msg=self.t("notifications.generic-updated", name=val.name),
+                event_source=EventSource(event_type="update", item_type="cookbook", item_id=val.id, slug=val.slug),
             )
 
         return val
@@ -106,5 +108,6 @@ def delete_one(self, item_id: str):
                 self.deps.acting_user.group_id,
                 EventTypes.cookbook_deleted,
                 msg=self.t("notifications.generic-deleted", name=val.name),
+                event_source=EventSource(event_type="delete", item_type="cookbook", item_id=val.id, slug=val.slug),
             )
         return val