A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
refactor(gateway): share clock, channel type and boolean helpers
Hampus993a30f7e660
diff --git a/fluxer_gateway/src/gateway/gateway_clock.erl b/fluxer_gateway/src/gateway/gateway_clock.erlnew file mode 100644index 000000000..4001a1b5f--- /dev/null+++ b/fluxer_gateway/src/gateway/gateway_clock.erl@@ -0,0 +1,10 @@+%% SPDX-License-Identifier: AGPL-3.0-or-later++-module(gateway_clock).+-typing([eqwalizer]).++-export([monotonic_ms/0]).++-spec monotonic_ms() -> integer().+monotonic_ms() ->+ erlang:monotonic_time(millisecond).diff --git a/fluxer_gateway/src/gateway/gateway_retry_timer.erl b/fluxer_gateway/src/gateway/gateway_retry_timer.erlindex a67045570..c50d5bbe6 100644--- a/fluxer_gateway/src/gateway/gateway_retry_timer.erl+++ b/fluxer_gateway/src/gateway/gateway_retry_timer.erl@@ -23,7 +23,7 @@ wait_non_neg(_DelayMs) ->-spec wait_until(term(), integer()) -> ok | expired | {error, invalid_delay}.wait_until(DelayMs, DeadlineMs) when is_integer(DelayMs), DelayMs >= 0 ->- NowMs = erlang:monotonic_time(millisecond),+ NowMs = gateway_clock:monotonic_ms(),case DeadlineMs =< NowMs oftrue ->expired;diff --git a/fluxer_gateway/src/utils/channel_types.erl b/fluxer_gateway/src/utils/channel_types.erlnew file mode 100644index 000000000..528e96414--- /dev/null+++ b/fluxer_gateway/src/utils/channel_types.erl@@ -0,0 +1,24 @@+%% SPDX-License-Identifier: AGPL-3.0-or-later++-module(channel_types).+-typing([eqwalizer]).++-export([is_category/1, is_public_thread/1, is_thread_only/1]).++-define(GUILD_CATEGORY, 4).+-define(ANNOUNCEMENT_THREAD, 10).+-define(PUBLIC_THREAD, 11).+-define(GUILD_FORUM, 15).+-define(GUILD_MEDIA, 16).++-spec is_category(term()) -> boolean().+is_category(Type) ->+ Type =:= ?GUILD_CATEGORY.++-spec is_public_thread(term()) -> boolean().+is_public_thread(Type) ->+ Type =:= ?ANNOUNCEMENT_THREAD orelse Type =:= ?PUBLIC_THREAD.++-spec is_thread_only(term()) -> boolean().+is_thread_only(Type) ->+ Type =:= ?GUILD_FORUM orelse Type =:= ?GUILD_MEDIA.diff --git a/fluxer_gateway/src/utils/type_conv.erl b/fluxer_gateway/src/utils/type_conv.erlindex f192bacbd..a6baf7d28 100644--- a/fluxer_gateway/src/utils/type_conv.erl+++ b/fluxer_gateway/src/utils/type_conv.erl@@ -4,6 +4,7 @@-typing([eqwalizer]).-export([+ is_true/1,to_integer/1,to_binary/1,ensure_binary/1,@@ -12,15 +13,9 @@extract_id/2]).--export_type([- convertible_to_integer/0,- convertible_to_binary/0,- convertible_to_list/0-]).---type convertible_to_integer() :: integer() | binary() | list() | atom().--type convertible_to_binary() :: binary() | integer() | list() | atom().--type convertible_to_list() :: list() | binary() | atom().+-spec is_true(term()) -> boolean().+is_true(true) -> true;+is_true(_) -> false.-spec to_integer(term()) -> integer() | undefined.to_integer(undefined) ->