diff --git a/lib/philomena/adverts/advert.ex b/lib/philomena/adverts/advert.ex index bb002512..84dddad0 100644 --- a/lib/philomena/adverts/advert.ex +++ b/lib/philomena/adverts/advert.ex @@ -59,7 +59,7 @@ defmodule Philomena.Adverts.Advert do :removed_image ]) |> validate_required([:image]) - |> validate_inclusion(:image_mime_type, ["image/png", "image/jpeg", "image/webp", "image/gif"]) + |> validate_inclusion(:image_mime_type, ["image/png", "image/jpeg", "image/gif"]) |> validate_inclusion(:image_width, 699..729) |> validate_inclusion(:image_height, 79..91) |> validate_inclusion(:image_size, 0..950_000) diff --git a/lib/philomena_web/plugs/scraper_plug.ex b/lib/philomena_web/plugs/scraper_plug.ex index 898666ac..628b92ab 100644 --- a/lib/philomena_web/plugs/scraper_plug.ex +++ b/lib/philomena_web/plugs/scraper_plug.ex @@ -14,12 +14,6 @@ defmodule PhilomenaWeb.ScraperPlug do conn %{"scraper_cache" => url} when not is_nil(url) and url != "" -> - url - |> Philomena.Http.get() - |> maybe_fixup_params(url, opts, conn) - - _ -> - conn headers = if String.contains?(url, "pximg.net") do [{"Referer", "https://pixiv.net/"}] else @@ -29,6 +23,9 @@ defmodule PhilomenaWeb.ScraperPlug do url |> Philomena.Http.get(headers) |> maybe_fixup_params(url, opts, conn) + + _ -> + conn end end