Get fresh objects on changes.

[akkoma] / lib / pleroma / web / ostatus / ostatus.ex

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 5a44b86610301dcea139e5c30f6f5994adc1105d..55d600ab2bee3bb4cf8914183b618fe46e5a697c 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -49,10 +49,11 @@ defmodule Pleroma.Web.OStatus do
     {:ok, activities}
   end
 
-  def make_share(_entry, doc, retweeted_activity) 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
@@ -67,10 +68,11 @@ defmodule Pleroma.Web.OStatus do
     end
   end
 
-  def make_favorite(_entry, doc, favorited_activity) do
+  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
+         %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
@@ -121,6 +123,13 @@ defmodule Pleroma.Web.OStatus do
     {:ok, actor} = find_make_or_update_user(author)
     inReplyTo = string_from_xpath("//thr:in-reply-to[1]/@ref", entry)
 
+    if !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)
+      end
+    end
+
     context = (string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim
 
     attachments = get_attachments(entry)
@@ -136,7 +145,8 @@ defmodule Pleroma.Web.OStatus do
               end
 
     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)
@@ -166,7 +176,7 @@ defmodule Pleroma.Web.OStatus do
 
     # 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
@@ -176,7 +186,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
@@ -187,7 +197,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)
 
@@ -248,6 +258,7 @@ defmodule Pleroma.Web.OStatus do
   # 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">/
+  @gs_classic_regex ~r/<link rel="alternate" href="(.*)" type="application\/atom\+xml" title=.*>/
   def get_atom_url(body) do
     cond do
       Regex.match?(@mastodon_regex, body) ->
@@ -256,6 +267,9 @@ defmodule Pleroma.Web.OStatus do
       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"}
@@ -263,9 +277,9 @@ defmodule Pleroma.Web.OStatus do
   end
 
   def fetch_activity_from_html_url(url) do
-    with {:ok, %{body: body}} <- @httpoison.get(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) do
+         {:ok, %{status_code: code, body: body}} when code in 200..299 <- @httpoison.get(atom_url, [], follow_redirect: true) do
       handle_incoming(body)
     end
   end