diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-22 11:28:49 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-22 11:28:49 -0500 |
| commit | a78595d7cf5ec85fa388abdb0574a27df7a3f010 (patch) | |
| tree | 2963c4eb024be12e0214556d40e00d76ed58c7ce | |
| parent | 5314718891a1e9d3605b2f2a26696cbd574f335d (diff) | |
Fix Elixir 1.9 build warnings
| -rw-r--r-- | lib/pleroma/web/activity_pub/pipeline.ex | 15 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/side_effects.ex | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/lib/pleroma/web/activity_pub/pipeline.ex b/lib/pleroma/web/activity_pub/pipeline.ex index b926a7196..97c0dc0bd 100644 --- a/lib/pleroma/web/activity_pub/pipeline.ex +++ b/lib/pleroma/web/activity_pub/pipeline.ex @@ -18,12 +18,15 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do @activity_pub Config.get([:pipeline, :activity_pub]) @config Config.get([:pipeline, :config]) - defp side_effects(), do: @side_effects || ActivityPub.SideEffects - defp federator(), do: @federator || Federator - defp object_validator(), do: @object_validator || ActivityPub.ObjectValidator - defp mrf(), do: @mrf || ActivityPub.MRF - defp activity_pub(), do: @activity_pub || ActivityPub.ActivityPub - defp config(), do: @config || Pleroma.Config + # Elixir 1.9 compiler complains unless we do it like this + defp fallback(a, b), do: a || b + + defp side_effects(), do: fallback(@side_effects, ActivityPub.SideEffects) + defp federator(), do: fallback(@federator, Federator) + defp object_validator(), do: fallback(@object_validator, ActivityPub.ObjectValidator) + defp mrf(), do: fallback(@mrf, ActivityPub.MRF) + defp activity_pub(), do: fallback(@activity_pub, ActivityPub.ActivityPub) + defp config(), do: fallback(@config, Pleroma.Config) @spec common_pipeline(map(), keyword()) :: {:ok, Activity.t() | Object.t(), keyword()} | {:error, any()} diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex index c32f800ce..ff699cf51 100644 --- a/lib/pleroma/web/activity_pub/side_effects.ex +++ b/lib/pleroma/web/activity_pub/side_effects.ex @@ -33,7 +33,10 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do @behaviour Pleroma.Web.ActivityPub.SideEffects.Handling - defp ap_streamer(), do: @ap_streamer || ActivityPub + # Elixir 1.9 compiler complains unless we do it like this + defp fallback(a, b), do: a || b + + defp ap_streamer(), do: fallback(@ap_streamer, ActivityPub) @impl true def handle(object, meta \\ []) |