Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'

Rich Media support, part 2.

See merge request pleroma/pleroma!719

test/web/mastodon_api/mastodon_api_controller_test.exs

@@ -136,6 +136,20 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     assert Repo.get(Activity, id)
   end
 
+  test "posting a status with OGP link preview", %{conn: conn} do
+    user = insert(:user)
+
+    conn =
+      conn
+      |> assign(:user, user)
+      |> post("/api/v1/statuses", %{
+        "status" => "http://example.com/ogp"
+      })
+
+    assert %{"id" => id, "card" => %{"title" => "The Rock"}} = json_response(conn, 200)
+    assert Repo.get(Activity, id)
+  end
+
   test "posting a direct status", %{conn: conn} do
     user1 = insert(:user)
     user2 = insert(:user)
@@ -1663,9 +1677,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       assert response == %{
                "image" => "http://ia.media-imdb.com/images/rock.jpg",
                "provider_name" => "www.imdb.com",
+               "provider_url" => "http://www.imdb.com",
                "title" => "The Rock",
                "type" => "link",
-               "url" => "http://www.imdb.com/title/tt0117500/"
+               "url" => "http://www.imdb.com/title/tt0117500/",
+               "description" => nil,
+               "pleroma" => %{
+                 "opengraph" => %{
+                   "image" => "http://ia.media-imdb.com/images/rock.jpg",
+                   "title" => "The Rock",
+                   "type" => "video.movie",
+                   "url" => "http://www.imdb.com/title/tt0117500/"
+                 }
+               }
              }
     end
   end

test/web/mastodon_api/status_view_test.exs

@@ -84,6 +84,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
       account: AccountView.render("account.json", %{user: user}),
       in_reply_to_id: nil,
       in_reply_to_account_id: nil,
+      card: nil,
       reblog: nil,
       content: HtmlSanitizeEx.basic_html(note.data["object"]["content"]),
       created_at: created_at,

test/web/rich_media/controllers/rich_media_controller_test.exs

@@ -1,49 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.RichMedia.RichMediaControllerTest do
-  use Pleroma.Web.ConnCase
-  import Pleroma.Factory
-  import Tesla.Mock
-
-  setup do
-    mock(fn env -> apply(HttpRequestMock, :request, [env]) 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

test/web/rich_media/parser_test.exs

@@ -65,28 +65,27 @@ defmodule Pleroma.Web.RichMedia.ParserTest do
     assert Pleroma.Web.RichMedia.Parser.parse("http://example.com/oembed") ==
              {:ok,
               %{
-                "author_name" => "‮‭‬bees‬",
-                "author_url" => "https://www.flickr.com/photos/bees/",
-                "cache_age" => 3600,
-                "flickr_type" => "photo",
-                "height" => "768",
-                "html" =>
+                author_name: "‮‭‬bees‬",
+                author_url: "https://www.flickr.com/photos/bees/",
+                cache_age: 3600,
+                flickr_type: "photo",
+                height: "768",
+                html:
                   "<a data-flickr-embed=\"true\" href=\"https://www.flickr.com/photos/bees/2362225867/\" title=\"Bacon Lollys by ‮‭‬bees‬, on Flickr\"><img src=\"https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg\" width=\"1024\" height=\"768\" alt=\"Bacon Lollys\"></a><script async src=\"https://embedr.flickr.com/assets/client-code.js\" charset=\"utf-8\"></script>",
-                "license" => "All Rights Reserved",
-                "license_id" => 0,
-                "provider_name" => "Flickr",
-                "provider_url" => "https://www.flickr.com/",
-                "thumbnail_height" => 150,
-                "thumbnail_url" =>
-                  "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_q.jpg",
-                "thumbnail_width" => 150,
-                "title" => "Bacon Lollys",
-                "type" => "photo",
-                "url" => "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg",
-                "version" => "1.0",
-                "web_page" => "https://www.flickr.com/photos/bees/2362225867/",
-                "web_page_short_url" => "https://flic.kr/p/4AK2sc",
-                "width" => "1024"
+                license: "All Rights Reserved",
+                license_id: 0,
+                provider_name: "Flickr",
+                provider_url: "https://www.flickr.com/",
+                thumbnail_height: 150,
+                thumbnail_url: "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_q.jpg",
+                thumbnail_width: 150,
+                title: "Bacon Lollys",
+                type: "photo",
+                url: "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg",
+                version: "1.0",
+                web_page: "https://www.flickr.com/photos/bees/2362225867/",
+                web_page_short_url: "https://flic.kr/p/4AK2sc",
+                width: "1024"
               }}
   end
 end

test/web/twitter_api/representers/activity_representer_test.exs

@@ -164,6 +164,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       "possibly_sensitive" => true,
       "uri" => activity.data["object"]["id"],
       "visibility" => "direct",
+      "card" => nil,
       "summary" => "2hu :2hu:",
       "summary_html" =>
         "2hu <img height=\"32px\" width=\"32px\" alt=\"2hu\" title=\"2hu\" src=\"corndog.png\" />"

test/web/twitter_api/views/activity_view_test.exs

@@ -148,7 +148,8 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
       "text" => "Hey @shp!",
       "uri" => activity.data["object"]["id"],
       "user" => UserView.render("show.json", %{user: user}),
-      "visibility" => "direct"
+      "visibility" => "direct",
+      "card" => nil
     }
 
     assert result == expected