moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'remove-multiple-federator-modules' into 'develop' 

Fix the Federator perform/2 Oban callback

See merge request pleroma/pleroma!4021
This commit is contained in:
feld 2023-12-29 04:33:45 +00:00
parent 7f3a83d3ed d519a535e1
commit 3954dfd4f1
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
changelog.d/federator.skip Normal file
View File

3
lib/pleroma/web/activity_pub/publisher.ex
View File

@ -117,8 +117,9 @@ def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = pa
result result
else else
{_post_result, response} -> {_post_result, response} = e ->
unless params[:unreachable_since], do: Instances.set_unreachable(inbox) unless params[:unreachable_since], do: Instances.set_unreachable(inbox)
Logger.error("Failed to publish activity #{id} #{inspect(e)}")
{:error, response} {:error, response}
end end
end end

6
lib/pleroma/web/federator.ex
View File

@ -68,10 +68,8 @@ defp publish_priority(_), do: 0
# Job Worker Callbacks # Job Worker Callbacks
@spec perform(atom(), module(), any()) :: {:ok, any()} | {:error, any()} @spec perform(atom(), any()) :: {:ok, any()} | {:error, any()}
def perform(:publish_one, module, params) do def perform(:publish_one, params), do: Publisher.publish_one(params)
apply(module, :publish_one, [params])
end
def perform(:publish, activity) do def perform(:publish, activity) do
Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end) Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end)