X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmetadata%2Fopengraph.ex;h=a48788969431349cb341e7f27038831e51c9986a;hb=0256bd2f1dfb121a4d751906a202e3db482500a6;hp=b7c5dc64e8e483fb83c55f661409a06976b317f6;hpb=293f6a8b712246d0580f9eb113c798ae1ea3b634;p=akkoma

diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex
index b7c5dc64e..a48788969 100644
--- a/lib/pleroma/web/metadata/opengraph.ex
+++ b/lib/pleroma/web/metadata/opengraph.ex
@@ -9,30 +9,38 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
   @behaviour Provider
 
   @impl Provider
-  def build_tags(%{activity: activity, user: user}) do
-    with truncated_content = scrub_html_and_truncate(activity) do
-      attachments = build_attachments(activity)
+  def build_tags(%{activity: %{data: %{"object" => %{"id" => object_id}}} = activity, user: user}) do
+    attachments = build_attachments(activity)
 
-      [
-        {:meta,
-         [
-           property: "og:title",
-           content: user_name_string(user)
-         ], []},
-        {:meta, [property: "og:url", content: activity.data["id"]], []},
-        {:meta, [property: "og:description", content: truncated_content], []}
-      ] ++
-        if attachments == [] or
-             Enum.any?(activity.data["object"]["tag"], fn tag -> tag == "nsfw" end) do
-          [
-            {:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []},
-            {:meta, [property: "og:image:width", content: 120], []},
-            {:meta, [property: "og:image:height", content: 120], []}
-          ]
-        else
-          attachments
-        end
-    end
+    # Most previews only show og:title which is inconvenient. Instagram
+    # hacks this by putting the description in the title and making the
+    # description longer prefixed by how many likes and shares the post
+    # has. Here we use the descriptive nickname in the title, and expand
+    # the full account & nickname in the description. We also use the cute^Wevil
+    # smart quotes around the status text like Instagram, too.
+    [
+      {:meta,
+       [
+         property: "og:title",
+         content: "#{user.name}: " <> "“" <> scrub_html_and_truncate(activity) <> "”"
+       ], []},
+      {:meta, [property: "og:url", content: object_id], []},
+      {:meta,
+       [
+         property: "og:description",
+         content: "#{user_name_string(user)}: " <> "“" <> scrub_html_and_truncate(activity) <> "”"
+       ], []},
+      {:meta, [property: "og:type", content: "website"], []}
+    ] ++
+      if attachments == [] do
+        [
+          {:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []},
+          {:meta, [property: "og:image:width", content: 150], []},
+          {:meta, [property: "og:image:height", content: 150], []}
+        ]
+      else
+        attachments
+      end
   end
 
   @impl Provider
@@ -46,9 +54,10 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
          ], []},
         {:meta, [property: "og:url", content: User.profile_url(user)], []},
         {:meta, [property: "og:description", content: truncated_bio], []},
+        {:meta, [property: "og:type", content: "website"], []},
         {:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []},
-        {:meta, [property: "og:image:width", content: 120], []},
-        {:meta, [property: "og:image:height", content: 120], []}
+        {:meta, [property: "og:image:width", content: 150], []},
+        {:meta, [property: "og:image:height", content: 150], []}
       ]
     end
   end
@@ -62,13 +71,33 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
               String.starts_with?(url["mediaType"], media_type)
             end)
 
-          if media_type do
-            [
-              {:meta, [property: "og:" <> media_type, content: attachment_url(url["href"])], []}
-              | acc
-            ]
-          else
-            acc
+          # TODO: Add additional properties to objects when we have the data available.
+          # Also, Whatsapp only wants JPEG or PNGs. It seems that if we add a second og:image
+          # object when a Video or GIF is attached it will display that in the Whatsapp Rich Preview.
+          case media_type do
+            "audio" ->
+              [
+                {:meta, [property: "og:" <> media_type, content: attachment_url(url["href"])], []}
+                | acc
+              ]
+
+            "image" ->
+              [
+                {:meta, [property: "og:" <> media_type, content: attachment_url(url["href"])],
+                 []},
+                {:meta, [property: "og:image:width", content: 150], []},
+                {:meta, [property: "og:image:height", content: 150], []}
+                | acc
+              ]
+
+            "video" ->
+              [
+                {:meta, [property: "og:" <> media_type, content: attachment_url(url["href"])], []}
+                | acc
+              ]
+
+            _ ->
+              acc
           end
         end)