projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move finmojis to representation.
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
utils.ex
diff --git
a/lib/pleroma/web/twitter_api/utils.ex
b/lib/pleroma/web/twitter_api/utils.ex
index 6f5c9f72722afac75f77432026c449b89a456c6c..5cbe0cf9c96acb297a119b12bf9d95f2e25595be 100644
(file)
--- a/
lib/pleroma/web/twitter_api/utils.ex
+++ b/
lib/pleroma/web/twitter_api/utils.ex
@@
-11,16
+11,16
@@
defmodule Pleroma.Web.TwitterAPI.Utils do
def add_attachments(text, attachments) do
attachment_text = Enum.map(attachments, fn
(%{"url" => [%{"href" => href} | _]}) ->
def add_attachments(text, attachments) do
attachment_text = Enum.map(attachments, fn
(%{"url" => [%{"href" => href} | _]}) ->
- "<a href=
'#{href}' class='attachment'>#{href
}</a>"
+ "<a href=
\"#{URI.encode(href)}\" class='attachment'>#{Path.basename(href)
}</a>"
_ -> ""
end)
_ -> ""
end)
- Enum.join([text | attachment_text], "<br>")
+ Enum.join([text | attachment_text], "<br>
\n
")
end
def format_input(text, mentions) do
HtmlSanitizeEx.strip_tags(text)
|> Formatter.linkify
end
def format_input(text, mentions) do
HtmlSanitizeEx.strip_tags(text)
|> Formatter.linkify
- |> String.replace("\n", "<br>")
+ |> String.replace("\n", "<br>
\n
")
|> add_user_links(mentions)
end
|> add_user_links(mentions)
end
@@
-38,7
+38,8
@@
defmodule Pleroma.Web.TwitterAPI.Utils do
end)
Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
end)
Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
- String.replace(text, uuid, "<a href='#{ap_id}'>#{match}</a>")
+ short_match = String.split(match, "@") |> tl() |> hd()
+ String.replace(text, uuid, "<a href='#{ap_id}'>@#{short_match}</a>")
end)
end
end)
end
@@
-51,14
+52,16
@@
defmodule Pleroma.Web.TwitterAPI.Utils do
def make_context(%Activity{data: %{"context" => context}}), do: context
def make_context(_), do: Utils.generate_context_id
def make_context(%Activity{data: %{"context" => context}}), do: context
def make_context(_), do: Utils.generate_context_id
- def make_note_data(actor, to, context, content_html, attachments, inReplyTo) do
+ # TODO: Move this to a more fitting space
+ def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags) do
object = %{
"type" => "Note",
"to" => to,
"content" => content_html,
"context" => context,
"attachment" => attachments,
object = %{
"type" => "Note",
"to" => to,
"content" => content_html,
"context" => context,
"attachment" => attachments,
- "actor" => actor
+ "actor" => actor,
+ "tag" => tags |> Enum.map(fn ({_, tag}) -> tag end)
}
if inReplyTo do
}
if inReplyTo do