X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=dc66e27adba77965769539eed976b15a7daa8cdf;hb=19e8421947472eb2207caa299bc4bf5947ce3cca;hp=d048d07c32aef0dadaf3ac992ca8afa410c45041;hpb=36448d6483c7f53266052e72bd39b04558478410;p=akkoma
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index d048d07c3..dc66e27ad 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),
+ user.follower_address,
"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", "
")
- |> 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,62 +30,19 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def get_replied_to_activity(_), do: nil
- def add_attachments(text, attachments) do
- attachment_text = Enum.map(attachments, fn
- (%{"url" => [%{"href" => href} | _]}) ->
- "#{href}"
- _ -> ""
- end)
- Enum.join([text | attachment_text], "
")
- end
-
def create_status(%User{} = user, %{"status" => status} = data) do
- attachments = attachments_from_ids(data["media_ids"])
- context = ActivityPub.generate_context_id
- mentions = parse_mentions(status)
- content_html = status
- |> format_input(mentions)
- |> add_attachments(attachments)
-
- 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, %{}]
+ 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
+ res = ActivityPub.create(to, user, context, object)
+ User.update_note_count(user)
+ res
end
-
- ActivityPub.create(to, user, context, object, additional, data)
end
def fetch_friend_statuses(user, opts \\ %{}) do
@@ -230,21 +185,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, "#{match}") end)
- end
-
def register_user(params) do
params = %{
nickname: params["nickname"],
@@ -258,7 +198,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)
@@ -267,10 +207,18 @@ 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
+ case target = get_by_id_or_nickname(user_id) do
nil ->
{:error, "No user with such user_id"}
_ ->
@@ -336,10 +284,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
@@ -352,10 +304,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
def get_external_profile(for_user, uri) do
- with %User{} = user <- User.get_cached_by_ap_id(uri) do
- {:ok, UserRepresenter.to_map(user, %{for: for_user})}
+ 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"}
+ {:error, "Couldn't find user"}
end
end
end