X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=e31a2cc7623b9ff2827fa6d220519fd2e291598c;hb=069daf644d984c479eae6483595a3307e923950b;hp=85fac914626b547a651b6bdb1922b0531f7505cc;hpb=09f7ed421497e12797f30ae34e0f2346f1b6a428;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 85fac9146..e31a2cc76 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,29 +1,27 @@
 defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   alias Pleroma.{User, Activity, Repo, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
-  alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
+  alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
+  alias Pleroma.Web.TwitterAPI.UserView
+  alias Pleroma.Web.OStatus
+  alias Pleroma.Formatter
 
-  import Ecto.Query
+  import Pleroma.Web.TwitterAPI.Utils
 
-  def to_for_user_and_mentions(user, mentions) do
+  @httpoison Application.get_env(:pleroma, :httpoison)
+
+  def to_for_user_and_mentions(user, mentions, inReplyTo) do
     default_to = [
       User.ap_followers(user),
       "https://www.w3.org/ns/activitystreams#Public"
     ]
 
-    default_to ++ Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
-  end
-
-  def format_input(text, mentions) do
-    HtmlSanitizeEx.strip_tags(text)
-    |> String.replace("\n", "<br>")
-    |> add_user_links(mentions)
-  end
-
-  def attachments_from_ids(ids) do
-    Enum.map(ids || [], fn (media_id) ->
-      Repo.get(Object, media_id).data
-    end)
+    to = default_to ++ Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
+    if inReplyTo do
+      Enum.uniq([inReplyTo.data["actor"] | to])
+    else
+      to
+    end
   end
 
   def get_replied_to_activity(id) when not is_nil(id) do
@@ -32,50 +30,17 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def get_replied_to_activity(_), do: nil
 
-  def create_status(user = %User{}, data = %{"status" => status}) do
-    attachments = attachments_from_ids(data["media_ids"])
-    context = ActivityPub.generate_context_id
-    mentions = parse_mentions(status)
-    content_html = format_input(status, mentions)
-    to = to_for_user_and_mentions(user, mentions)
-    date = make_date()
-
-    inReplyTo = get_replied_to_activity(data["in_reply_to_status_id"])
-
-    # Wire up reply info.
-    [to, context, object, additional] =
-      if inReplyTo do
-      context = inReplyTo.data["context"]
-      to = to ++ [inReplyTo.data["actor"]]
-
-      object = %{
-        "type" => "Note",
-        "to" => to,
-        "content" => content_html,
-        "published" => date,
-        "context" => context,
-        "attachment" => attachments,
-        "actor" => user.ap_id,
-        "inReplyTo" => inReplyTo.data["object"]["id"],
-        "inReplyToStatusId" => inReplyTo.id,
-      }
-      additional = %{}
-
-      [to, context, object, additional]
-      else
-      object = %{
-        "type" => "Note",
-        "to" => to,
-        "content" => content_html,
-        "published" => date,
-        "context" => context,
-        "attachment" => attachments,
-        "actor" => user.ap_id
-      }
-      [to, context, object, %{}]
+  def create_status(%User{} = user, %{"status" => status} = data) do
+    with attachments <- attachments_from_ids(data["media_ids"]),
+         mentions <- Formatter.parse_mentions(status),
+         inReplyTo <- get_replied_to_activity(data["in_reply_to_status_id"]),
+         to <- to_for_user_and_mentions(user, mentions, inReplyTo),
+         content_html <- make_content_html(status, mentions, attachments),
+         context <- make_context(inReplyTo),
+         tags <- Formatter.parse_tags(status),
+         object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags) do
+      ActivityPub.create(to, user, context, object)
     end
-
-    ActivityPub.create(to, user, context, object, additional, data)
   end
 
   def fetch_friend_statuses(user, opts \\ %{}) do
@@ -84,6 +49,12 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   def fetch_public_statuses(user, opts \\ %{}) do
+    opts = Map.put(opts, "local_only", true)
+    ActivityPub.fetch_public_activities(opts)
+    |> activities_to_statuses(%{for: user})
+  end
+
+  def fetch_public_and_external_statuses(user, opts \\ %{}) do
     ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
@@ -104,8 +75,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
@@ -117,16 +87,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
@@ -134,9 +99,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
@@ -212,21 +183,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end
   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, User.get_cached_by_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
-
   def register_user(params) do
     params = %{
       nickname: params["nickname"],
@@ -240,7 +196,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     changeset = User.register_changeset(%User{}, params)
 
     with {:ok, user} <- Repo.insert(changeset) do
-      {:ok, UserRepresenter.to_map(user)}
+      {:ok, user}
     else
       {:error, changeset} ->
         errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end)
@@ -249,16 +205,24 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end
   end
 
+  def get_by_id_or_nickname(id_or_nickname) do
+    if !is_integer(id_or_nickname) && :error == Integer.parse(id_or_nickname) do
+      Repo.get_by(User, nickname: id_or_nickname)
+    else
+      Repo.get(User, id_or_nickname)
+    end
+  end
+
   def get_user(user \\ nil, params) do
     case params do
-      %{ "user_id" => user_id } ->
-        case target = Repo.get(User, user_id) do
+      %{"user_id" => user_id} ->
+        case target = get_by_id_or_nickname(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"}
@@ -316,16 +280,13 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   def context_to_conversation_id(context) do
-    {:ok, id} = Repo.transaction(fn ->
-      with %Object{id: id} <- Object.get_by_ap_id(context) do
-        id
-      else _e ->
-        changeset = Object.context_mapping(context)
-        {:ok, %{id: id}} = Repo.insert(changeset)
-        id
-      end
-    end)
-    id
+    with %Object{id: id} <- Object.get_cached_by_ap_id(context) do
+      id
+    else _e ->
+      changeset = Object.context_mapping(context)
+      {:ok, %{id: id}} = Repo.insert(changeset)
+      id
+    end
   end
 
   def conversation_id_to_context(id) do
@@ -335,4 +296,16 @@ 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
+      with url <- user.info["topic"],
+           {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
+        OStatus.handle_incoming(body)
+      end
+      {:ok, UserView.render("show.json", %{user: user, for: for_user})}
+    else _e ->
+        {:error, "Couldn't find user"}
+    end
+  end
 end