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)
- 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
- |> String.replace("\n", "<br>")
+ |> String.replace("\n", "<br>\n")
|> add_user_links(mentions)
end
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
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,
- "actor" => actor
+ "actor" => actor,
+ "tag" => tags |> Enum.map(fn ({_, tag}) -> tag end)
}
if inReplyTo do