X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=793a55250ce7ca3af8a571c2a5d84706df8cc8b3;hb=b403ea4d2b69cef4434ad68babdfb402d8227847;hp=b1759a6f00c606734a6dc3736d9b0e6c34f2bd70;hpb=32a95d73daf94a1186ccdbcdc9ce0f91b559119c;p=akkoma
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index b1759a6f0..793a55250 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -32,11 +32,23 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def get_replied_to_activity(_), do: nil
- def create_status(user = %User{}, data = %{"status" => status}) do
+ 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 = format_input(status, mentions)
+ content_html = status
+ |> format_input(mentions)
+ |> add_attachments(attachments)
+
to = to_for_user_and_mentions(user, mentions)
date = make_date()
@@ -110,8 +122,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
@@ -123,16 +134,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
@@ -140,9 +146,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
@@ -257,14 +269,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def get_user(user \\ nil, params) do
case params do
- %{ "user_id" => user_id } ->
+ %{"user_id" => user_id} ->
case target = Repo.get(User, 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"}