From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 1 Jun 2020 13:38:57 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=6b84c62d4a51cb17192945d1b67999b2c56a23d2;p=akkoma

Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
---

6b84c62d4a51cb17192945d1b67999b2c56a23d2
diff --cc lib/pleroma/constants.ex
index 4ba39b53f,06174f624..13eeaa96b
--- a/lib/pleroma/constants.ex
+++ b/lib/pleroma/constants.ex
@@@ -17,7 -17,13 +17,13 @@@ defmodule Pleroma.Constants d
        "announcement_count",
        "emoji",
        "context_id",
-       "deleted_activity_id"
+       "deleted_activity_id",
+       "pleroma_internal"
      ]
    )
+ 
+   const(static_only_files,
+     do:
 -      ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc)
++      ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc embed.js embed.css)
+   )
  end
diff --cc lib/pleroma/web/router.ex
index eef0a8023,e493a4153..a2626521e
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -637,16 -664,9 +664,11 @@@ defmodule Pleroma.Web.Router d
      post("/auth/password", MastodonAPI.AuthController, :password_reset)
  
      get("/web/*path", MastoFEController, :index)
 +
 +    get("/embed/:id", EmbedController, :show)
    end
  
-   pipeline :remote_media do
-   end
- 
    scope "/proxy/", Pleroma.Web.MediaProxy do
-     pipe_through(:remote_media)
- 
      get("/:sig/:url", MediaProxyController, :remote)
      get("/:sig/:url/:filename", MediaProxyController, :remote)
    end
diff --cc lib/pleroma/web/templates/embed/show.html.eex
index 6bf8fac29,000000000..05a3f0ee3
mode 100644,000000..100644
--- a/lib/pleroma/web/templates/embed/show.html.eex
+++ b/lib/pleroma/web/templates/embed/show.html.eex
@@@ -1,76 -1,0 +1,76 @@@
 +<div>
 +  <div class="p-author h-card">
-     <a class="u-url" rel="author noopener" href="<%= User.profile_url(@author) %>">
++    <a class="u-url" rel="author noopener" href="<%= @author.ap_id %>">
 +      <div class="avatar">
 +        <img src="<%= User.avatar_url(@author) |> MediaProxy.url %>" width="48" height="48" alt="">
 +      </div>
 +      <span class="display-name" style="padding-left: 0.5em;">
-         <bdi><%= raw (@author.name |> Formatter.emojify(emoji_for_user(@author))) %></bdi>
++        <bdi><%= raw (@author.name |> Formatter.emojify(@author.emoji)) %></bdi>
 +        <span class="nickname"><%= full_nickname(@author) %></span>
 +      </span>
 +    </a>
 +  </div>
 +
 +  <div class="activity-content" >
 +    <%= if status_title(@activity) != "" do %>
 +      <details <%= if open_content?() do %>open<% end %>>
 +        <summary><%= raw status_title(@activity) %></summary>
 +        <div><%= activity_content(@activity) %></div>
 +      </details>
 +    <% else %>
 +      <div><%= activity_content(@activity) %></div>
 +    <% end %>
 +    <%= for %{"name" => name, "url" => [url | _]} <- attachments(@activity) do %>
 +      <div class="attachment">
 +      <%= if sensitive?(@activity) do %>
 +        <details class="nsfw">
 +          <summary onClick="updateHeight()"><%= Gettext.gettext("sensitive media") %></summary>
 +          <div class="nsfw-content">
 +            <%= render("_attachment.html", %{name: name, url: url["href"],
 +                                             mediaType: fetch_media_type(url)}) %>
 +          </div>
 +        </details>
 +      <% else %>
 +        <%= render("_attachment.html", %{name: name, url: url["href"],
 +                                         mediaType: fetch_media_type(url)}) %>
 +      <% end %>
 +      </div>
 +    <% end %>
 +  </div>
 +
 +  <dl class="counts pull-right">
 +    <dt><%= Gettext.gettext("replies") %></dt><dd><%= @counts.replies %></dd>
 +    <dt><%= Gettext.gettext("announces") %></dt><dd><%= @counts.announces %></dd>
 +    <dt><%= Gettext.gettext("likes") %></dt><dd><%= @counts.likes %></dd>
 +  </dl>
 +
 +  <p class="date pull-left">
 +    <%= link published(@activity), to: activity_url(@author, @activity) %>
 +  </p>
 +</div>
 +
 +<script>
 +function updateHeight() {
 +  window.requestAnimationFrame(function(){
 +    var height = document.getElementsByTagName('html')[0].scrollHeight;
 +
 +    window.parent.postMessage({
 +      type: 'setHeightPleromaEmbed',
 +      id: window.parentId,
 +      height: height,
 +    }, '*');
 +  })
 +}
 +
 +window.addEventListener('message', function(e){
 +  var data = e.data || {};
 +
 +  if (!window.parent || data.type !== 'setHeightPleromaEmbed') {
 +    return;
 +  }
 +
 +  window.parentId = data.id
 +
 +  updateHeight()
 +});
 +</script>
