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 e4448eb73aee4c96891af01a3c73d0937eb0407e..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
@@ -143,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)
@@ -173,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
@@ -183,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
@@ -194,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)
 
@@ -274,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