From 1c2eb4d79963baef822cdb313ac68b2d9c84cbe2 Mon Sep 17 00:00:00 2001 From: Oneric Date: Fri, 14 Feb 2025 21:59:22 +0100 Subject: [PATCH] cosmetic/object: drop is_ prefix from is_tombstone_object? The question mark suffix already implies it being an indicator function --- lib/pleroma/object.ex | 6 +++--- lib/pleroma/web/activity_pub/transmogrifier.ex | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index 40c1534b9..d496cb23f 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -216,9 +216,9 @@ def get_cached_by_ap_id(ap_id) do end # Intentionally accepts non-Object arguments! - @spec is_tombstone_object?(term()) :: boolean() - def is_tombstone_object?(%Object{data: %{"type" => "Tombstone"}}), do: true - def is_tombstone_object?(_), do: false + @spec tombstone_object?(term()) :: boolean() + def tombstone_object?(%Object{data: %{"type" => "Tombstone"}}), do: true + def tombstone_object?(_), do: false def make_tombstone(%Object{data: %{"id" => id, "type" => type}}, deleted \\ DateTime.utc_now()) do %ObjectTombstone{ diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 6e6244b7c..ecf6d9cd8 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -560,7 +560,7 @@ defp handle_incoming_normalised( with {_, {:ok, object_id}} <- {:object_id, oid_result}, object <- Object.get_cached_by_ap_id(object_id), - {_, false} <- {:tombstone, Object.is_tombstone_object?(object) && !data["actor"]}, + {_, false} <- {:tombstone, Object.tombstone_object?(object) && !data["actor"]}, {:ok, activity, _} <- Pipeline.common_pipeline(data, local: false) do {:ok, activity} else