X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=c1a3c887c7a6d4502a8520cece9a3a440126c3de;hb=f039c9c19a95e414a641c5209e11b946d939dcfc;hp=8e2cd98ca8c19e4d1b08c9e2defb032f4c956983;hpb=a9b2ad17596d1b6deca646239a95e94dc644ebf3;p=akkoma diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 8e2cd98ca..c1a3c887c 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -1,75 +1,16 @@ 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} + alias Pleroma.Formatter import Ecto.Query - 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 = HtmlSanitizeEx.strip_tags(data["status"]) - |> String.replace("\n", "
") - - 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) - - date = make_date() + @httpoison Application.get_env(:pleroma, :httpoison) - 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) - Pleroma.Web.Websub.publish(Pleroma.Web.OStatus.feed_path(user), user, activity) - {:ok, activity} - end + def create_status(%User{} = user, %{"status" => status} = data) do + CommonAPI.post(user, data) end def fetch_friend_statuses(user, opts \\ %{}) do @@ -78,6 +19,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 @@ -93,18 +40,12 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do 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 @@ -116,28 +57,23 @@ 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 end -def unfollow(%User{} = follower, params) do + def unfollow(%User{} = follower, params) do 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, # get latest Follow for these users + "object" => follow_activity.data["id"], # get latest Follow for these users "published" => make_date() }) do @@ -147,43 +83,28 @@ def unfollow(%User{} = follower, params) do 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 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 - 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 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 - 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) - - status = %{activity | data: new_data} - |> activity_to_status(%{for: user}) - - {: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 @@ -217,39 +138,6 @@ def unfollow(%User{} = follower, params) 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, "#{match}") 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 = Ecto.Changeset.change(object, data: data["object"]) - Repo.update(changeset) - - changeset = Ecto.Changeset.change(activity, data: data) - Repo.update(changeset) - end - end - def register_user(params) do params = %{ nickname: params["nickname"], @@ -263,25 +151,33 @@ def unfollow(%User{} = follower, params) 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) |> Poison.encode! - {:error, %{error: errors}} + {: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 + %{"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"} @@ -297,6 +193,31 @@ def unfollow(%User{} = follower, params) do end end + defp parse_int(string, default \\ nil) + 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 + + 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) @@ -322,12 +243,22 @@ def unfollow(%User{} = follower, params) 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) + if ap_id do + User.get_cached_by_ap_id(ap_id) + else + nil + end end) |> Enum.filter(&(&1)) @@ -337,4 +268,38 @@ def unfollow(%User{} = follower, params) 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