X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=932bef5efa7a5127d14cc96bdbadb7550b7346a8;hb=8f43992121a726df2faaf04bf918f32f708d10f8;hp=0624e73aa0cd19bf860bda2268cb30eb9a6467ba;hpb=4a6d48b0fe991b68b555c75faca095725aff487b;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 0624e73aa..932bef5ef 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,28 +1,43 @@
 defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
-  alias Pleroma.{User, Activity, Repo}
+  alias Pleroma.{User, Activity, Repo, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
 
   import Ecto.Query
 
   def create_status(user = %User{}, data = %{}) do
-    date = DateTime.utc_now() |> DateTime.to_iso8601
+    attachments = Enum.map(data["media_ids"] || [], fn (media_id) ->
+      Repo.get(Object, media_id).data
+    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"],
-        "published" => date,
-        "context" => context
+        "to" => to,
+        "content" => content_html,
+        "published" => make_date,
+        "context" => context,
+        "attachment" => attachments
       },
-      "published" => date,
+      "published" => make_date,
       "context" => context
     }
 
@@ -31,7 +46,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"])
@@ -69,7 +88,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     do
       statuses
     else e ->
-        IO.inspect(e)
+      IO.inspect(e)
       []
     end
   end
@@ -82,9 +101,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def follow(%User{} = follower, followed_id) do
     with %User{} = followed <- Repo.get(User, followed_id),
-         { :ok, follower } <- User.follow(follower, followed)
+         { :ok, follower } <- User.follow(follower, followed),
+         { :ok, activity } <- ActivityPub.insert(%{
+           "type" => "Follow",
+           "actor" => follower.ap_id,
+           "object" => followed.ap_id,
+           "published" => make_date
+         })
     do
-      { :ok, follower, followed }
+      { :ok, follower, followed, activity }
     end
   end
 
@@ -117,6 +142,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}
@@ -139,6 +179,11 @@ 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
+
+  defp make_date do
+    DateTime.utc_now() |> DateTime.to_iso8601
   end
 end