aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-05-05 16:07:44 +0200
committerRoger Braun <roger@rogerbraun.net>2017-05-05 16:07:44 +0200
commitfa2610c7959500c18b64d70828123a817de78864 (patch)
tree14b0f473e3e547364e1be93ec5b166c5323cc2fd /lib
parentd982f04a652ee95110ebd7d6dfc1ebdaa3c15d6f (diff)
downloadpleroma-fa2610c7959500c18b64d70828123a817de78864.tar.gz
Handle incoming favorites, fetch potentially missing messages.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex4
-rw-r--r--lib/pleroma/web/ostatus/ostatus.ex48
2 files changed, 50 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index d7b490088..82aed7ce4 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -41,7 +41,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
end
- def like(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object) do
+ def like(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object, local \\ true) do
cond do
# There's already a like here, so return the original activity.
ap_id in (object.data["likes"] || []) ->
@@ -59,7 +59,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
"context" => object.data["context"]
}
- {:ok, activity} = insert(data)
+ {:ok, activity} = insert(data, local)
likes = [ap_id | (object.data["likes"] || [])] |> Enum.uniq
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 3bed5a5d9..0a4361393 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -1,4 +1,6 @@
defmodule Pleroma.Web.OStatus do
+ @httpoison Application.get_env(:pleroma, :httpoison)
+
import Ecto.Query
import Pleroma.Web.XML
require Logger
@@ -30,6 +32,8 @@ defmodule Pleroma.Web.OStatus do
case verb do
'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' ->
@@ -63,6 +67,24 @@ 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_cached_by_ap_id(favorited_activity.data["object"]["id"]),
+ {:ok, activity, _object} = ActivityPub.like(actor, object, false) do
+ {:ok, activity}
+ end
+ end
+
+ def handle_favorite(entry, doc) do
+ 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),
+ {: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) ->
@@ -210,4 +232,30 @@ 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/<link href='(.*)' rel='alternate' type='application\/atom\+xml'>/
+ @gs_regex ~r/<link title=.* href="(.*)" type="application\/atom\+xml" rel="alternate">/
+ 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}
+ 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
+ with {:ok, %{body: body}} <- @httpoison.get(url),
+ {:ok, atom_url} <- get_atom_url(body),
+ {:ok, %{status_code: code, body: body}} when code in 200..299 <- @httpoison.get(atom_url) do
+ handle_incoming(body)
+ end
+ end
end