From 54b93bf1dd0122186ef4000858f5d80b7981245b Mon Sep 17 00:00:00 2001 From: hay-kot Date: Mon, 15 Mar 2021 16:36:40 -0800 Subject: [PATCH] fix webhook bug --- mealie/services/meal_services.py | 25 ++++++++++++------------- mealie/utils/post_webhooks.py | 4 ++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/mealie/services/meal_services.py b/mealie/services/meal_services.py index ab3f2ded8..5d97329b6 100644 --- a/mealie/services/meal_services.py +++ b/mealie/services/meal_services.py @@ -63,18 +63,17 @@ def get_todays_meal(session: Session, group: Union[int, GroupInDB]) -> Recipe: if isinstance(group, int): group: GroupInDB = db.groups.get(session, group) - if group.webhook_enable: - today_slug = None + today_slug = None - for mealplan in group.mealplans: - mealplan: MealPlanInDB - for meal in mealplan.meals: - meal: MealOut - if meal.date == date.today(): - today_slug = meal.slug - break + for mealplan in group.mealplans: + mealplan: MealPlanInDB + for meal in mealplan.meals: + meal: MealOut + if meal.date == date.today(): + today_slug = meal.slug + break - if today_slug: - return db.recipes.get(session, today_slug) - else: - return None + if today_slug: + return db.recipes.get(session, today_slug) + else: + return None diff --git a/mealie/utils/post_webhooks.py b/mealie/utils/post_webhooks.py index a87cd58cf..135a38d56 100644 --- a/mealie/utils/post_webhooks.py +++ b/mealie/utils/post_webhooks.py @@ -9,6 +9,10 @@ from sqlalchemy.orm.session import Session def post_webhooks(group: int, session: Session = None): session = session if session else create_session() group_settings: GroupInDB = db.groups.get(session, group) + + if not group_settings.webhook_enable: + return + todays_recipe = get_todays_meal(session, group) if not todays_recipe: