X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=7b11bc3edad2d731625ecb9cc9c470425e5b571f;hb=9a0163db53580182599a9358bd0197ee0c61779d;hp=2a5a2cc15fcfb53efe6f2d3f7a5e00060a1d21dd;hpb=a880e0a5278110031ad14bfd5c24e8054e878d9d;p=akkoma

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 2a5a2cc15..7b11bc3ed 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -1,11 +1,16 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.CommonAPI.Utils do
-  alias Pleroma.{Repo, Object, Formatter, Activity}
+  alias Calendar.Strftime
+  alias Comeonin.Pbkdf2
+  alias Pleroma.{Activity, Formatter, Object, Repo, HTML}
+  alias Pleroma.User
+  alias Pleroma.Web
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.Endpoint
   alias Pleroma.Web.MediaProxy
-  alias Pleroma.User
-  alias Calendar.Strftime
-  alias Comeonin.Pbkdf2
 
   # This is a hack for twidere.
   def get_by_id_or_ap_id(id) do
@@ -19,6 +24,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
       end
   end
 
+  def get_replied_to_activity(""), do: nil
+
   def get_replied_to_activity(id) when not is_nil(id) do
     Repo.get(Activity, id)
   end
@@ -32,21 +39,29 @@ defmodule Pleroma.Web.CommonAPI.Utils do
   end
 
   def to_for_user_and_mentions(user, mentions, inReplyTo, "public") do
-    to = ["https://www.w3.org/ns/activitystreams#Public"]
-
     mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end)
-    cc = [user.follower_address | mentioned_users]
+
+    to = ["https://www.w3.org/ns/activitystreams#Public" | mentioned_users]
+    cc = [user.follower_address]
 
     if inReplyTo do
-      {to, Enum.uniq([inReplyTo.data["actor"] | cc])}
+      {Enum.uniq([inReplyTo.data["actor"] | to]), cc}
     else
       {to, cc}
     end
   end
 
   def to_for_user_and_mentions(user, mentions, inReplyTo, "unlisted") do
-    {to, cc} = to_for_user_and_mentions(user, mentions, inReplyTo, "public")
-    {cc, to}
+    mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end)
+
+    to = [user.follower_address | mentioned_users]
+    cc = ["https://www.w3.org/ns/activitystreams#Public"]
+
+    if inReplyTo do
+      {Enum.uniq([inReplyTo.data["actor"] | to]), cc}
+    else
+      {to, cc}
+    end
   end
 
   def to_for_user_and_mentions(user, mentions, inReplyTo, "private") do
@@ -101,6 +116,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     Enum.join([text | attachment_text], "<br>")
   end
 
+  @doc """
+  Formatting text to plain text.
+  """
   def format_input(text, mentions, tags, "text/plain") do
     text
     |> Formatter.html_escape("text/plain")
@@ -112,7 +130,10 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> Formatter.finalize()
   end
 
-  def format_input(text, mentions, tags, "text/html") do
+  @doc """
+  Formatting text to html.
+  """
+  def format_input(text, mentions, _tags, "text/html") do
     text
     |> Formatter.html_escape("text/html")
     |> String.replace(~r/\r?\n/, "<br>")
@@ -121,8 +142,12 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> Formatter.finalize()
   end
 
+  @doc """
+  Formatting text to markdown.
+  """
   def format_input(text, mentions, tags, "text/markdown") do
     text
+    |> Formatter.mentions_escape(mentions)
     |> Earmark.as_html!()
     |> Formatter.html_escape("text/html")
     |> String.replace(~r/\r?\n/, "")
@@ -138,7 +163,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
       |> Enum.sort_by(fn {tag, _} -> -String.length(tag) end)
 
     Enum.reduce(tags, text, fn {full, tag}, text ->
-      url = "<a href='#{Pleroma.Web.base_url()}/tag/#{tag}' rel='tag'>##{tag}</a>"
+      url = "<a href='#{Web.base_url()}/tag/#{tag}' rel='tag'>##{tag}</a>"
       String.replace(text, full, url)
     end)
   end
@@ -226,7 +251,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     end
   end
 
-  def emoji_from_profile(%{info: info} = user) do
+  def emoji_from_profile(%{info: _info} = user) do
     (Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name))
     |> Enum.map(fn {shortcode, url} ->
       %{
@@ -236,4 +261,65 @@ defmodule Pleroma.Web.CommonAPI.Utils do
       }
     end)
   end
+
+  @doc """
+  Get sanitized HTML from cache, or scrub it and save to cache.
+  """
+  def get_scrubbed_html(
+        content,
+        scrubbers,
+        %{data: %{"object" => object}} = activity
+      ) do
+    scrubber_cache =
+      if object["scrubber_cache"] != nil and is_list(object["scrubber_cache"]) do
+        object["scrubber_cache"]
+      else
+        []
+      end
+
+    key = generate_scrubber_key(scrubbers)
+
+    {new_scrubber_cache, scrubbed_html} =
+      Enum.map_reduce(scrubber_cache, nil, fn %{
+                                                :scrubbers => current_key,
+                                                :content => current_content
+                                              },
+                                              _ ->
+        if Map.keys(current_key) == Map.keys(key) do
+          if scrubbers == key do
+            {current_key, current_content}
+          else
+            # Remove the entry if scrubber version is outdated
+            {nil, nil}
+          end
+        end
+      end)
+
+    new_scrubber_cache = Enum.reject(new_scrubber_cache, &is_nil/1)
+
+    if !(new_scrubber_cache == scrubber_cache) or scrubbed_html == nil do
+      scrubbed_html = HTML.filter_tags(content, scrubbers)
+      new_scrubber_cache = [%{:scrubbers => key, :content => scrubbed_html} | new_scrubber_cache]
+      IO.puts(activity)
+
+      activity =
+        Map.put(
+          activity,
+          :data,
+          Kernel.put_in(activity.data, ["object", "scrubber_cache"], new_scrubber_cache)
+        )
+
+      cng = Ecto.Changeset.change(activity)
+      Repo.update(cng)
+      scrubbed_html
+    else
+      scrubbed_html
+    end
+  end
+
+  defp generate_scrubber_key(scrubbers) do
+    Enum.reduce(scrubbers, %{}, fn scrubber, acc ->
+      Map.put(acc, to_string(scrubber), scrubber.version)
+    end)
+  end
 end