X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=b5b59eb4bea4415cf4797a2e66a4977875aa2b80;hb=6a184115a2431727b5039c1c726a8afc5eef228c;hp=649936b76dbe10f1ce50a1ecb26b0f777cf45228;hpb=6cf7c132282e612514af992c6dea0b03ee5b678d;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 649936b76..b5b59eb4b 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,110 +1,81 @@
 defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
-  alias Ecto.Changeset
   alias Pleroma.{User, Activity, Repo, Object}
-  alias Pleroma.Web.{ActivityPub.ActivityPub, Websub, OStatus}
-  alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  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 create_status(%User{} = user, %{} = data) do
-    attachments = Enum.map(data["media_ids"] || [], fn (media_id) ->
-      Repo.get(Object, media_id).data
-    end)
-
-    context = ActivityPub.generate_context_id
-
-    content = data["status"] |> HtmlSanitizeEx.strip_tags |> String.replace("\n", "<br>")
-
-    mentions = parse_mentions(content)
+  @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"
     ]
 
     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
 
-    content_html = add_user_links(content, mentions)
-
-    date = make_date()
-
-    activity = %{
-      "type" => "Create",
-      "to" => to,
-      "actor" => user.ap_id,
-      "object" => %{
-        "type" => "Note",
-        "to" => to,
-        "content" => content_html,
-        "published" => date,
-        "context" => context,
-        "attachment" => attachments,
-        "actor" => user.ap_id
-     },
-      "published" => date,
-      "context" => context
-   }
-
-    # Wire up reply info.
-    activity = with inReplyToId when not is_nil(inReplyToId) <- data["in_reply_to_status_id"],
-                    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"])
-               |> put_in(["object", "inReplyToStatusId"], inReplyToId)
-               |> put_in(["statusnetConversationId"], inReplyTo.data["statusnetConversationId"])
-               |> put_in(["object", "statusnetConversationId"], inReplyTo.data["statusnetConversationId"])
-               else _e ->
-                 activity
-               end
-
-    with {:ok, activity} <- ActivityPub.insert(activity) do
-      {:ok, activity} = add_conversation_id(activity)
-      Websub.publish(OStatus.feed_path(user), user, activity)
-      {:ok, activity}
+  def get_replied_to_activity(id) when not is_nil(id) do
+    Repo.get(Activity, id)
+  end
+
+  def get_replied_to_activity(_), do: nil
+
+  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
   end
 
   def fetch_friend_statuses(user, opts \\ %{}) do
-    activities = ActivityPub.fetch_activities([user.ap_id | user.following], opts)
-    activities_to_statuses(activities, %{for: user})
+    ActivityPub.fetch_activities([user.ap_id | user.following], opts)
+    |> activities_to_statuses(%{for: user})
   end
 
   def fetch_public_statuses(user, opts \\ %{}) do
-    activities = ActivityPub.fetch_public_activities(opts)
-    activities_to_statuses(activities, %{for: user})
+    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
 
   def fetch_user_statuses(user, opts \\ %{}) do
-    activities = ActivityPub.fetch_activities([], opts)
-    activities_to_statuses(activities, %{for: user})
+    ActivityPub.fetch_activities([], opts)
+    |> activities_to_statuses(%{for: user})
   end
 
   def fetch_mentions(user, opts \\ %{}) do
-    activities = ActivityPub.fetch_activities([user.ap_id], opts)
-    activities_to_statuses(activities, %{for: user})
+    ActivityPub.fetch_activities([user.ap_id], opts)
+    |> activities_to_statuses(%{for: user})
   end
 
   def fetch_conversation(user, id) do
-    query = from activity in Activity,
-      where: fragment("? @> ?", activity.data, ^%{statusnetConversationId: id}),
-      limit: 1
-
-    with %Activity{} = activity <- Repo.one(query),
-         context <- activity.data["context"],
+    with context when is_binary(context) <- conversation_id_to_context(id),
          activities <- ActivityPub.fetch_activities_for_context(context),
          statuses <- activities |> activities_to_statuses(%{for: user})
     do
       statuses
