X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=61b11681a08589744c4d278d9e49bf82e13b55e5;hb=c7be7a94544ef2dda687feea4d5c19ac06fc1d0e;hp=e6f5fc90645807c61cc9a2b903a167ebb6120c5e;hpb=3cb518270ab8c41f73ed449f0c12127c3625c6ca;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index e6f5fc906..61b11681a 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,95 +1,50 @@
 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, CommonAPI}
   import Ecto.Query
 
-  def to_for_user_and_mentions(user, mentions) 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
+  @httpoison Application.get_env(:pleroma, :httpoison)
 
-  def format_input(text, mentions) do
-    HtmlSanitizeEx.strip_tags(text)
-    |> String.replace("\n", "<br>")
-    |> add_user_links(mentions)
+  def create_status(%User{} = user, %{"status" => _} = data) do
+    CommonAPI.post(user, data)
   end
 
-  def attachments_from_ids(ids) do
-    Enum.map(ids || [], fn (media_id) ->
-      Repo.get(Object, media_id).data
-    end)
-  end
+  def fetch_friend_statuses(user, opts \\ %{}) do
+    opts = opts
+    |> Map.put("blocking_user", user)
+    |> Map.put("user", user)
+    |> Map.put("type", ["Create", "Announce", "Follow", "Like"])
 
-  def get_replied_to_activity(id) when not is_nil(id) do
-    Repo.get(Activity, id)
+    ActivityPub.fetch_activities([user.ap_id | user.following], opts)
+    |> activities_to_statuses(%{for: user})
   end
 
-  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, %{}]
-    end
-
-    ActivityPub.create(to, user, context, object, additional, data)
-  end
+  def fetch_public_statuses(user, opts \\ %{}) do
+    opts = opts
+    |> Map.put("local_only", true)
+    |> Map.put("blocking_user", user)
+    |> Map.put("type", ["Create", "Announce", "Follow"])
 
-  def fetch_friend_statuses(user, opts \\ %{}) do
-    ActivityPub.fetch_activities([user.ap_id | user.following], opts)
+    ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
 
-  def fetch_public_statuses(user, opts \\ %{}) do
+  def fetch_public_and_external_statuses(user, opts \\ %{}) do
+    opts = opts
+    |> Map.put("blocking_user", user)
+    |> Map.put("type", ["Create", "Announce", "Follow"])
+
     ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
 
   def fetch_user_statuses(user, opts \\ %{}) do
-    ActivityPub.fetch_activities([], opts)
+    opts = opts
+    |> Map.put("type", ["Create"])
+    ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
 
@@ -100,33 +55,28 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def fetch_conversation(user, id) do
     with context when is_binary(context) <- conversation_id_to_context(id),
-         activities <- ActivityPub.fetch_activities_for_context(context),
+         activities <- ActivityPub.fetch_activities_for_context(context, %{"blocking_user" => user, "user" => user}),
          statuses <- activities |> activities_to_statuses(%{for: user})
     do
       statuses
-    else e ->
-      IO.inspect(e)
+    else _e ->
       []
     end
   end
 
   def fetch_status(user, id) do
-    with %Activity{} = activity <- Repo.get(Activity, id) do
+    with %Activity{} = activity <- Repo.get(Activity, id),
+         true <- ActivityPub.visible_for_user?(activity, user) do
       activity_to_status(activity, %{for: user})
     end
   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,51 +84,62 @@ 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
   end
 
-  def favorite(%User{} = user, %Activity{data: %{"object" => object}} = activity) do
-    object = Object.get_by_ap_id(object["id"])
-
-    {:ok, _like_activity, object} = ActivityPub.like(user, object)
-    new_data = activity.data
-    |> Map.put("object", object.data)
-
-    status = %{activity | data: new_data}
-    |> activity_to_status(%{for: user})
-
-    {:ok, status}
+  def block(%User{} = blocker, params) do
+    with {:ok, %User{} = blocked} <- get_user(params),
+         {:ok, blocker} <- User.block(blocker, blocked)
+    do
+      {:ok, blocker, blocked}
+    else
+      err -> err
+    end
   end
 
-  def unfavorite(%User{} = user, %Activity{data: %{"object" => object}} = activity) do
-    object = Object.get_by_ap_id(object["id"])
-
-    {:ok, object} = ActivityPub.unlike(user, object)
-    new_data = activity.data
-    |> Map.put("object", object.data)
-
-    status = %{activity | data: new_data}
-    |> activity_to_status(%{for: user})
-
-    {:ok, status}
+  def unblock(%User{} = blocker, params) do
+    with {:ok, %User{} = blocked} <- get_user(params),
+         {:ok, blocker} <- User.unblock(blocker, blocked)
+    do
+      {:ok, blocker, blocked}
+    else
+      err -> err
+    end
   end
 
