diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-01-02 17:02:50 +0300 | 
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-01-02 17:02:50 +0300 | 
| commit | 48e81d3d40d334bccb8438c61ab6b307ddb1392f (patch) | |
| tree | 4b2ceee20618a52ebd277474973107cd53284d85 | |
| parent | 917d48d09bad573260bc816310ee2c75d4db84a8 (diff) | |
| download | pleroma-48e81d3d40d334bccb8438c61ab6b307ddb1392f.tar.gz pleroma-48e81d3d40d334bccb8438c61ab6b307ddb1392f.zip | |
Add RichMediaController and tests
| -rw-r--r-- | lib/pleroma/web/rich_media/controllers/rich_media_controller.ex | 17 | ||||
| -rw-r--r-- | lib/pleroma/web/rich_media/data.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/rich_media/parser.ex | 14 | ||||
| -rw-r--r-- | lib/pleroma/web/router.ex | 6 | ||||
| -rw-r--r-- | test/web/rich_media/controllers/rich_media_controller_test.exs | 54 | ||||
| -rw-r--r-- | test/web/rich_media/parser_test.exs | 21 | 
6 files changed, 104 insertions, 11 deletions
| diff --git a/lib/pleroma/web/rich_media/controllers/rich_media_controller.ex b/lib/pleroma/web/rich_media/controllers/rich_media_controller.ex new file mode 100644 index 000000000..91019961d --- /dev/null +++ b/lib/pleroma/web/rich_media/controllers/rich_media_controller.ex @@ -0,0 +1,17 @@ +defmodule Pleroma.Web.RichMedia.RichMediaController do +  use Pleroma.Web, :controller + +  import Pleroma.Web.ControllerHelper, only: [json_response: 3] + +  def parse(conn, %{"url" => url}) do +    case Pleroma.Web.RichMedia.Parser.parse(url) do +      {:ok, data} -> +        conn +        |> json_response(200, data) + +      {:error, msg} -> +        conn +        |> json_response(404, msg) +    end +  end +end diff --git a/lib/pleroma/web/rich_media/data.ex b/lib/pleroma/web/rich_media/data.ex deleted file mode 100644 index 403d1d341..000000000 --- a/lib/pleroma/web/rich_media/data.ex +++ /dev/null @@ -1,3 +0,0 @@ -defmodule Pleroma.Web.RichMedia.Data do -  defstruct [:title, :type, :image, :url, :description] -end diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex index d9c1684d5..477a38196 100644 --- a/lib/pleroma/web/rich_media/parser.ex +++ b/lib/pleroma/web/rich_media/parser.ex @@ -4,11 +4,23 @@ defmodule Pleroma.Web.RichMedia.Parser do    def parse(url) do      {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url) -    Enum.reduce_while(@parsers, %Pleroma.Web.RichMedia.Data{}, fn parser, acc -> +    html |> maybe_parse() |> get_parsed_data() +  end + +  defp maybe_parse(html) do +    Enum.reduce_while(@parsers, %{}, fn parser, acc ->        case parser.parse(html, acc) do          {:ok, data} -> {:halt, data}          {:error, _msg} -> {:cont, acc}        end      end)    end + +  defp get_parsed_data(data) when data == %{} do +    {:error, "No metadata found"} +  end + +  defp get_parsed_data(data) do +    {:ok, data} +  end  end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 1f929ee21..8df45bf4d 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -232,6 +232,12 @@ defmodule Pleroma.Web.Router do      put("/settings", MastodonAPIController, :put_settings)    end +  scope "/api", Pleroma.Web.RichMedia do +    pipe_through(:authenticated_api) + +    get("/rich_media/parse", RichMediaController, :parse) +  end +    scope "/api/v1", Pleroma.Web.MastodonAPI do      pipe_through(:api)      get("/instance", MastodonAPIController, :masto_instance) diff --git a/test/web/rich_media/controllers/rich_media_controller_test.exs b/test/web/rich_media/controllers/rich_media_controller_test.exs new file mode 100644 index 000000000..37c82631f --- /dev/null +++ b/test/web/rich_media/controllers/rich_media_controller_test.exs @@ -0,0 +1,54 @@ +defmodule Pleroma.Web.RichMedia.RichMediaControllerTest do +  use Pleroma.Web.ConnCase +  import Pleroma.Factory + +  setup do +    Tesla.Mock.mock(fn +      %{ +        method: :get, +        url: "http://example.com/ogp" +      } -> +        %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")} + +      %{method: :get, url: "http://example.com/empty"} -> +        %Tesla.Env{status: 200, body: "hello"} +    end) + +    :ok +  end + +  describe "GET /api/rich_media/parse" do +    setup do +      user = insert(:user) + +      [user: user] +    end + +    test "returns 404 if not metadata found", %{user: user} do +      build_conn() +      |> with_credentials(user.nickname, "test") +      |> get("/api/rich_media/parse", %{"url" => "http://example.com/empty"}) +      |> json_response(404) +    end + +    test "returns OGP metadata", %{user: user} do +      response = +        build_conn() +        |> with_credentials(user.nickname, "test") +        |> get("/api/rich_media/parse", %{"url" => "http://example.com/ogp"}) +        |> json_response(200) + +      assert response == %{ +               "image" => "http://ia.media-imdb.com/images/rock.jpg", +               "title" => "The Rock", +               "type" => "video.movie", +               "url" => "http://www.imdb.com/title/tt0117500/" +             } +    end +  end + +  defp with_credentials(conn, username, password) do +    header_content = "Basic " <> Base.encode64("#{username}:#{password}") +    put_req_header(conn, "authorization", header_content) +  end +end diff --git a/test/web/rich_media/parser_test.exs b/test/web/rich_media/parser_test.exs index bb0d663e9..caf81e9fa 100644 --- a/test/web/rich_media/parser_test.exs +++ b/test/web/rich_media/parser_test.exs @@ -8,19 +8,26 @@ defmodule Pleroma.Web.RichMedia.ParserTest do          url: "http://example.com/ogp"        } ->          %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")} + +      %{method: :get, url: "http://example.com/empty"} -> +        %Tesla.Env{status: 200, body: "hello"}      end)      :ok    end +  test "returns error when no metadata present" do +    assert {:error, _} = Pleroma.Web.RichMedia.Parser.parse("http://example.com/empty") +  end +    test "parses ogp" do      assert Pleroma.Web.RichMedia.Parser.parse("http://example.com/ogp") == -             %Pleroma.Web.RichMedia.Data{ -               description: nil, -               image: "http://ia.media-imdb.com/images/rock.jpg", -               title: "The Rock", -               type: "video.movie", -               url: "http://www.imdb.com/title/tt0117500/" -             } +             {:ok, +              %{ +                image: "http://ia.media-imdb.com/images/rock.jpg", +                title: "The Rock", +                type: "video.movie", +                url: "http://www.imdb.com/title/tt0117500/" +              }}    end  end | 
