AkkomaGang/akkoma
AkkomaGang/akkoma
15
66
Fork 93
Code Issues 176 Pull requests 15 Projects 2 Releases 16 Packages Wiki Activity

Add backfilling of posts #846

Open
tudbut wants to merge 21 commits from tudbut/akkoma:develop into develop
pull from: tudbut/akkoma:develop
merge into: AkkomaGang:develop
Conversation 14 Commits 21 Files changed 9 +6 -9
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6d8df8c1a2 - Show all commits

9
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -1874,15 +1874,15 @@ def enqueue_outbox_fetches(
# enqueue a task to fetch the outbox # enqueue a task to fetch the outbox
Logger.debug("Refetching outbox #{outbox_address}") Logger.debug("Refetching outbox #{outbox_address}")
User.outbox_refreshed(user)
Pleroma.Workers.RemoteFetcherWorker.enqueue("fetch_outbox", %{ Pleroma.Workers.RemoteFetcherWorker.enqueue("fetch_outbox", %{
"id" => outbox_address "id" => outbox_address
}) })
User.outbox_refreshed(user)
:ok :ok
else else
Logger.debug("Not refetching outbox (TTL not reached)") Logger.debug("Not refetching outbox (TTL not reached: #{last_fetch}, age #{NaiveDateTime.diff(NaiveDateTime.utc_now(), last_fetch)})")
end end
:ok :ok
@ -1891,7 +1891,8 @@ def enqueue_outbox_fetches(
def enqueue_outbox_fetches(%{local: true}), do: :ok def enqueue_outbox_fetches(%{local: true}), do: :ok
def enqueue_outbox_fetches(%{local: false} = user) do def enqueue_outbox_fetches(%{local: false} = user) do
# TODO: get outbox? make_user_from_ap_id(user.ap_id)
:ok
end end
def make_user_from_ap_id(ap_id, additional \\ []) do def make_user_from_ap_id(ap_id, additional \\ []) do

6
lib/pleroma/workers/remote_fetcher_worker.ex
View file

@ -17,11 +17,7 @@ def perform(%Job{args: %{"op" => "fetch_outbox", "id" => address}}) do
with {:ok, outbox} <- ActivityPub.fetch_and_prepare_collection_from_ap_id(address) do with {:ok, outbox} <- ActivityPub.fetch_and_prepare_collection_from_ap_id(address) do
Enum.each(Enum.reverse(outbox), fn {ap_id, _} -> Enum.each(Enum.reverse(outbox), fn {ap_id, _} ->
if is_nil(Object.get_cached_by_ap_id(ap_id)) do if is_nil(Object.get_cached_by_ap_id(ap_id)) do
perform(%{ Fetcher.fetch_object_from_id(ap_id, depth: 1)
"op" => "fetch_remote",
"id" => ap_id,
"depth" => 1
})
end end
end) end)