diff --cc lib/pleroma/web/templates/layout/embed.html.eex
index 57ae4f802,000000000..8b905f070
mode 100644,000000..100644
--- a/lib/pleroma/web/templates/layout/embed.html.eex
+++ b/lib/pleroma/web/templates/layout/embed.html.eex
@@@ -1,14 -1,0 +1,15 @@@
 +<!DOCTYPE html>
 +<html>
 +  <head>
 +    <meta charset="utf-8" />
 +    <meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
 +    <title><%= Pleroma.Config.get([:instance, :name]) %></title>
 +    <meta content='noindex' name='robots'>
 +    <%= Phoenix.HTML.raw(assigns[:meta] || "") %>
 +    <link rel="stylesheet" href="/embed.css">
++    <base target="_parent">
 +  </head>
 +  <body>
 +    <%= render @view_module, @view_template, assigns %>
 +  </body>
 +</html>
diff --cc lib/pleroma/web/views/embed_view.ex
index 77536835b,000000000..5f50bd155
mode 100644,000000..100644
--- a/lib/pleroma/web/views/embed_view.ex
+++ b/lib/pleroma/web/views/embed_view.ex
@@@ -1,83 -1,0 +1,74 @@@
 +# Pleroma: A lightweight social networking server
 +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 +# SPDX-License-Identifier: AGPL-3.0-only
 +
 +defmodule Pleroma.Web.EmbedView do
 +  use Pleroma.Web, :view
 +
 +  alias Calendar.Strftime
 +  alias Pleroma.Activity
 +  alias Pleroma.Emoji.Formatter
 +  alias Pleroma.Object
 +  alias Pleroma.User
 +  alias Pleroma.Web.Gettext
 +  alias Pleroma.Web.MediaProxy
 +  alias Pleroma.Web.Metadata.Utils
 +  alias Pleroma.Web.Router.Helpers
 +
 +  use Phoenix.HTML
 +
 +  @media_types ["image", "audio", "video"]
 +
-   defp emoji_for_user(%User{} = user) do
-     user.source_data
-     |> Map.get("tag", [])
-     |> Enum.filter(fn %{"type" => t} -> t == "Emoji" end)
-     |> Enum.map(fn %{"icon" => %{"url" => url}, "name" => name} ->
-       {String.trim(name, ":"), url}
-     end)
-   end
- 
 +  defp fetch_media_type(%{"mediaType" => mediaType}) do
 +    Utils.fetch_media_type(@media_types, mediaType)
 +  end
 +
 +  defp open_content? do
 +    Pleroma.Config.get(
 +      [:frontend_configurations, :collapse_message_with_subjects],
 +      true
 +    )
 +  end
 +
 +  defp full_nickname(user) do
 +    %{host: host} = URI.parse(user.ap_id)
 +    "@" <> user.nickname <> "@" <> host
 +  end
 +
 +  defp status_title(%Activity{object: %Object{data: %{"name" => name}}}) when is_binary(name),
 +    do: name
 +
 +  defp status_title(%Activity{object: %Object{data: %{"summary" => summary}}})
 +       when is_binary(summary),
 +       do: summary
 +
 +  defp status_title(_), do: nil
 +
 +  defp activity_content(%Activity{object: %Object{data: %{"content" => content}}}) do
 +    content |> Pleroma.HTML.filter_tags() |> raw()
 +  end
 +
 +  defp activity_content(_), do: nil
 +
 +  defp activity_url(%User{local: true}, activity) do
 +    Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity)
 +  end
 +
 +  defp activity_url(%User{local: false}, %Activity{object: %Object{data: data}}) do
 +    data["url"] || data["external_url"] || data["id"]
 +  end
 +
 +  defp attachments(%Activity{object: %Object{data: %{"attachment" => attachments}}}) do
 +    attachments
 +  end
 +
 +  defp sensitive?(%Activity{object: %Object{data: %{"sensitive" => sensitive}}}) do
 +    sensitive
 +  end
 +
 +  defp published(%Activity{object: %Object{data: %{"published" => published}}}) do
 +    published
 +    |> NaiveDateTime.from_iso8601!()
 +    |> Strftime.strftime!("%B %d, %Y, %l:%M %p")
 +  end
 +end