2 files changed, 50 insertions, 9 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 0cf20dc45..32c6a48e9 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -6,6 +6,14 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
   def to_map(%Activity{} = activity, %{user: user} = opts) do
     content = get_in(activity.data, ["object", "content"])
     published = get_in(activity.data, ["object", "published"])
+
+    mentions = opts[:mentioned] || []
+
+    attentions = activity.data["to"]
+    |> Enum.map(fn (ap_id) -> Enum.find(mentions, fn(user) -> ap_id == user.ap_id end) end)
+    |> Enum.filter(&(&1))
+    |> Enum.map(fn (user) -> UserRepresenter.to_map(user, opts) end)
+
     %{
       "id" => activity.id,
       "user" => UserRepresenter.to_map(user, opts),
@@ -17,7 +25,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
       "created_at" => published,
       "in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"],
       "statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"],
-      "attachments" => (activity.data["object"]["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts)
+      "attachments" => (activity.data["object"]["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts),
+      "attentions" => attentions
     }
   end
 end
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index c07c7cfbf..2aaa73b78 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -13,16 +13,28 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end)
 
     context = ActivityPub.generate_context_id
+
+    content = HtmlSanitizeEx.strip_tags(data["status"])
+
+    mentions = parse_mentions(content)
+
+    default_to = [
+      User.ap_followers(user),
+      "https://www.w3.org/ns/activitystreams#Public"
+    ]
+
+    to = default_to ++ Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
+
+    content_html = add_user_links(content, mentions)
+
     activity = %{
       "type" => "Create",
-      "to" => [
-        User.ap_followers(user),
-        "https://www.w3.org/ns/activitystreams#Public"
-      ],
-      "actor" => User.ap_id(user),
+      "to" => to,
+      "actor" => user.ap_id,
       "object" => %{
         "type" => "Note",
-        "content" => data["status"],
+        "to" => to,
+        "content" => content_html,
         "published" => date,
         "context" => context,
         "attachment" => attachments
@@ -36,7 +48,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
                     inReplyTo <- Repo.get(Activity, inReplyToId),
                     context <- inReplyTo.data["context"]
                do
+
+               to = activity["to"] ++ [inReplyTo.data["actor"]]
+
                activity
+               |> put_in(["to"], to)
                |> put_in(["context"], context)
                |> put_in(["object", "context"], context)
                |> put_in(["object", "inReplyTo"], inReplyTo.data["object"]["id"])
@@ -74,7 +90,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     do
       statuses
     else e ->
-        IO.inspect(e)
+      IO.inspect(e)
       []
     end
   end
@@ -122,6 +138,21 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     """
   end
 
+  def parse_mentions(text) do
+    # Modified from https://www.w3.org/TR/html5/forms.html#valid-e-mail-address
+    regex = ~r/@[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@?[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*/
+
+    Regex.scan(regex, text)
+    |> List.flatten
+    |> Enum.uniq
+    |> Enum.map(fn ("@" <> match = full_match) -> {full_match, Repo.get_by(User, nickname: match)} end)
+    |> Enum.filter(fn ({_match, user}) -> user end)
+  end
+
+  def add_user_links(text, mentions) do
+    Enum.reduce(mentions, text, fn ({match, %User{ap_id: ap_id}}, text) -> String.replace(text, match, "<a href='#{ap_id}'>#{match}</a>") end)
+  end
+
   defp add_conversation_id(activity) do
     if is_integer(activity.data["statusnetConversationId"]) do
       {:ok, activity}
@@ -144,6 +175,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   defp activity_to_status(activity, opts) do
     actor = get_in(activity.data, ["actor"])
     user = Repo.get_by!(User, ap_id: actor)
-    ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user}))
+    mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"])
+    ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, mentioned: mentioned_users}))
   end
 end