summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-05-23 01:57:07 +0000
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2023-05-26 19:24:08 +0200
commit4339230f64b05fee1c4d7313c1dc9adc45827a5d (patch)
tree33f2fa2c53f39eb864b03ae19d2659110b0d8c1f /lib
parent72833c84b583057ed0e757f35b65f90af40496df (diff)
downloadpleroma-4339230f64b05fee1c4d7313c1dc9adc45827a5d.tar.gz
pleroma-4339230f64b05fee1c4d7313c1dc9adc45827a5d.zip
Merge branch 'tusooa/fix-object-test' into 'develop'
Fix ObjectTest See merge request pleroma/pleroma!3887
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/object/updater.ex8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/object/updater.ex b/lib/pleroma/object/updater.ex
index bad811965..b1e4870ba 100644
--- a/lib/pleroma/object/updater.ex
+++ b/lib/pleroma/object/updater.ex
@@ -100,12 +100,14 @@ defmodule Pleroma.Object.Updater do
end
defp maybe_update_poll(to_be_updated, updated_object) do
- choice_key = fn data ->
- if Map.has_key?(data, "anyOf"), do: "anyOf", else: "oneOf"
+ choice_key = fn
+ %{"anyOf" => [_ | _]} -> "anyOf"
+ %{"oneOf" => [_ | _]} -> "oneOf"
+ _ -> nil
end
with true <- to_be_updated["type"] == "Question",
- key <- choice_key.(updated_object),
+ key when not is_nil(key) <- choice_key.(updated_object),
true <- key == choice_key.(to_be_updated),
orig_choices <- to_be_updated[key] |> Enum.map(&Map.drop(&1, ["replies"])),
new_choices <- updated_object[key] |> Enum.map(&Map.drop(&1, ["replies"])),