diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-26 16:17:50 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-26 16:17:50 +0000 |
| commit | 155a88430027045fd9de79d7000bb083869f167f (patch) | |
| tree | 7e661270e0f66c3151fd7ffe9ce661b1b3860a1d | |
| parent | 3e66723f7e35a2f49d7cdd54a261dd9078defee2 (diff) | |
| parent | d6015338c8fea62602e969a498b80c2a5b754909 (diff) | |
| download | pleroma-155a88430027045fd9de79d7000bb083869f167f.tar.gz pleroma-155a88430027045fd9de79d7000bb083869f167f.zip | |
Merge branch 'flake-from-int' into 'develop'
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
| -rw-r--r-- | lib/pleroma/flake_id.ex | 4 | ||||
| -rw-r--r-- | test/flake_id_test.exs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/flake_id.ex b/lib/pleroma/flake_id.ex index 26399ae05..69482f69a 100644 --- a/lib/pleroma/flake_id.ex +++ b/lib/pleroma/flake_id.ex @@ -33,6 +33,10 @@ defmodule Pleroma.FlakeId do def to_string(s), do: s + def from_string(int) when is_integer(int) do + from_string(Kernel.to_string(int)) + end + for i <- [-1, 0] do def from_string(unquote(i)), do: <<0::integer-size(128)>> def from_string(unquote(Kernel.to_string(i))), do: <<0::integer-size(128)>> diff --git a/test/flake_id_test.exs b/test/flake_id_test.exs index 8e969fd1c..ca2338041 100644 --- a/test/flake_id_test.exs +++ b/test/flake_id_test.exs @@ -11,6 +11,7 @@ defmodule Pleroma.FlakeIdTest do test "from_string/1" do fake_flake = <<0::integer-size(64), 42::integer-size(64)>> assert from_string("42") == fake_flake + assert from_string(42) == fake_flake end test "zero or -1 is a null flake" do |