X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=897adf5ee5a38503a435c544cc9268adfb78d041;hb=c0e5b3459fa7c53abf6969584b3298184e0094bd;hp=f777ba848a40642e6f99259178d69281f8450bd2;hpb=e4de0ddc77bceb0bbaad6fd25b327c3af53f198c;p=akkoma
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index f777ba848..897adf5ee 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,24 +1,43 @@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
- alias Pleroma.{User, Activity, Repo}
+ alias Pleroma.{User, Activity, Repo, Object}
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
+ 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
},
"published" => date,
"context" => context
@@ -29,16 +48,24 @@ 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"])
|> put_in(["object", "inReplyToStatusId"], inReplyToId)
+ |> put_in(["statusnetConversationId"], inReplyTo.data["statusnetConversationId"])
+ |> put_in(["object", "statusnetConversationId"], inReplyTo.data["statusnetConversationId"])
else _e ->
activity
end
- ActivityPub.insert(activity)
+ with {:ok, activity} <- ActivityPub.insert(activity) do
+ add_conversation_id(activity)
+ end
end
def fetch_friend_statuses(user, opts \\ %{}) do
@@ -51,15 +78,44 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|> activities_to_statuses(%{for: user})
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"],
+ activities <- ActivityPub.fetch_activities_for_context(context),
+ statuses <- activities |> activities_to_statuses(%{for: user})
+ do
+ statuses
+ else e ->
+ IO.inspect(e)
+ []
+ end
+ end
+
+ def fetch_status(user, id) do
+ with %Activity{} = activity <- Repo.get(Activity, id) do
+ activity_to_status(activity, %{for: user})
+ end
+ end
+
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
- def unfollow(%User{} = follower, followed_id) do
+ def unfollow(%User{} = follower, %{ "user_id" => followed_id }) do
with %User{} = followed <- Repo.get(User, followed_id),
{ :ok, follower } <- User.unfollow(follower, followed)
do
@@ -67,6 +123,63 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
+ def unfollow(%User{} = follower, %{ "screen_name" => followed_name }) do
+ with %User{} = followed <- Repo.get_by(User, nickname: followed_name),
+ { :ok, follower } <- User.unfollow(follower, followed)
+ do
+ { :ok, follower, followed }
+ end
+ end
+
+ def upload(%Plug.Upload{} = file) 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}
+
+
+ """
+ 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, Repo.get_by(User, 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)
+
+ changeset = Ecto.Changeset.change(activity, data: data)
+ Repo.update(changeset)
+ end
+ end
+
defp activities_to_statuses(activities, opts) do
Enum.map(activities, fn(activity) ->
activity_to_status(activity, opts)
@@ -76,12 +189,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
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}))
+ mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"])
+ ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, mentioned: mentioned_users}))
end
- def fetch_status(user, id) do
- with %Activity{} = activity <- Repo.get(Activity, id) do
- activity_to_status(activity, %{for: user})
- end
+ defp make_date do
+ DateTime.utc_now() |> DateTime.to_iso8601
end
end