sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'flake-from-int' into 'develop'

Browse Source 
Flake: support integers in from_string/1

See merge request pleroma/pleroma!715
This commit is contained in:
kaniini 2019-01-26 16:17:50 +00:00
commit 155a884300
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/flake_id.ex
View File

@ -33,6 +33,10 @@ def to_string(flake = <<_::integer-size(64), _::integer-size(48), _::integer-siz
def to_string(s), do: s 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 for i <- [-1, 0] do
def from_string(unquote(i)), do: <<0::integer-size(128)>> def from_string(unquote(i)), do: <<0::integer-size(128)>>
def from_string(unquote(Kernel.to_string(i))), do: <<0::integer-size(128)>> def from_string(unquote(Kernel.to_string(i))), do: <<0::integer-size(128)>>

1
test/flake_id_test.exs
View File

@ -11,6 +11,7 @@ defmodule Pleroma.FlakeIdTest do
test "from_string/1" do test "from_string/1" do
fake_flake = <<0::integer-size(64), 42::integer-size(64)>> fake_flake = <<0::integer-size(64), 42::integer-size(64)>>
assert from_string("42") == fake_flake assert from_string("42") == fake_flake
assert from_string(42) == fake_flake
end end
test "zero or -1 is a null flake" do test "zero or -1 is a null flake" do