logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: f646b0554fd081c2ea28ba9a45e90033aa06f736
parent 355b028c23bf977ff2006d384d2a66d2a9dfa28b
Author: feld <feld@feld.me>
Date:   Tue, 30 Jul 2024 16:29:48 +0000

Merge branch 'fix-migration' into 'develop'

Fix publisher job migration error

See merge request pleroma/pleroma!4198

Diffstat:

Achangelog.d/fix-migration.skip0
Mpriv/repo/migrations/20240729163838_publisher_job_change.exs13+++++++++----
2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/changelog.d/fix-migration.skip b/changelog.d/fix-migration.skip diff --git a/priv/repo/migrations/20240729163838_publisher_job_change.exs b/priv/repo/migrations/20240729163838_publisher_job_change.exs @@ -16,12 +16,17 @@ defmodule Pleroma.Repo.Migrations.PublisherJobChange do Enum.each(jobs, fn job -> args = job.args - activity = Activity.get_by_ap_id(args["id"]) - updated_args = Map.put(args, "activity_id", activity.id) + case Activity.get_by_ap_id(args["id"]) do + nil -> + :ok - Pleroma.Workers.PublisherWorker.new(updated_args) - |> Oban.insert() + %Activity{id: activity_id} -> + updated_args = Map.put(args, "activity_id", activity_id) + + Pleroma.Workers.PublisherWorker.new(updated_args) + |> Oban.insert() + end end) end end