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 a6d416b2cc65228053b7b228defff90aba18aa67..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
@@ -174,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
@@ -184,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