X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=3c09f0cc756753914806e170332913784e37333a;hb=d1ee3edd3cf8262520421fda551e931d6a8e5733;hp=1a23b1ad2abb9855ecccadf4c9978827cd552ead;hpb=a6f65083aeed755d31134144b973d87575ae549e;p=akkoma

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 1a23b1ad2..3c09f0cc7 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -24,29 +24,50 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     end)
   end
 
-  def to_for_user_and_mentions(user, mentions, inReplyTo) do
-    default_to = [
-      user.follower_address,
-      "https://www.w3.org/ns/activitystreams#Public"
-    ]
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "public") do
+    to = ["https://www.w3.org/ns/activitystreams#Public"]
 
-    to = default_to ++ Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
+    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
+    cc = [user.follower_address | mentioned_users]
     if inReplyTo do
-      Enum.uniq([inReplyTo.data["actor"] | to])
+      {to, Enum.uniq([inReplyTo.data["actor"] | cc])}
     else
-      to
+      {to, cc}
     end
   end
 
-  def make_content_html(status, mentions, attachments, tags) do
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "unlisted") do
+    {to, cc} = to_for_user_and_mentions(user, mentions, inReplyTo, "public")
+    {cc, to}
+  end
+
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "private") do
+    {to, cc} = to_for_user_and_mentions(user, mentions, inReplyTo, "direct")
+    {[user.follower_address | to], cc}
+  end
+
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
+    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
+    if inReplyTo do
+      {Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
+    else
+      {mentioned_users, []}
+    end
+  end
+
+  def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do
     status
     |> format_input(mentions, tags)
-    |> add_attachments(attachments)
+    |> 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} | _]}) ->
@@ -57,13 +78,15 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     Enum.join([text | attachment_text], "<br>")
   end
 
-  def format_input(text, mentions, _tags) do
-    Phoenix.HTML.html_escape(text)
-    |> elem(1)
-    |> Formatter.linkify
+  def format_input(text, mentions, tags) do
+    text
+    |> Formatter.html_escape
     |> String.replace("\n", "<br>")
-    |> add_user_links(mentions)
-    # |> add_tag_links(tags)
+    |> (&({[], &1})).()
+    |> Formatter.add_links
+    |> Formatter.add_user_links(mentions)
+    |> Formatter.add_hashtag_links(tags)
+    |> Formatter.finalize
   end
 
   def add_tag_links(text, tags) do
@@ -76,29 +99,11 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     end)
   end
 
-  def add_user_links(text, mentions) do
-    mentions = mentions
-    |> Enum.sort_by(fn ({name, _}) -> -String.length(name) end)
-    |> Enum.map(fn({name, user}) -> {name, user, Ecto.UUID.generate} end)
-
-    # This replaces the mention with a unique reference first so it doesn't
-    # contain parts of other replaced mentions. There probably is a better
-    # solution for this...
-    step_one = mentions
-    |> Enum.reduce(text, fn ({match, _user, uuid}, text) ->
-      String.replace(text, match, uuid)
-    end)
-
-    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>")
-    end)
-  end
-
-  def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil) do
+  def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil, cc \\ []) do
       object = %{
         "type" => "Note",
         "to" => to,
+        "cc" => cc,
         "content" => content_html,
         "summary" => cw,
         "context" => context,