projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial poll refresh support
[akkoma]
/
lib
/
pleroma
/
object
/
fetcher.ex
diff --git
a/lib/pleroma/object/fetcher.ex
b/lib/pleroma/object/fetcher.ex
index 8d79ddb1fd5af72d79d33fdf2175ef9eb5dc84dc..da1ebd8b3d3563f6dc1066cd6e5c1d630725be24 100644
(file)
--- a/
lib/pleroma/object/fetcher.ex
+++ b/
lib/pleroma/object/fetcher.ex
@@
-7,17
+7,19
@@
defmodule Pleroma.Object.Fetcher do
alias Pleroma.Object
alias Pleroma.Object.Containment
alias Pleroma.Signature
alias Pleroma.Object
alias Pleroma.Object.Containment
alias Pleroma.Signature
+ alias Pleroma.Repo
alias Pleroma.Web.ActivityPub.InternalFetchActor
alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Web.OStatus
require Logger
alias Pleroma.Web.ActivityPub.InternalFetchActor
alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Web.OStatus
require Logger
- defp reinject_object(data) do
+ defp reinject_object(
struct,
data) do
Logger.debug("Reinjecting object #{data["id"]}")
with data <- Transmogrifier.fix_object(data),
Logger.debug("Reinjecting object #{data["id"]}")
with data <- Transmogrifier.fix_object(data),
- {:ok, object} <- Object.create(data) do
+ changeset <- Object.change(struct, %{data: data}),
+ {:ok, object} <- Repo.insert_or_update(changeset) do
{:ok, object}
else
e ->
{:ok, object}
else
e ->
@@
-26,6
+28,15
@@
defmodule Pleroma.Object.Fetcher do
end
end
end
end
+ def refetch_object(%Object{data: %{"id" => id}} = object) do
+ with {:ok, data} <- fetch_and_contain_remote_object_from_id(id),
+ {:ok, object} <- reinject_object(object, data) do
+ {:ok, object}
+ else
+ e -> {:error, e}
+ end
+ end
+
# TODO:
# This will create a Create activity, which we need internally at the moment.
def fetch_object_from_id(id, options \\ []) do
# TODO:
# This will create a Create activity, which we need internally at the moment.
def fetch_object_from_id(id, options \\ []) do
@@
-57,7
+68,7
@@
defmodule Pleroma.Object.Fetcher do
{:reject, nil}
{:object, data, nil} ->
{:reject, nil}
{:object, data, nil} ->
- reinject_object(data)
+ reinject_object(
%Object{},
data)
{:normalize, object = %Object{}} ->
{:ok, object}
{:normalize, object = %Object{}} ->
{:ok, object}
@@
-117,9
+128,7
@@
defmodule Pleroma.Object.Fetcher do
def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
Logger.info("Fetching object #{id} via AP")
def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
Logger.info("Fetching object #{id} via AP")
- date =
- NaiveDateTime.utc_now()
- |> Timex.format!("{WDshort}, {0D} {Mshort} {YYYY} {h24}:{m}:{s} GMT")
+ date = Pleroma.Signature.signed_date()
headers =
[{:Accept, "application/activity+json"}]
headers =
[{:Accept, "application/activity+json"}]