X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=2b359dd7256a27e5a80c7bb32331d6054aa9facf;hb=35ac549a99f325d2e73c03d7c2951f3d6570b7b4;hp=0d8b39d70022548f1dae5e768b0265397deb38e2;hpb=50409326a853db7bd9f538f0ddbec805c134920f;p=akkoma

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 0d8b39d70..2b359dd72 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -38,15 +38,19 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     end
   end
 
-  def make_content_html(status, mentions, attachments) do
+  def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do
     status
-    |> format_input(mentions)
-    |> add_attachments(attachments)
+    |> format_input(mentions, tags)
+    |> maybe_add_attachments(attachments, no_attachment_links)
   end
 
   def make_context(%Activity{data: %{"context" => context}}), do: context
   def make_context(_), do: Utils.generate_context_id
 
+  def maybe_add_attachments(text, attachments, _no_links = true), do: text
+  def maybe_add_attachments(text, attachments, _no_links) do
+    add_attachments(text, attachments)
+  end
   def add_attachments(text, attachments) do
     attachment_text = Enum.map(attachments, fn
       (%{"url" => [%{"href" => href} | _]}) ->
@@ -54,14 +58,26 @@ defmodule Pleroma.Web.CommonAPI.Utils do
         "<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>"
       _ -> ""
     end)
-    Enum.join([text | attachment_text], "<br>\n")
+    Enum.join([text | attachment_text], "<br>")
   end
 
-  def format_input(text, mentions) do
-    HtmlSanitizeEx.strip_tags(text)
+  def format_input(text, mentions, _tags) do
+    text
+    |> Formatter.html_escape
     |> Formatter.linkify
-    |> String.replace("\n", "<br>\n")
+    |> String.replace("\n", "<br>")
     |> add_user_links(mentions)
+    # |> add_tag_links(tags)
+  end
+
+  def add_tag_links(text, tags) do
+    tags = tags
+    |> 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>"
+      String.replace(text, full, url)
+    end)
   end
 
   def add_user_links(text, mentions) do
@@ -79,15 +95,16 @@ defmodule Pleroma.Web.CommonAPI.Utils do
 
     Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
       short_match = String.split(match, "@") |> tl() |> hd()
-      String.replace(text, uuid, "<a href='#{ap_id}'>@#{short_match}</a>")
+      String.replace(text, uuid, "<span><a href='#{ap_id}'>@<span>#{short_match}</span></a></span>")
     end)
   end
 
-  def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags) do
+  def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil) do
       object = %{
         "type" => "Note",
         "to" => to,
         "content" => content_html,
+        "summary" => cw,
         "context" => context,
         "attachment" => attachments,
         "actor" => actor,
@@ -119,6 +136,23 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     end
   end
 
+  def to_masto_date(%NaiveDateTime{} = date) do
+    date
+    |> NaiveDateTime.to_iso8601
+    |> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
+  end
+
+  def to_masto_date(date) do
+    try do
+      date
+      |> NaiveDateTime.from_iso8601!
+      |> NaiveDateTime.to_iso8601
+      |> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
+    rescue
+      _e -> ""
+    end
+  end
+
   defp shortname(name) do
     if String.length(name) < 30 do
       name