X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=142283684b4d176448edd7605c8bae7eb7b79b0f;hb=52ac7dce5c460d27d946d26070eb123e89af2914;hp=75c63e5f418bc79ed8938e59d94cc0c3e08b9a1e;hpb=94db9ac4dba6ba02fcae1b9055b532818cf787c7;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 75c63e5f4..142283684 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -1,44 +1,63 @@
defmodule Pleroma.Web.CommonAPI.Utils do
- alias Pleroma.{Repo, Object, Formatter, User, Activity}
- alias Pleroma.Web.ActivityPub.Utils
alias Calendar.Strftime
+ alias Comeonin.Pbkdf2
+ alias Pleroma.{Activity, Formatter, Object, Repo}
+ alias Pleroma.User
+ alias Pleroma.Web
+ alias Pleroma.Web.ActivityPub.Utils
+ alias Pleroma.Web.Endpoint
+ alias Pleroma.Web.MediaProxy
# 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
- Activity.get_create_activity_by_object_ap_id(activity.data["object"])
- end
+
+ activity &&
+ if activity.data["type"] == "Create" do
+ activity
+ else
+ Activity.get_create_activity_by_object_ap_id(activity.data["object"])
+ 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
+
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
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)
+
+ to = ["https://www.w3.org/ns/activitystreams#Public" | mentioned_users]
+ cc = [user.follower_address]
- 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])}
+ {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
@@ -46,8 +65,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
{[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)
+ 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
@@ -55,79 +75,117 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end
end
- def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do
+ def make_content_html(
+ status,
+ mentions,
+ attachments,
+ tags,
+ content_type,
+ no_attachment_links \\ false
+ ) do
status
- |> format_input(mentions, tags)
+ |> format_input(mentions, tags, content_type)
|> 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 = 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} | _]} = attachment ->
+ name = attachment["name"] || URI.decode(Path.basename(href))
+ href = MediaProxy.url(href)
+ "#{shortname(name)}"
+
+ _ ->
+ ""
+ end)
+
Enum.join([text | attachment_text], "
")
end
- def format_input(text, mentions, _tags) do
+ @doc """
+ Formatting text to plain text.
+ """
+ def format_input(text, mentions, tags, "text/plain") do
text
- |> Formatter.html_escape
- |> Formatter.linkify
- |> String.replace("\n", "
")
- |> add_user_links(mentions)
- # |> add_tag_links(tags)
+ |> Formatter.html_escape("text/plain")
+ |> String.replace(~r/\r?\n/, "
")
+ |> (&{[], &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)
-
- Enum.reduce(tags, text, fn({full, tag}, text) ->
- url = "##{tag}"
- String.replace(text, full, url)
- end)
+ @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/, "
")
+ |> (&{[], &1}).()
+ |> Formatter.add_user_links(mentions)
+ |> 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)
+ @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/, "")
+ |> (&{[], &1}).()
+ |> Formatter.add_user_links(mentions)
+ |> Formatter.add_hashtag_links(tags)
+ |> Formatter.finalize()
+ 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, 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) |> Enum.uniq()
+ }
if inReplyTo do
object
@@ -147,24 +205,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 -> ""
@@ -178,4 +237,24 @@ defmodule Pleroma.Web.CommonAPI.Utils do
String.slice(name, 0..30) <> "â¦"
end
end
+
+ def confirm_current_password(user, password) do
+ with %User{local: true} = db_user <- Repo.get(User, user.id),
+ true <- Pbkdf2.checkpw(password, db_user.password_hash) do
+ {:ok, db_user}
+ else
+ _ -> {:error, "Invalid password."}
+ end
+ end
+
+ def emoji_from_profile(%{info: _info} = user) do
+ (Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name))
+ |> Enum.map(fn {shortcode, url} ->
+ %{
+ "type" => "Emoji",
+ "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"},
+ "name" => ":#{shortcode}:"
+ }
+ end)
+ end
end