-  def retweet(%User{} = user, %Activity{data: %{"object" => object}} = activity) do
-    object = Object.get_by_ap_id(object["id"])
-
-    {:ok, _announce_activity, object} = ActivityPub.announce(user, object)
-    new_data = activity.data
-    |> Map.put("object", object.data)
+  def repeat(%User{} = user, ap_id_or_id) do
+    with {:ok, _announce, %{data: %{"id" => id}}} = CommonAPI.repeat(ap_id_or_id, user),
+         %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
+         status <- activity_to_status(activity, %{for: user}) do
+      {:ok, status}
+    end
+  end
 
-    status = %{activity | data: new_data}
-    |> activity_to_status(%{for: user})
+  def fav(%User{} = user, ap_id_or_id) do
+    with {:ok, _announce, %{data: %{"id" => id}}} = CommonAPI.favorite(ap_id_or_id, user),
+         %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
+         status <- activity_to_status(activity, %{for: user}) do
+      {:ok, status}
+    end
+  end
 
-    {:ok, status}
+  def unfav(%User{} = user, ap_id_or_id) do
+    with {:ok, %{data: %{"id" => id}}} = CommonAPI.unfavorite(ap_id_or_id, user),
+         %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
+         status <- activity_to_status(activity, %{for: user}) do
+      {:ok, status}
+    end
   end
 
   def upload(%Plug.Upload{} = file, format \\ "xml") do
@@ -212,21 +173,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 +186,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 +195,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"}
@@ -274,6 +228,32 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end
   end
 
+  defp parse_int(string, default)
+  defp parse_int(string, default) when is_binary(string) do
+    with {n, _} <- Integer.parse(string) do
+      n
+    else
+      _e -> default
+    end
+  end
+  defp parse_int(_, default), do: default
+
+  def search(user, %{"q" => query} = params) do
+    limit = parse_int(params["rpp"], 20)
+    page = parse_int(params["page"], 1)
+    offset = (page - 1) * limit
+
+    q = from a in Activity,
+      where: fragment("?->>'type' = 'Create'", a.data),
+      where: fragment("to_tsvector('english', ?->'object'->>'content') @@ plainto_tsquery('english', ?)", a.data, ^query),
+      limit: ^limit,
+      offset: ^offset,
+      order_by: [desc: :inserted_at] # this one isn't indexed so psql won't take the wrong index.
+
+    activities = Repo.all(q)
+    activities_to_statuses(activities, %{for: user})
+  end
+
   defp activities_to_statuses(activities, opts) do
     Enum.map(activities, fn(activity) ->
       activity_to_status(activity, opts)
@@ -299,12 +279,22 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     ActivityRepresenter.to_map(activity, Map.merge(opts, %{users: [user, announced_actor], announced_activity: announced_activity}))
   end
 
+  defp activity_to_status(%Activity{data: %{"type" => "Delete"}} = activity, opts) do
+    actor = get_in(activity.data, ["actor"])
+    user = User.get_cached_by_ap_id(actor)
+    ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user}))
+  end
+
   defp activity_to_status(activity, opts) do
     actor = get_in(activity.data, ["actor"])
     user = User.get_cached_by_ap_id(actor)
     # mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"])
-    mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) ->
-      User.get_cached_by_ap_id(ap_id)
+    mentioned_users = Enum.map(activity.recipients || [], fn (ap_id) ->
+      if ap_id do
+        User.get_cached_by_ap_id(ap_id)
+      else
+        nil
+      end
     end)
     |> Enum.filter(&(&1))
 
@@ -318,10 +308,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   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)
-      {:ok, %{id: id}} = Repo.insert(changeset)
-      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
 
@@ -332,4 +326,19 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
       {:error, "No such conversation"}
     end
   end
+
+  def get_external_profile(for_user, uri) do
+    IO.inspect(uri)
+    with %User{} = user <- User.get_or_fetch_by_nickname(uri) do
+      spawn(fn ->
+        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
+      end)
+      {:ok, UserView.render("show.json", %{user: user, for: for_user})}
+    else _e ->
+        {:error, "Couldn't find user"}
+    end
+  end
 end