X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fflake_id.ex;h=4259d57189bec86d537a345c1b9d3036a86cbd07;hb=92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336;hp=26399ae053454e74140b8174d3ac6cf077b01a90;hpb=be43aa2875e08cd48b10fc0157d71239f098d1e4;p=akkoma

diff --git a/lib/pleroma/flake_id.ex b/lib/pleroma/flake_id.ex
index 26399ae05..4259d5718 100644
--- a/lib/pleroma/flake_id.ex
+++ b/lib/pleroma/flake_id.ex
@@ -27,18 +27,22 @@ defmodule Pleroma.FlakeId do
     Kernel.to_string(id)
   end
 
-  def to_string(flake = <<_::integer-size(64), _::integer-size(48), _::integer-size(16)>>) do
+  def to_string(<<_::integer-size(64), _::integer-size(48), _::integer-size(16)>> = flake) do
     encode_base62(flake)
   end
 
   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)>>
   end
 
-  def from_string(flake = <<_::integer-size(128)>>), do: flake
+  def from_string(<<_::integer-size(128)>> = flake), do: flake
 
   def from_string(string) when is_binary(string) and byte_size(string) < 18 do
     case Integer.parse(string) do
@@ -81,7 +85,7 @@ defmodule Pleroma.FlakeId do
     {:ok, FlakeId.from_string(value)}
   end
 
-  def autogenerate(), do: get()
+  def autogenerate, do: get()
 
   # -- GenServer API
   def start_link do
@@ -90,7 +94,7 @@ defmodule Pleroma.FlakeId do
 
   @impl GenServer
   def init([]) do
-    {:ok, %FlakeId{node: mac(), time: time()}}
+    {:ok, %FlakeId{node: worker_id(), time: time()}}
   end
 
   @impl GenServer
@@ -161,23 +165,8 @@ defmodule Pleroma.FlakeId do
     1_000_000_000 * mega_seconds + seconds * 1000 + :erlang.trunc(micro_seconds / 1000)
   end
 
-  def mac do
-    {:ok, addresses} = :inet.getifaddrs()
-
-    macids =
-      Enum.reduce(addresses, [], fn {_iface, attrs}, acc ->
-        case attrs[:hwaddr] do
-          [0, 0, 0 | _] -> acc
-          mac when is_list(mac) -> [mac_to_worker_id(mac) | acc]
-          _ -> acc
-        end
-      end)
-
-    List.first(macids)
-  end
-
-  def mac_to_worker_id(mac) do
-    <<worker::integer-size(48)>> = :binary.list_to_bin(mac)
+  defp worker_id do
+    <<worker::integer-size(48)>> = :crypto.strong_rand_bytes(6)
     worker
   end
 end