X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=3c09f0cc756753914806e170332913784e37333a;hb=d1ee3edd3cf8262520421fda551e931d6a8e5733;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..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) 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)
- |> 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,40 +75,37 @@ defmodule Pleroma.Web.CommonAPI.Utils do
"#{shortname(name)}"
_ -> ""
end)
- Enum.join([text | attachment_text], "
\n")
+ Enum.join([text | attachment_text], "
")
end
- def format_input(text, mentions) do
- HtmlSanitizeEx.strip_tags(text)
- |> Formatter.linkify
- |> String.replace("\n", "
\n")
- |> add_user_links(mentions)
+ def format_input(text, mentions, tags) do
+ text
+ |> Formatter.html_escape
+ |> String.replace("\n", "
")
+ |> (&({[], &1})).()
+ |> Formatter.add_links
+ |> Formatter.add_user_links(mentions)
+ |> Formatter.add_hashtag_links(tags)
+ |> Formatter.finalize
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)
+ def add_tag_links(text, tags) do
+ tags = tags
+ |> Enum.sort_by(fn ({tag, _}) -> -String.length(tag) 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, "@#{short_match}")
+ Enum.reduce(tags, text, fn({full, tag}, text) ->
+ url = "##{tag}"
+ String.replace(text, full, url)
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, cc \\ []) do
object = %{
"type" => "Note",
"to" => to,
+ "cc" => cc,
"content" => content_html,
+ "summary" => cw,
"context" => context,
"attachment" => attachments,
"actor" => actor,
@@ -119,6 +137,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