Merge branch 'oauth2' into 'develop'

[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 b7078b9c6456acbfe5182a2f63ebc9418b23281b..0555880310f851e21d8a278ddb1d6dd8310e41bc 100644 (file)
--- a/lib/pleroma/web/twitter_api/utils.ex
+++ b/lib/pleroma/web/twitter_api/utils.ex
@@ -1,6 +1,7 @@
 defmodule Pleroma.Web.TwitterAPI.Utils do
   alias Pleroma.{Repo, Object, Formatter, User, Activity}
   alias Pleroma.Web.ActivityPub.Utils
+  alias Calendar.Strftime
 
   def attachments_from_ids(ids) do
     Enum.map(ids || [], fn (media_id) ->
@@ -8,19 +9,28 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
     end)
   end
 
+  defp shortname(name) do
+    if String.length(name) < 30 do
+      name
+    else
+      String.slice(name, 0..30) <> "…"
+    end
+  end
+
   def add_attachments(text, attachments) do
     attachment_text = Enum.map(attachments, fn
       (%{"url" => [%{"href" => href} | _]}) ->
-        "<a href='#{href}' class='attachment'>#{Path.basename(href)}</a>"
+        name = URI.decode(Path.basename(href))
+        "<a href=\"#{href}\" class='attachment'>#{shortname(name)}</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
 
@@ -38,7 +48,8 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
     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
 
@@ -51,6 +62,7 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
   def make_context(%Activity{data: %{"context" => context}}), do: context
   def make_context(_), do: Utils.generate_context_id
 
+  # TODO: Move this to a more fitting space
   def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags) do
       object = %{
         "type" => "Note",
@@ -70,4 +82,20 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
       object
     end
   end
+
+  def format_naive_asctime(date) do
+    date |> DateTime.from_naive!("Etc/UTC") |> format_asctime
+  end
+
+  def format_asctime(date) do
+    Strftime.strftime!(date, "%a %b %d %H:%M:%S %z %Y")
+  end
+
+  def date_to_asctime(date) do
+    with {:ok, date, _offset} <- date |> DateTime.from_iso8601 do
+      format_asctime(date)
+    else _e ->
+        ""
+    end
+  end
 end