X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=3c092d524101867e916c4734266caa22c9f820fc;hb=e4da81d6629e138d5e1519c081d44a9ed0481ac7;hp=75c63e5f418bc79ed8938e59d94cc0c3e08b9a1e;hpb=c974f6544f6315a49e51632c862f1e66b750ffff;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 75c63e5f4..3c092d524 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
# This is a hack for twidere.
def get_by_id_or_ap_id(id) do
activity = Repo.get(Activity, id) || Activity.get_create_activity_by_object_ap_id(id)
+
if activity.data["type"] == "Create" do
activity
else
@@ -16,10 +17,11 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def get_replied_to_activity(id) when not is_nil(id) do
Repo.get(Activity, id)
end
+
def get_replied_to_activity(_), do: nil
def attachments_from_ids(ids) do
- Enum.map(ids || [], fn (media_id) ->
+ Enum.map(ids || [], fn media_id ->
Repo.get(Object, media_id).data
end)
end
@@ -27,8 +29,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
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)
+ mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end)
cc = [user.follower_address | mentioned_users]
+
if inReplyTo do
{to, Enum.uniq([inReplyTo.data["actor"] | cc])}
else
@@ -47,7 +50,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
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)
+ mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end)
+
if inReplyTo do
{Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
else
@@ -57,77 +61,78 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do
status
+ |> String.replace("\r", "")
|> 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 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} | _]}) ->
- name = URI.decode(Path.basename(href))
- "#{shortname(name)}"
- _ -> ""
- end)
+ attachment_text =
+ Enum.map(attachments, fn
+ %{"url" => [%{"href" => href} | _]} ->
+ name = URI.decode(Path.basename(href))
+ "#{shortname(name)}"
+
+ _ ->
+ ""
+ end)
+
Enum.join([text | attachment_text], "
")
end
- def format_input(text, mentions, _tags) do
+ def format_input(text, mentions, tags) do
text
- |> Formatter.html_escape
- |> Formatter.linkify
+ |> Formatter.html_escape()
|> String.replace("\n", "
")
- |> 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
- tags = tags
- |> Enum.sort_by(fn ({tag, _}) -> -String.length(tag) end)
+ tags =
+ tags
+ |> Enum.sort_by(fn {tag, _} -> -String.length(tag) end)
- Enum.reduce(tags, text, fn({full, tag}, text) ->
- url = "##{tag}"
+ Enum.reduce(tags, text, fn {full, tag}, text ->
+ url = "##{tag}"
String.replace(text, full, url)
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, "@#{short_match}")
- end)
- end
-
- 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,
- "tag" => tags |> Enum.map(fn ({_, tag}) -> tag end)
- }
+ 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,
+ "tag" => tags |> Enum.map(fn {_, tag} -> tag end)
+ }
if inReplyTo do
object
@@ -147,24 +152,25 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end
def date_to_asctime(date) do
- with {:ok, date, _offset} <- date |> DateTime.from_iso8601 do
+ with {:ok, date, _offset} <- date |> DateTime.from_iso8601() do
format_asctime(date)
- else _e ->
+ else
+ _e ->
""
end
end
def to_masto_date(%NaiveDateTime{} = date) do
date
- |> NaiveDateTime.to_iso8601
+ |> 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
+ |> NaiveDateTime.from_iso8601!()
+ |> NaiveDateTime.to_iso8601()
|> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
rescue
_e -> ""