X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=0b1bc473a7f1bdaa0a2e195b9c55d84e5fe3736f;hb=70024632ba32121bd63a439b2d708d4b4ff1a190;hp=7656d4d33bdefcb10c76690b7c972b2329743968;hpb=c48c381e909240dcece9f961e4728fa712d089cc;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 7656d4d33..0b1bc473a 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,7 +1,9 @@
 defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   alias Pleroma.{User, Activity, Repo, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
+  alias Pleroma.Web.OStatus
 
   import Ecto.Query
 
@@ -35,15 +37,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   def add_attachments(text, attachments) do
     attachment_text = Enum.map(attachments, fn
       (%{"url" => [%{"href" => href} | _]}) ->
-        "<a href='#{href}'>#{href}</a>"
+        "<a href='#{href}' class='attachment'>#{href}</a>"
       _ -> ""
     end)
     Enum.join([text | attachment_text], "<br>")
     end
 
-  def create_status(user = %User{}, data = %{"status" => status}) do
+  def create_status(%User{} = user, %{"status" => status} = data) do
     attachments = attachments_from_ids(data["media_ids"])
-    context = ActivityPub.generate_context_id
+    context = Utils.generate_context_id
     mentions = parse_mentions(status)
     content_html = status
     |> format_input(mentions)
@@ -122,8 +124,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
          statuses <- activities |> activities_to_statuses(%{for: user})
     do
       statuses
-    else e ->
-      IO.inspect(e)
+    else _e ->
       []
     end
   end
@@ -135,16 +136,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   def follow(%User{} = follower, params) do
-    with { :ok, %User{} = followed } <- get_user(params),
-         { :ok, follower } <- User.follow(follower, followed),
-         { :ok, activity } <- ActivityPub.insert(%{
-           "type" => "Follow",
-           "actor" => follower.ap_id,
-           "object" => followed.ap_id,
-           "published" => make_date()
-         })
+    with {:ok, %User{} = followed} <- get_user(params),
+         {:ok, follower} <- User.follow(follower, followed),
+         {:ok, activity} <- ActivityPub.follow(follower, followed)
     do
-      { :ok, follower, followed, activity }
+      {:ok, follower, followed, activity}
     else
       err -> err
     end
@@ -152,9 +148,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def unfollow(%User{} = follower, params) do
     with { :ok, %User{} = unfollowed } <- get_user(params),
-         { :ok, follower } <- User.unfollow(follower, unfollowed)
+         { :ok, follower, follow_activity } <- User.unfollow(follower, unfollowed),
+         { :ok, _activity } <- ActivityPub.insert(%{
+           "type" => "Undo",
+           "actor" => follower.ap_id,
+           "object" => follow_activity.data["id"], # get latest Follow for these users
+           "published" => make_date()
+         })
     do
-      { :ok, follower, unfollowed}
+      { :ok, follower, unfollowed }
     else
       err -> err
     end
@@ -242,7 +244,21 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   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)
+    mentions = mentions
+    |> Enum.sort_by(fn ({name, _}) -> -String.length(name) end)
+    |> Enum.map(fn({name, user}) -> {name, user, Ecto.UUID.generate} end)
+
+    # This replaces the mention with a unique reference first so it doesn't
+    # contain parts of other replaced mentions. There probably is a better
+    # solution for this...
+    step_one = mentions
+    |> Enum.reduce(text, fn ({match, _user, uuid}, text) ->
+      String.replace(text, match, uuid)
+    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>")
+    end)
   end
 
   def register_user(params) do
@@ -269,14 +285,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def get_user(user \\ nil, params) do
     case params do
-      %{ "user_id" => user_id } ->
+      %{"user_id" => user_id} ->
         case target = Repo.get(User, user_id) do
           nil ->
             {:error, "No user with such user_id"}
           _ ->
             {:ok, target}
         end
-      %{ "screen_name" => nickname } ->
+      %{"screen_name" => nickname} ->
         case target = Repo.get_by(User, nickname: nickname) do
           nil ->
             {:error, "No user with such screen_name"}
@@ -350,4 +366,12 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
       {:error, "No such conversation"}
     end
   end
+
+  def get_external_profile(for_user, uri) do
+    with {:ok, %User{} = user} <- OStatus.find_or_make_user(uri) do
+      {:ok, UserRepresenter.to_map(user, %{for: for_user})}
+    else _e ->
+        {:error, "Couldn't find user"}
+    end
+  end
 end