X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus.ex;h=02fc273cf7eabecfc23a5a1a54c1b23d64bfed75;hb=94e980d6b4ab91ee37c30b266eb91e748e23861c;hp=57fa3bcd5e8f9da8c2c39c92d5d74bd5e39f1c88;hpb=7269c51f3a4409110bc61faada08e35ce1b4d030;p=akkoma
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 57fa3bcd5..02fc273cf 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -1,11 +1,15 @@
defmodule Pleroma.Web.OStatus do
+ @httpoison Application.get_env(:pleroma, :httpoison)
+
import Ecto.Query
import Pleroma.Web.XML
require Logger
- alias Pleroma.{Repo, User, Web, Object}
+ alias Pleroma.{Repo, User, Web, Object, Activity}
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.{WebFinger, Websub}
+ alias Pleroma.Web.OStatus.FollowHandler
def feed_path(user) do
"#{user.ap_id}/feed.atom"
@@ -28,8 +32,12 @@ defmodule Pleroma.Web.OStatus do
{:xmlObj, :string, verb} = :xmerl_xpath.string('string(/entry/activity:verb[1])', entry)
case verb do
+ 'http://activitystrea.ms/schema/1.0/follow' ->
+ with {:ok, activity} <- FollowHandler.handle(entry, doc), do: activity
'http://activitystrea.ms/schema/1.0/share' ->
with {:ok, activity, retweeted_activity} <- handle_share(entry, doc), do: [activity, retweeted_activity]
+ 'http://activitystrea.ms/schema/1.0/favorite' ->
+ with {:ok, activity, favorited_activity} <- handle_favorite(entry, doc), do: [activity, favorited_activity]
_ ->
case object_type do
'http://activitystrea.ms/schema/1.0/note' ->
@@ -47,15 +55,15 @@ defmodule Pleroma.Web.OStatus do
def make_share(entry, doc, retweeted_activity) do
with {:ok, actor} <- find_make_or_update_user(doc),
- %Object{} = object <- Object.get_cached_by_ap_id(retweeted_activity.data["object"]["id"]),
- {:ok, activity, object} = ActivityPub.announce(actor, object, false) do
+ %Object{} = object <- Object.get_by_ap_id(retweeted_activity.data["object"]["id"]),
+ id when not is_nil(id) <- string_from_xpath("/entry/id", entry),
+ {:ok, activity, _object} = ActivityPub.announce(actor, object, id, false) do
{:ok, activity}
end
end
def handle_share(entry, doc) do
- with [object] <- :xmerl_xpath.string('/entry/activity:object', entry),
- {:ok, retweeted_activity} <- handle_note(object, object),
+ with {:ok, retweeted_activity} <- get_or_build_object(entry),
{:ok, activity} <- make_share(entry, doc, retweeted_activity) do
{:ok, activity, retweeted_activity}
else
@@ -63,6 +71,51 @@ defmodule Pleroma.Web.OStatus do
end
end
+ def make_favorite(entry, doc, favorited_activity) do
+ with {:ok, actor} <- find_make_or_update_user(doc),
+ %Object{} = object <- Object.get_by_ap_id(favorited_activity.data["object"]["id"]),
+ id when not is_nil(id) <- string_from_xpath("/entry/id", entry),
+ {:ok, activity, _object} = ActivityPub.like(actor, object, id, false) do
+ {:ok, activity}
+ end
+ end
+
+ def get_or_build_object(entry) do
+ with {:ok, activity} <- get_or_try_fetching(entry) do
+ {:ok, activity}
+ else
+ _e ->
+ with [object] <- :xmerl_xpath.string('/entry/activity:object', entry) do
+ handle_note(object, object)
+ end
+ end
+ end
+
+
+ def get_or_try_fetching(entry) do
+ Logger.debug("Trying to get entry from db")
+ with id when not is_nil(id) <- string_from_xpath("//activity:object[1]/id", entry),
+ %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
+ {:ok, activity}
+ else e ->
+ Logger.debug("Couldn't get, will try to fetch")
+ with href when not is_nil(href) <- string_from_xpath("//activity:object[1]/link[@type=\"text/html\"]/@href", entry),
+ {:ok, [favorited_activity]} <- fetch_activity_from_html_url(href) do
+ {:ok, favorited_activity}
+ else e -> Logger.debug("Couldn't find href: #{inspect(e)}")
+ end
+ end
+ end
+
+ def handle_favorite(entry, doc) do
+ with {:ok, favorited_activity} <- get_or_try_fetching(entry),
+ {:ok, activity} <- make_favorite(entry, doc, favorited_activity) do
+ {:ok, activity, favorited_activity}
+ else
+ e -> {:error, e}
+ end
+ end
+
def get_attachments(entry) do
:xmerl_xpath.string('/entry/link[@rel="enclosure"]', entry)
|> Enum.map(fn (enclosure) ->
@@ -81,13 +134,37 @@ defmodule Pleroma.Web.OStatus do
|> Enum.filter(&(&1))
end
+ def get_content(entry) do
+ base_content = string_from_xpath("//content", entry)
+
+ with scope when not is_nil(scope) <- string_from_xpath("//mastodon:scope", entry),
+ cw when not is_nil(cw) <- string_from_xpath("/*/summary", entry) do
+ "#{cw}
#{base_content}"
+ else _e -> base_content
+ end
+ end
+
+ def get_tags(entry) do
+ :xmerl_xpath.string('//category', entry)
+ |> Enum.map(fn (category) -> string_from_xpath("/category/@term", category) end)
+ end
+
def handle_note(entry, doc \\ nil) do
- content_html = string_from_xpath("//content[1]", entry)
+ content_html = get_content(entry)
[author] = :xmerl_xpath.string('//author[1]', doc)
{:ok, actor} = find_make_or_update_user(author)
inReplyTo = string_from_xpath("//thr:in-reply-to[1]/@ref", entry)
+ if inReplyTo && !Object.get_cached_by_ap_id(inReplyTo) do
+ inReplyToHref = string_from_xpath("//thr:in-reply-to[1]/@href", entry)
+ if inReplyToHref do
+ fetch_activity_from_html_url(inReplyToHref)
+ else
+ Logger.debug("Couldn't find a href link to #{inReplyTo}")
+ end
+ end
+
context = (string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim
attachments = get_attachments(entry)
@@ -98,12 +175,15 @@ defmodule Pleroma.Web.OStatus do
if String.length(context) > 0 do
context
else
- ActivityPub.generate_context_id
+ Utils.generate_context_id
end
end
+ tags = get_tags(entry)
+
to = [
- "https://www.w3.org/ns/activitystreams#Public"
+ "https://www.w3.org/ns/activitystreams#Public",
+ User.ap_followers(actor)
]
mentions = :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/person"]', entry)
@@ -122,18 +202,27 @@ defmodule Pleroma.Web.OStatus do
"published" => date,
"context" => context,
"actor" => actor.ap_id,
- "attachment" => attachments
+ "attachment" => attachments,
+ "tag" => tags
}
object = if inReplyTo do
- Map.put(object, "inReplyTo", inReplyTo)
+ replied_to_activity = Activity.get_create_activity_by_object_ap_id(inReplyTo)
+ if replied_to_activity do
+ object
+ |> Map.put("inReplyTo", inReplyTo)
+ |> Map.put("inReplyToStatusId", replied_to_activity.id)
+ else
+ object
+ |> Map.put("inReplyTo", inReplyTo)
+ end
else
object
end
# TODO: Bail out sooner and use transaction.
if Object.get_by_ap_id(id) do
- {:error, "duplicate activity"}
+ {:ok, Activity.get_create_activity_by_object_ap_id(id)}
else
ActivityPub.create(to, actor, context, object, %{}, date, false)
end
@@ -143,7 +232,7 @@ defmodule Pleroma.Web.OStatus do
uri = string_from_xpath("//author/uri[1]", doc)
with {:ok, user} <- find_or_make_user(uri) do
avatar = make_avatar_object(doc)
- if user.avatar != avatar do
+ if !user.local && user.avatar != avatar do
change = Ecto.Changeset.change(user, %{avatar: avatar})
Repo.update(change)
else
@@ -154,7 +243,7 @@ defmodule Pleroma.Web.OStatus do
def find_or_make_user(uri) do
query = from user in User,
- where: user.local == false and fragment("? @> ?", user.info, ^%{uri: uri})
+ where: user.ap_id == ^uri
user = Repo.one(query)
@@ -168,16 +257,18 @@ defmodule Pleroma.Web.OStatus do
def make_user(uri) do
with {:ok, info} <- gather_user_info(uri) do
data = %{
- local: false,
name: info["name"],
nickname: info["nickname"] <> "@" <> info["host"],
ap_id: info["uri"],
info: info,
avatar: info["avatar"]
}
- # TODO: Make remote user changeset
- # SHould enforce fqn nickname
- Repo.insert(Ecto.Changeset.change(%User{}, data))
+ with %User{} = user <- User.get_by_ap_id(data.ap_id) do
+ {:ok, user}
+ else _e ->
+ cs = User.remote_user_creation(data)
+ Repo.insert(cs)
+ end
end
end
@@ -210,4 +301,37 @@ defmodule Pleroma.Web.OStatus do
{:error, e}
end
end
+
+ # Regex-based 'parsing' so we don't have to pull in a full html parser
+ # It's a hack anyway. Maybe revisit this in the future
+ @mastodon_regex ~r//
+ @gs_regex ~r//
+ @gs_classic_regex ~r//
+ def get_atom_url(body) do
+ cond do
+ Regex.match?(@mastodon_regex, body) ->
+ [[_, match]] = Regex.scan(@mastodon_regex, body)
+ {:ok, match}
+ Regex.match?(@gs_regex, body) ->
+ [[_, match]] = Regex.scan(@gs_regex, body)
+ {:ok, match}
+ Regex.match?(@gs_classic_regex, body) ->
+ [[_, match]] = Regex.scan(@gs_classic_regex, body)
+ {:ok, match}
+ true ->
+ Logger.debug(fn -> "Couldn't find atom link in #{inspect(body)}" end)
+ {:error, "Couldn't find the atom link"}
+ end
+ end
+
+ def fetch_activity_from_html_url(url) do
+ Logger.debug("Trying to fetch #{url}")
+ with {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true),
+ {:ok, atom_url} <- get_atom_url(body),
+ {:ok, %{status_code: code, body: body}} when code in 200..299 <- @httpoison.get(atom_url, [], follow_redirect: true) do
+ Logger.debug("Got document from #{url}, handling...")
+ handle_incoming(body)
+ else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
+ end
+ end
end