logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: b233c8e55cba773e8ee9a4affbcce3a3c05d1e2d
parent: 644195e31e500e96f60ab83ffb5f082a94c1123a
Author: lain <lain@soykaf.club>
Date:   Tue, 26 May 2020 12:41:46 +0000

Merge branch 'fix/oban-warnings' into 'develop'

Fix Oban warnings

See merge request pleroma/pleroma!2587

Diffstat:

Mlib/pleroma/workers/cron/clear_oauth_token_worker.ex2++
Mlib/pleroma/workers/cron/digest_emails_worker.ex2++
Mlib/pleroma/workers/cron/new_users_digest_worker.ex4++++
Mlib/pleroma/workers/cron/purge_expired_activities_worker.ex2++
4 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/lib/pleroma/workers/cron/clear_oauth_token_worker.ex b/lib/pleroma/workers/cron/clear_oauth_token_worker.ex @@ -16,6 +16,8 @@ defmodule Pleroma.Workers.Cron.ClearOauthTokenWorker do def perform(_opts, _job) do if Config.get([:oauth2, :clean_expired_tokens], false) do Token.delete_expired_tokens() + else + :ok end end end diff --git a/lib/pleroma/workers/cron/digest_emails_worker.ex b/lib/pleroma/workers/cron/digest_emails_worker.ex @@ -37,6 +37,8 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorker do ) |> Repo.all() |> send_emails + else + :ok end end diff --git a/lib/pleroma/workers/cron/new_users_digest_worker.ex b/lib/pleroma/workers/cron/new_users_digest_worker.ex @@ -55,7 +55,11 @@ defmodule Pleroma.Workers.Cron.NewUsersDigestWorker do |> Repo.all() |> Enum.map(&Pleroma.Emails.NewUsersDigestEmail.new_users(&1, users_and_statuses)) |> Enum.each(&Pleroma.Emails.Mailer.deliver/1) + else + :ok end + else + :ok end end end diff --git a/lib/pleroma/workers/cron/purge_expired_activities_worker.ex b/lib/pleroma/workers/cron/purge_expired_activities_worker.ex @@ -23,6 +23,8 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker do def perform(_opts, _job) do if Config.get([ActivityExpiration, :enabled]) do Enum.each(ActivityExpiration.due_expirations(@interval), &delete_activity/1) + else + :ok end end