From f7e595b404a67c0256a44b59987744dcd8331033 Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Fri, 25 Oct 2024 09:53:42 -0500 Subject: [PATCH] fix: Images Using Wrong Content Type (#4441) --- docker/Dockerfile | 1 - mealie/routes/media/media_recipe.py | 11 +++-------- mealie/routes/media/media_user.py | 7 +------ 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 60607fa4b8a..6c9c09066ee 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -131,7 +131,6 @@ HEALTHCHECK CMD python $MEALIE_HOME/mealie/scripts/healthcheck.py || exit 1 # ---------------------------------- # Copy Frontend -# copying caddy into image ENV STATIC_FILES=/spa/static COPY --from=builder /app/dist ${STATIC_FILES} diff --git a/mealie/routes/media/media_recipe.py b/mealie/routes/media/media_recipe.py index 85620a666da..12f8d12b249 100644 --- a/mealie/routes/media/media_recipe.py +++ b/mealie/routes/media/media_recipe.py @@ -7,12 +7,7 @@ from mealie.schema.recipe import Recipe from mealie.schema.recipe.recipe_timeline_events import RecipeTimelineEventOut -""" -These routes are for development only! These assets are served by Caddy when not -in development mode. If you make changes, be sure to test the production container. -""" - -router = APIRouter(prefix="/recipes", include_in_schema=False) +router = APIRouter(prefix="/recipes") class ImageType(str, Enum): @@ -30,7 +25,7 @@ async def get_recipe_img(recipe_id: str, file_name: ImageType = ImageType.origin recipe_image = Recipe.directory_from_id(recipe_id).joinpath("images", file_name.value) if recipe_image.exists(): - return FileResponse(recipe_image) + return FileResponse(recipe_image, media_type="image/webp") else: raise HTTPException(status.HTTP_404_NOT_FOUND) @@ -48,7 +43,7 @@ async def get_recipe_timeline_event_img( ) if timeline_event_image.exists(): - return FileResponse(timeline_event_image) + return FileResponse(timeline_event_image, media_type="image/webp") else: raise HTTPException(status.HTTP_404_NOT_FOUND) diff --git a/mealie/routes/media/media_user.py b/mealie/routes/media/media_user.py index 561778800d4..96088b22bcc 100644 --- a/mealie/routes/media/media_user.py +++ b/mealie/routes/media/media_user.py @@ -4,12 +4,7 @@ from mealie.schema.user import PrivateUser -""" -These routes are for development only! These assets are served by Caddy when not -in development mode. If you make changes, be sure to test the production container. -""" - -router = APIRouter(prefix="/users", include_in_schema=False) +router = APIRouter(prefix="/users") @router.get("/{user_id}/{file_name}", response_class=FileResponse)