-    else e ->
-      IO.inspect(e)
+    else _e ->
       []
     end
   end
@@ -118,12 +89,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   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()
-        })
+         {:ok, activity} <- ActivityPub.follow(follower, followed)
     do
       {:ok, follower, followed, activity}
     else
@@ -132,10 +98,16 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   def unfollow(%User{} = follower, params) do
-    with {:ok, %User{} = unfollowed} <- get_user(params),
-         {:ok, follower} <- User.unfollow(follower, unfollowed)
+    with { :ok, %User{} = unfollowed } <- get_user(params),
+         { :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
@@ -207,43 +179,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
           media_id_string: "#{object.id}}",
           media_url: href,
           size: 0
-       } |> Poison.encode!
-    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
-    |> Regex.scan(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
-
-  defp add_conversation_id(activity) do
-    if is_integer(activity.data["statusnetConversationId"]) do
-      {:ok, activity}
-    else
-      data = activity.data
-      |> put_in(["object", "statusnetConversationId"], activity.id)
-      |> put_in(["statusnetConversationId"], activity.id)
-
-      object = Object.get_by_ap_id(activity.data["object"]["id"])
-
-      changeset = Changeset.change(object, data: data["object"])
-      Repo.update(changeset)
-
-      changeset = Changeset.change(activity, data: data)
-      Repo.update(changeset)
+        } |> Poison.encode!
     end
   end
 
@@ -255,23 +191,32 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
       email: params["email"],
       password: params["password"],
       password_confirmation: params["confirm"]
-   }
+    }
 
     changeset = User.register_changeset(%User{}, params)
 
     with {:ok, user} <- Repo.insert(changeset) do
-      {:ok, UserRepresenter.to_map(user)}
+      {:ok, user}
     else
       {:error, changeset} ->
-        errors = Poison.encode!(Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end))
-        {:error, %{error: errors}}
+        errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end)
+      |> Poison.encode!
+      {:error, %{error: errors}}
+    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
+        case target = get_by_id_or_nickname(user_id) do
           nil ->
             {:error, "No user with such user_id"}
           _ ->
@@ -305,8 +250,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     user = User.get_cached_by_ap_id(actor)
     [liked_activity] = Activity.all_by_object_ap_id(activity.data["object"])
 
-    ActivityRepresenter.to_map(activity,
-      Map.merge(opts, %{user: user, liked_activity: liked_activity}))
+    ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, liked_activity: liked_activity}))
   end
 
   # For announces, fetch the announced activity and the user.
@@ -316,8 +260,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     [announced_activity] = Activity.all_by_object_ap_id(activity.data["object"])
     announced_actor = User.get_cached_by_ap_id(announced_activity.data["actor"])
 
-    ActivityRepresenter.to_map(activity,
-      Map.merge(opts, %{users: [user, announced_actor], announced_activity: announced_activity}))
+    ActivityRepresenter.to_map(activity, Map.merge(opts, %{users: [user, announced_actor], announced_activity: announced_activity}))
   end
 
   defp activity_to_status(activity, opts) do
@@ -327,7 +270,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) ->
       User.get_cached_by_ap_id(ap_id)
     end)
-    mentioned_users = mentioned_users |> Enum.filter(&(&1))
+    |> Enum.filter(&(&1))
 
     ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, mentioned: mentioned_users}))
   end
@@ -335,4 +278,38 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   defp make_date do
     DateTime.utc_now() |> DateTime.to_iso8601
   end
+
+  def context_to_conversation_id(context) do
+    with %Object{id: id} <- Object.get_cached_by_ap_id(context) do
+      id
+      else _e ->
+        changeset = Object.context_mapping(context)
+        case Repo.insert(changeset) do
+          {:ok, %{id: id}} -> id
+          # This should be solved by an upsert, but it seems ecto
+          # has problems accessing the constraint inside the jsonb.
+          {:error, _} -> Object.get_cached_by_ap_id(context).id
+        end
+    end
+  end
+
+  def conversation_id_to_context(id) do
+    with %Object{data: %{"id" => context}} <- Repo.get(Object, id) do
+      context
+    else _e ->
+      {: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