X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=58f8bc1d3b7a14a715c9d67fc16535f85d7f350c;hb=60c60de330fe8fe03594da89831351099c8c9037;hp=ab2b1aab792cd6123d297f8cdae7dad70c2dd543;hpb=73df2f8e5e2d0e2b125df8848c2dd7f2a73f1c03;p=akkoma
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index ab2b1aab7..58f8bc1d3 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -6,29 +6,42 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
import Ecto.Query
def create_status(user = %User{}, data = %{}) do
- date = DateTime.utc_now() |> DateTime.to_iso8601
-
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"])
+
+ 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()
+
activity = %{
"type" => "Create",
- "to" => [
- User.ap_followers(user),
- "https://www.w3.org/ns/activitystreams#Public"
- ],
- "actor" => User.ap_id(user),
+ "to" => to,
+ "actor" => user.ap_id,
"object" => %{
"type" => "Note",
- "content" => data["status"],
+ "to" => to,
+ "content" => content_html,
"published" => date,
- "context" => context
+ "context" => context,
+ "attachment" => attachments,
+ "actor" => user.ap_id
},
"published" => date,
- "context" => context,
- "attachment" => attachments
+ "context" => context
}
# Wire up reply info.
@@ -36,7 +49,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
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"])
@@ -53,7 +70,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
def fetch_friend_statuses(user, opts \\ %{}) do
- ActivityPub.fetch_activities(user.following, opts)
+ ActivityPub.fetch_activities([user.ap_id | user.following], opts)
|> activities_to_statuses(%{for: user})
end
@@ -74,7 +91,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
do
statuses
else e ->
- IO.inspect(e)
+ IO.inspect(e)
[]
end
end
@@ -87,9 +104,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def follow(%User{} = follower, followed_id) do
with %User{} = followed <- Repo.get(User, followed_id),
- { :ok, follower } <- User.follow(follower, followed)
+ { :ok, follower } <- User.follow(follower, followed),
+ { :ok, activity } <- ActivityPub.insert(%{
+ "type" => "Follow",
+ "actor" => follower.ap_id,
+ "object" => followed.ap_id,
+ "published" => make_date()
+ })
do
- { :ok, follower, followed }
+ { :ok, follower, followed, activity }
end
end
@@ -101,25 +124,89 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
- def upload(%Plug.Upload{} = file) do
+ 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}
+ 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}
+ 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}
+ end
+
+ def upload(%Plug.Upload{} = file, format \\ "xml") do
{:ok, object} = ActivityPub.upload(file)
url = List.first(object.data["url"])
href = url["href"]
type = url["mediaType"]
- # Fake this as good as possible...
- """
-
-
- #{object.id}
- #{object.id}
- #{object.id}
- #{href}
- #{href}
-
-
- """
+ case format do
+ "xml" ->
+ # Fake this as good as possible...
+ """
+
+
+ #{object.id}
+ #{object.id}
+ #{object.id}
+ #{href}
+ #{href}
+
+
+ """
+ "json" ->
+ %{
+ media_id: object.id,
+ 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.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
@@ -130,6 +217,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|> 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
@@ -141,9 +233,38 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end)
end
+ # For likes, fetch the liked activity, too.
+ defp activity_to_status(%Activity{data: %{"type" => "Like"}} = activity, opts) do
+ actor = get_in(activity.data, ["actor"])
+ 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}))
+ end
+
+ # For announces, fetch the announced activity and the user.
+ defp activity_to_status(%Activity{data: %{"type" => "Announce"}} = activity, opts) do
+ actor = get_in(activity.data, ["actor"])
+ user = User.get_cached_by_ap_id(actor)
+ [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}))
+ end
+
defp activity_to_status(activity, opts) do
actor = get_in(activity.data, ["actor"])
- user = Repo.get_by!(User, ap_id: actor)
- ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user}))
+ 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)
+ end)
+ |> Enum.filter(&(&1))
+
+ ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, mentioned: mentioned_users}))
+ end
+
+ defp make_date do
+ DateTime.utc_now() |> DateTime.to_iso8601
end
end