Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

refactor(gateway): type presence helpers, drop inline tests

Hampus6db74b10401e
diff --git a/fluxer_gateway/src/guild/guild_presence_reconcile.erl b/fluxer_gateway/src/guild/guild_presence_reconcile.erl
index 176b3b123..bb7199cc5 100644
--- a/fluxer_gateway/src/guild/guild_presence_reconcile.erl
+++ b/fluxer_gateway/src/guild/guild_presence_reconcile.erl
@@ -5,17 +5,13 @@
-export([
schedule/0,
- interval_ms/0,
start_async/1,
reconcile_user/2,
maybe_schedule_user_repair/2,
- find_mismatches/3,
- apply_mismatches/2,
- connected_user_ids_list/1,
- reconcile_action/3
+ apply_mismatches/2
]).
--export_type([guild_state/0, user_id/0, presence/0, presence_by_id/0, mismatch/0]).
+-export_type([guild_state/0, user_id/0, mismatch/0]).
-type guild_state() :: map().
-type user_id() :: integer().
@@ -83,10 +79,8 @@ find_mismatches(UserIds, Authoritative, Tab) ->
fun(UserId) ->
Seen = tab_display(UserId, Tab),
Presence = lookup_presence_value(UserId, Authoritative),
- case desired_display(Presence) =:= Seen of
- true -> false;
- false -> {true, {UserId, replay_payload(Presence), Seen}}
- end
+ desired_display(Presence) =/= Seen andalso
+ {true, {UserId, replay_payload(Presence), Seen}}
end,
UserIds
).
@@ -104,19 +98,18 @@ mismatch_key({UserId, Payload, Seen}) ->
apply_mismatches(Mismatches, State) ->
Connected = guild_member_list_connected:connected_session_user_ids(State),
lists:foldl(
- fun({UserId, Payload, Seen}, Acc) ->
- case
- sets:is_element(UserId, Connected) andalso
- current_display(UserId, Acc) =:= Seen
- of
- true -> replay_presence(UserId, Payload, Acc);
- false -> Acc
- end
- end,
+ fun(Mismatch, Acc) -> replay_if_unchanged(Mismatch, Connected, Acc) end,
State,
Mismatches
).
+-spec replay_if_unchanged(mismatch(), sets:set(user_id()), guild_state()) -> guild_state().
+replay_if_unchanged({UserId, Payload, Seen}, Connected, State) ->
+ case sets:is_element(UserId, Connected) andalso current_display(UserId, State) =:= Seen of
+ true -> replay_presence(UserId, Payload, State);
+ false -> State
+ end.
+
-spec member_presence_tab(guild_state()) -> ets:tid() | undefined.
member_presence_tab(State) ->
case maps:get(member_presence, State, undefined) of
@@ -272,228 +265,3 @@ presence_user_id(Presence) ->
_ ->
undefined
end.
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
-reconcile_action_noop_when_already_online_test() ->
- State = state_with_presence(#{1 => dnd_presence(1)}),
- ?assertEqual(noop, reconcile_action(1, dnd_presence(1), State)).
-
-reconcile_action_replays_when_member_presence_missing_test() ->
- State = state_with_presence(#{}),
- ?assertMatch({replay, _}, reconcile_action(1, dnd_presence(1), State)).
-
-reconcile_action_replays_offline_when_stale_online_test() ->
- State = state_with_presence(#{1 => dnd_presence(1)}),
- ?assertEqual(
- {replay, #{<<"status">> => <<"offline">>}}, reconcile_action(1, undefined, State)
- ).
-
-reconcile_action_noop_when_already_offline_test() ->
- State = state_with_presence(#{}),
- ?assertEqual(noop, reconcile_action(1, undefined, State)).
-
-apply_mismatches_repairs_connected_offline_member_test() ->
- with_engine_state(fun(State, Engine) ->
- ok = guild_member_list_engine:bulk_load(
- Engine, [{99, <<"hampus">>, [], false}], []
- ),
- NewState = apply_mismatches([{99, dnd_presence(99), offline_display()}], State),
- ?assertEqual({1, 1}, guild_member_list_engine:get_counts(Engine)),
- Row = guild_state_member:lookup_presence(maps:get(member_presence, NewState), 99),
- ?assertEqual(<<"dnd">>, maps:get(<<"status">>, Row))
- end).
-
-apply_mismatches_marks_stale_online_offline_test() ->
- with_engine_state(fun(State, Engine) ->
- ets:insert(maps:get(member_presence, State), {99, dnd_presence(99)}),
- ok = guild_member_list_engine:bulk_load(
- Engine, [{99, <<"hampus">>, [], true}], []
- ),
- Seen = display_fields(dnd_presence(99)),
- _ = apply_mismatches([{99, replay_payload(undefined), Seen}], State),
- ?assertEqual({1, 0}, guild_member_list_engine:get_counts(Engine))
- end).
-
-apply_mismatches_skips_row_updated_after_observation_test() ->
- with_engine_state(fun(State, Engine) ->
- Tab = maps:get(member_presence, State),
- ets:insert(Tab, {99, dnd_presence(99)}),
- ok = guild_member_list_engine:bulk_load(
- Engine, [{99, <<"hampus">>, [], true}], []
- ),
- Stale = {99, idle_presence(99), offline_display()},
- _ = apply_mismatches([Stale], State),
- ?assertEqual(
- <<"dnd">>, maps:get(<<"status">>, guild_state_member:lookup_presence(Tab, 99))
- ),
- ?assertEqual({1, 1}, guild_member_list_engine:get_counts(Engine))
- end).
-
-apply_mismatches_skips_disconnected_user_test() ->
- with_engine_state(fun(State, Engine) ->
- ok = guild_member_list_engine:bulk_load(
- Engine, [{99, <<"hampus">>, [], false}], []
- ),
- Disconnected = State#{connected_user_ids => sets:new()},
- _ = apply_mismatches([{99, dnd_presence(99), offline_display()}], Disconnected),
- ?assertEqual({1, 0}, guild_member_list_engine:get_counts(Engine)),
- ?assertEqual([], ets:lookup(maps:get(member_presence, State), 99))
- end).
-
-find_mismatches_test() ->
- State = state_with_presence(#{1 => dnd_presence(1), 2 => dnd_presence(2)}),
- Tab = maps:get(member_presence, State),
- Authoritative = #{1 => dnd_presence(1), 3 => idle_presence(3), 4 => invisible_presence(4)},
- ?assertEqual(
- [
- {2, replay_payload(undefined), display_fields(dnd_presence(2))},
- {3, idle_presence(3), offline_display()}
- ],
- find_mismatches([1, 2, 3, 4], Authoritative, Tab)
- ).
-
-find_mismatches_agrees_with_reconcile_action_test() ->
- State = state_with_presence(#{1 => dnd_presence(1), 2 => dnd_presence(2)}),
- Tab = maps:get(member_presence, State),
- Authoritative = #{1 => dnd_presence(1), 3 => idle_presence(3), 4 => invisible_presence(4)},
- Expected = [
- {UserId, Payload}
- || UserId <- [1, 2, 3, 4],
- {replay, Payload} <- [
- reconcile_action(UserId, lookup_presence_value(UserId, Authoritative), State)
- ]
- ],
- ?assertEqual(
- Expected,
- [
- {UserId, Payload}
- || {UserId, Payload, _} <- find_mismatches([1, 2, 3, 4], Authoritative, Tab)
- ]
- ).
-
-confirmed_mismatches_keeps_only_repeated_observations_test() ->
- Offline = offline_display(),
- Dnd = display_fields(dnd_presence(1)),
- First = [
- {1, dnd_presence(1), Offline},
- {2, dnd_presence(2), Offline},
- {3, idle_presence(3), Offline},
- {4, dnd_presence(4), Offline}
- ],
- Second = [
- {1, (dnd_presence(1))#{<<"activities">> => []}, Offline},
- {2, idle_presence(2), Offline},
- {3, idle_presence(3), Dnd}
- ],
- ?assertEqual([hd(Second)], confirmed_mismatches(First, Second)).
-
-persistent_mismatches_confirms_across_two_reads_test() ->
- meck:new(presence_cache, [passthrough]),
- try
- State = state_with_presence(#{3 => dnd_presence(3)}),
- Tab = maps:get(member_presence, State),
- meck:expect(
- presence_cache,
- bulk_get,
- 1,
- meck:seq([
- [dnd_presence(1), dnd_presence(2), dnd_presence(3)],
- [dnd_presence(1), idle_presence(2)]
- ])
- ),
- ?assertEqual(
- [{1, dnd_presence(1), offline_display()}],
- persistent_mismatches([1, 2, 3], Tab, 0)
- ),
- ?assertEqual([[1, 2, 3], [1, 2]], [
- Ids
- || {_, {_, bulk_get, [Ids]}, _} <- meck:history(presence_cache)
- ])
- after
- meck:unload(presence_cache)
- end.
-
-persistent_mismatches_skips_second_read_when_consistent_test() ->
- meck:new(presence_cache, [passthrough]),
- try
- State = state_with_presence(#{1 => dnd_presence(1)}),
- meck:expect(presence_cache, bulk_get, 1, [dnd_presence(1)]),
- ?assertEqual([], persistent_mismatches([1], maps:get(member_presence, State), 0)),
- ?assertEqual(1, meck:num_calls(presence_cache, bulk_get, 1))
- after
- meck:unload(presence_cache)
- end.
-
-with_engine_state(Fun) ->
- Engine = guild_member_list_engine:new(),
- try
- Fun(guild_test_state(4242, 99, Engine), Engine)
- after
- guild_member_list_engine:destroy(Engine)
- end.
-
-guild_test_state(GuildId, UserId, Engine) ->
- Data = guild_data_index:normalize_data(#{
- <<"guild">> => #{<<"owner_id">> => integer_to_binary(UserId)},
- <<"roles">> => [
- #{
- <<"id">> => integer_to_binary(GuildId),
- <<"name">> => <<"everyone">>,
- <<"hoist">> => false,
- <<"position">> => 0,
- <<"permissions">> => <<"0">>
- }
- ],
- <<"members">> => [
- #{
- <<"user">> => #{
- <<"id">> => integer_to_binary(UserId),
- <<"username">> => <<"hampus">>
- },
- <<"roles">> => []
- }
- ],
- <<"channels">> => []
- }),
- #{
- id => GuildId,
- data => Data,
- sessions => #{},
- member_presence => ets:new(test_member_presence, [set, public]),
- connected_user_ids => sets:from_list([UserId]),
- member_list_engine => Engine,
- channel_member_list_engines => #{},
- member_list_subscriptions => guild_member_list_subs:new(),
- member_subscriptions => guild_subscriptions:init_state(),
- presence_subscriptions => #{UserId => 1}
- }.
-
-state_with_presence(PresenceMap) ->
- Tab = ets:new(test_member_presence, [set, public]),
- maps:foreach(fun(UserId, Presence) -> ets:insert(Tab, {UserId, Presence}) end, PresenceMap),
- #{
- member_presence => Tab,
- connected_user_ids => sets:from_list(maps:keys(PresenceMap))
- }.
-
-dnd_presence(UserId) ->
- status_presence(UserId, <<"dnd">>).
-
-idle_presence(UserId) ->
- status_presence(UserId, <<"idle">>).
-
-invisible_presence(UserId) ->
- status_presence(UserId, <<"invisible">>).
-
-status_presence(UserId, Status) ->
- #{
- <<"status">> => Status,
- <<"mobile">> => false,
- <<"afk">> => false,
- <<"custom_status">> => null,
- <<"user">> => #{<<"id">> => UserId}
- }.
-
--endif.
diff --git a/fluxer_gateway/src/presence/presence_broadcast.erl b/fluxer_gateway/src/presence/presence_broadcast.erl
index 817803b40..296ef5f88 100644
--- a/fluxer_gateway/src/presence/presence_broadcast.erl
+++ b/fluxer_gateway/src/presence/presence_broadcast.erl
@@ -12,7 +12,6 @@
is_last_published_visible/1,
cache_if_visible/2,
current_visible_presence/1,
- map_from_ids/1,
normalize_group_dm_recipients/3
]).
@@ -136,10 +135,6 @@ current_visible_presence(State) ->
_ -> {ok, Payload}
end.
--spec map_from_ids([term()]) -> #{term() => true}.
-map_from_ids(Ids) when is_list(Ids) ->
- presence_broadcast_subscriptions:map_from_ids(Ids).
-
-spec normalize_group_dm_recipients(map(), user_id(), boolean()) ->
#{integer() => #{user_id() => true}}.
normalize_group_dm_recipients(_RecipientsByChannel, _UserId, true) ->
@@ -216,63 +211,3 @@ dispatch_global_user_update(TargetId, Payload, State) ->
dispatch_to_sessions(Payload, State) ->
SessionPids = presence_connect:collect_session_pids(State),
gateway_dispatch_relay:dispatch_many(SessionPids, presence_update, Payload).
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
-expiry_timer_not_armed_without_expires_at_test() ->
- ?assertNot(
- maps:is_key(
- ?CUSTOM_STATUS_EXPIRY_TIMER,
- refresh_custom_status_expiry_timer(#{custom_status => null})
- )
- ),
- ?assertNot(
- maps:is_key(
- ?CUSTOM_STATUS_EXPIRY_TIMER,
- refresh_custom_status_expiry_timer(#{
- custom_status => #{<<"text">> => <<"hi">>}
- })
- )
- ).
-
-expiry_timer_armed_for_a_future_expiry_test() ->
- State = refresh_custom_status_expiry_timer(#{custom_status => future_custom_status()}),
- ?assert(is_reference(maps:get(?CUSTOM_STATUS_EXPIRY_TIMER, State))),
- ok = cancel_expiry_timer(maps:get(?CUSTOM_STATUS_EXPIRY_TIMER, State)).
-
-expiry_timer_not_armed_for_an_already_expired_status_test() ->
- Expired = #{<<"expires_at">> => <<"2020-01-01T00:00:00.000Z">>},
- State = refresh_custom_status_expiry_timer(#{custom_status => Expired}),
- ?assertNot(maps:is_key(?CUSTOM_STATUS_EXPIRY_TIMER, State)).
-
-expiry_timer_replaces_the_previous_one_test() ->
- First = refresh_custom_status_expiry_timer(#{custom_status => future_custom_status()}),
- Second = refresh_custom_status_expiry_timer(First),
- ?assertNotEqual(
- maps:get(?CUSTOM_STATUS_EXPIRY_TIMER, First),
- maps:get(?CUSTOM_STATUS_EXPIRY_TIMER, Second)
- ),
- ok = cancel_expiry_timer(maps:get(?CUSTOM_STATUS_EXPIRY_TIMER, Second)).
-
-expiry_timer_is_dropped_when_the_status_is_cleared_test() ->
- Armed = refresh_custom_status_expiry_timer(#{custom_status => future_custom_status()}),
- Cleared = refresh_custom_status_expiry_timer(Armed#{custom_status => null}),
- ?assertNot(maps:is_key(?CUSTOM_STATUS_EXPIRY_TIMER, Cleared)).
-
-expiry_timer_delivers_a_reconcile_cast_test() ->
- State = arm_expiry_timer({ok, 1}, #{}),
- ?assert(is_reference(maps:get(?CUSTOM_STATUS_EXPIRY_TIMER, State))),
- Expected = custom_status_expiry:reconcile_message(),
- receive
- Expected -> ok
- after 1000 -> ?assert(false)
- end.
-
-future_custom_status() ->
- ExpiresAt = calendar:system_time_to_rfc3339(
- erlang:system_time(millisecond) + 3600000, [{unit, millisecond}, {offset, "Z"}]
- ),
- #{<<"text">> => <<"brb">>, <<"expires_at">> => list_to_binary(ExpiresAt)}.
-
--endif.
diff --git a/fluxer_gateway/src/presence/presence_cache_anti_entropy.erl b/fluxer_gateway/src/presence/presence_cache_anti_entropy.erl
index 8f661bb49..28eae7c2f 100644
--- a/fluxer_gateway/src/presence/presence_cache_anti_entropy.erl
+++ b/fluxer_gateway/src/presence/presence_cache_anti_entropy.erl
@@ -97,7 +97,7 @@ tombstones(State) ->
tombstone_order(State) ->
Order = maps:get(delete_tombstone_order, State, undefined),
case queue:is_queue(Order) of
- true -> Order;
+ true -> eqwalizer:dynamic_cast(Order);
false -> queue:new()
end.
@@ -248,46 +248,3 @@ is_visible_presence(Presence) ->
<<"dnd">> -> true;
_ -> false
end.
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
-prune_tombstones_drops_expired_order_test() ->
- Now = now_ms(),
- State = #{
- delete_tombstones => #{1 => Now - 1, 2 => Now + 60000},
- delete_tombstone_order => queue:from_list([{Now - 1, 1}, {Now + 60000, 2}])
- },
- Pruned = prune_tombstones(State),
- ?assertEqual(#{2 => Now + 60000}, maps:get(delete_tombstones, Pruned)),
- ?assertEqual([{Now + 60000, 2}], queue:to_list(maps:get(delete_tombstone_order, Pruned))).
-
-record_delete_above_limit_costs_bounded_work_test_() ->
- {timeout, 120, fun assert_record_delete_above_limit_is_amortised/0}.
-
-assert_record_delete_above_limit_is_amortised() ->
- Batch = 1000,
- Empty = #{delete_tombstones => #{}, delete_tombstone_order => queue:new()},
- Filled = record_delete_range(Empty, 1, ?TOMBSTONE_LIMIT - Batch),
- {BelowCost, AtLimit} = measure_record_deletes(
- Filled, ?TOMBSTONE_LIMIT - Batch + 1, ?TOMBSTONE_LIMIT
- ),
- ?assertEqual(?TOMBSTONE_LIMIT, maps:size(tombstones(AtLimit))),
- {AboveCost, Above} = measure_record_deletes(
- AtLimit, ?TOMBSTONE_LIMIT + 1, ?TOMBSTONE_LIMIT + Batch
- ),
- ?assert(AboveCost < BelowCost * 20),
- ?assertEqual(?TOMBSTONE_LIMIT, maps:size(tombstones(Above))),
- ?assert(maps:is_key(?TOMBSTONE_LIMIT + Batch, tombstones(Above))),
- ?assertNot(maps:is_key(1, tombstones(Above))).
-
-measure_record_deletes(State, From, To) ->
- {reductions, Before} = erlang:process_info(self(), reductions),
- NewState = record_delete_range(State, From, To),
- {reductions, After} = erlang:process_info(self(), reductions),
- {After - Before, NewState}.
-
-record_delete_range(State, From, To) ->
- lists:foldl(fun record_delete/2, State, lists:seq(From, To)).
-
--endif.
diff --git a/fluxer_gateway/src/presence/presence_cache_shard.erl b/fluxer_gateway/src/presence/presence_cache_shard.erl
index 3723fd981..74c00f4b0 100644
--- a/fluxer_gateway/src/presence/presence_cache_shard.erl
+++ b/fluxer_gateway/src/presence/presence_cache_shard.erl
@@ -4,8 +4,6 @@
-typing([eqwalizer]).
-behaviour(gen_server).
--include_lib("fluxer_gateway/include/timeout_config.hrl").
-
-export([start_link/1, table_name/1, write_put/3, write_delete/2]).
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
@@ -85,7 +83,7 @@ code_change(_OldVsn, State, _Extra) ->
-spec do_get(atom(), term()) -> {ok, map()} | not_found.
do_get(Table, UserId) ->
case safe_ets_lookup(Table, UserId) of
- [{_, Presence}] -> {ok, Presence};
+ [{_, Presence}] -> {ok, eqwalizer:dynamic_cast(Presence)};
_ -> not_found
end.
@@ -99,7 +97,7 @@ do_bulk_get(Table, UserIds) ->
-spec filtermap_ets_lookup(atom(), term()) -> {true, map()} | false.
filtermap_ets_lookup(Table, Uid) ->
case safe_ets_lookup(Table, Uid) of
- [{_, Presence}] -> {true, Presence};
+ [{_, Presence}] -> {true, eqwalizer:dynamic_cast(Presence)};
_ -> false
end.
@@ -195,39 +193,3 @@ safe_ets_lookup(Table, Key) ->
error:_Reason -> [];
exit:_Reason -> []
end.
-
--spec normalize_start_link(gen_server:start_ret()) -> {ok, pid()} | {error, term()}.
-normalize_start_link({ok, Pid}) ->
- {ok, Pid};
-normalize_start_link({error, Reason}) ->
- {error, Reason};
-normalize_start_link(ignore) ->
- {error, ignore}.
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
-do_put_online_inserts_test() ->
- Table = test_cache_table,
- ets:new(Table, [named_table, public, set]),
- ?assertEqual(ok, do_put(Table, 1, #{<<"status">> => <<"online">>})),
- ?assertMatch([{1, _}], ets:lookup(Table, 1)),
- ets:delete(Table).
-
-do_put_offline_deletes_test() ->
- Table = test_cache_table_2,
- ets:new(Table, [named_table, public, set]),
- ets:insert(Table, {1, #{<<"status">> => <<"online">>}}),
- ?assertEqual(ok, do_put(Table, 1, #{<<"status">> => <<"offline">>})),
- ?assertEqual([], ets:lookup(Table, 1)),
- ets:delete(Table).
-
-do_put_invisible_deletes_test() ->
- Table = test_cache_table_3,
- ets:new(Table, [named_table, public, set]),
- ets:insert(Table, {1, #{<<"status">> => <<"online">>}}),
- ?assertEqual(ok, do_put(Table, 1, #{<<"status">> => <<"invisible">>})),
- ?assertEqual([], ets:lookup(Table, 1)),
- ets:delete(Table).
-
--endif.
diff --git a/fluxer_gateway/src/presence/presence_cache_shards.erl b/fluxer_gateway/src/presence/presence_cache_shards.erl
index 4604a4aa8..09d0784bb 100644
--- a/fluxer_gateway/src/presence/presence_cache_shards.erl
+++ b/fluxer_gateway/src/presence/presence_cache_shards.erl
@@ -280,7 +280,7 @@ merge_bulk_reply(_, AccMap) ->
-spec merge_snapshot_reply(term(), #{integer() => map()}) -> #{integer() => map()}.
merge_snapshot_reply(Snapshot, AccMap) when is_map(Snapshot) ->
- maps:merge(AccMap, Snapshot);
+ maps:merge(AccMap, eqwalizer:dynamic_cast(Snapshot));
merge_snapshot_reply(_, AccMap) ->
AccMap.
diff --git a/fluxer_gateway/src/presence/presence_targets.erl b/fluxer_gateway/src/presence/presence_targets.erl
index 919148efd..b76434f3d 100644
--- a/fluxer_gateway/src/presence/presence_targets.erl
+++ b/fluxer_gateway/src/presence/presence_targets.erl
@@ -84,15 +84,18 @@ connected_guild_dm_partners(State) ->
Guilds = maps:get(guilds, State, #{}),
maps:fold(
fun(GuildId, PartnerIds, Acc) ->
- case maps:get(GuildId, Guilds, undefined) of
- {Pid, _Ref} when is_pid(Pid), is_map(PartnerIds) -> maps:merge(Acc, PartnerIds);
- _ -> Acc
- end
+ merge_connected(maps:get(GuildId, Guilds, undefined), PartnerIds, Acc)
end,
#{},
maps:get(dm_mutual_by_guild, State, #{})
).
+-spec merge_connected(term(), term(), #{user_id() => true}) -> #{user_id() => true}.
+merge_connected({Pid, _Ref}, PartnerIds, Acc) when is_pid(Pid), is_map(PartnerIds) ->
+ maps:merge(Acc, eqwalizer:dynamic_cast(PartnerIds));
+merge_connected(_GuildRef, _PartnerIds, Acc) ->
+ Acc.
+
-spec direct_dm_partner_ids(state()) -> [user_id()].
direct_dm_partner_ids(State) ->
UserId = maps:get(user_id, State, undefined),
@@ -178,75 +181,3 @@ list_value(Value) when is_list(Value) ->
Value;
list_value(_) ->
[].
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
-friend_ids_from_state_filters_relationship_types_test() ->
- State = #{
- relationships =>
- #{
- 10 => 1,
- 11 => 3,
- 12 => 4,
- 13 => 2
- }
- },
- Ids = lists:sort(friend_ids_from_state(State)),
- ?assertEqual([10], Ids).
-
-group_dm_recipients_from_state_test() ->
- State = #{
- user_id => 1,
- channels => #{
- 100 => api_channel(<<"100">>, 3, [<<"2">>, <<"3">>]),
- 200 => api_channel(<<"200">>, 0, [<<"4">>])
- }
- },
- Result = group_dm_recipients_from_state(State),
- ?assertEqual(#{100 => #{2 => true, 3 => true}}, Result).
-
-group_dm_recipients_from_state_excludes_one_to_one_dms_test() ->
- State = #{
- user_id => 1,
- channels => #{
- 100 => api_channel(<<"100">>, 1, [<<"2">>]),
- 200 => api_channel(<<"200">>, 3, [<<"3">>, <<"4">>]),
- 300 => api_channel(<<"300">>, 0, [<<"5">>])
- }
- },
- Result = group_dm_recipients_from_state(State),
- ?assertEqual(#{200 => #{3 => true, 4 => true}}, Result).
-
-group_dm_recipients_excludes_self_test() ->
- State = #{
- user_id => 2,
- channels => #{
- 100 => api_channel(<<"100">>, 3, [<<"2">>, <<"3">>]),
- 200 => api_channel(<<"200">>, 1, [<<"2">>, <<"7">>])
- }
- },
- Result = group_dm_recipients_from_state(State),
- ?assertEqual(#{100 => #{3 => true}}, Result).
-
-group_dm_recipients_supports_recipient_ids_field_test() ->
- State = #{
- user_id => 1,
- channels => #{
- 100 => #{<<"type">> => 3, <<"recipient_ids">> => [<<"2">>]}
- }
- },
- Result = group_dm_recipients_from_state(State),
- ?assertEqual(#{100 => #{2 => true}}, Result).
-
-api_channel(IdBin, Type, RecipientIdBins) ->
- #{
- <<"id">> => IdBin,
- <<"type">> => Type,
- <<"recipients">> => [
- #{<<"id">> => RBin, <<"username">> => <<"user-", RBin/binary>>}
- || RBin <- RecipientIdBins
- ]
- }.
-
--endif.
diff --git a/fluxer_gateway/src/utils/custom_status_expiry.erl b/fluxer_gateway/src/utils/custom_status_expiry.erl
index a82a69e3b..2e06d75f0 100644
--- a/fluxer_gateway/src/utils/custom_status_expiry.erl
+++ b/fluxer_gateway/src/utils/custom_status_expiry.erl
@@ -11,7 +11,7 @@
reconcile_message/0
]).
--export_type([custom_status/0]).
+-export_type([custom_status/0, wakeup/0, offset/0]).
-type custom_status() :: map() | null.
-type wakeup() :: {ok, pos_integer()} | none.
@@ -63,7 +63,7 @@ expires_at_ms(_Value) ->
-spec parse_rfc3339(term()) -> offset().
parse_rfc3339(Chars) ->
- try calendar:rfc3339_to_system_time(Chars, [{unit, millisecond}]) of
+ try calendar:rfc3339_to_system_time(eqwalizer:dynamic_cast(Chars), [{unit, millisecond}]) of
Ms -> {ok, Ms}
catch
_Class:_Reason -> none
@@ -90,98 +90,3 @@ jittered(DelayMs) ->
-spec reconcile_message() -> {'$gen_cast', reconcile_flattened_presence}.
reconcile_message() ->
{'$gen_cast', reconcile_flattened_presence}.
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
--define(LIVE_EXPIRES_AT, <<"2026-05-13T13:02:27.497Z">>).
-
-epoch_ms(Iso) ->
- calendar:rfc3339_to_system_time(binary_to_list(Iso), [{unit, millisecond}]).
-
-rfc3339(EpochMs) ->
- list_to_binary(
- calendar:system_time_to_rfc3339(EpochMs, [{unit, millisecond}, {offset, "Z"}])
- ).
-
-expiry_ms() ->
- epoch_ms(?LIVE_EXPIRES_AT).
-
-status(ExpiresAt) ->
- #{
- <<"emoji_animated">> => false,
- <<"emoji_name">> => null,
- <<"expires_at">> => ExpiresAt,
- <<"text">> => <<"brb">>
- }.
-
-status_without_expiry() ->
- #{<<"emoji_animated">> => false, <<"emoji_name">> => null, <<"text">> => <<"brb">>}.
-
-not_expired_test() ->
- Status = status(?LIVE_EXPIRES_AT),
- ?assertEqual(Status, clear_if_expired(Status, expiry_ms() - 60000)).
-
-expires_one_second_in_the_future_test() ->
- Status = status(?LIVE_EXPIRES_AT),
- ?assertEqual({ok, 1000}, remaining_ms(Status, expiry_ms() - 1000)),
- ?assertEqual(Status, clear_if_expired(Status, expiry_ms() - 1000)).
-
-boundary_is_expired_test() ->
- Status = status(?LIVE_EXPIRES_AT),
- ?assertEqual({ok, 0}, remaining_ms(Status, expiry_ms())),
- ?assertEqual(null, clear_if_expired(Status, expiry_ms())).
-
-expired_test() ->
- Status = status(?LIVE_EXPIRES_AT),
- ?assertEqual(null, clear_if_expired(Status, expiry_ms() + 1)),
- ?assertEqual(null, clear_if_expired(Status, expiry_ms() + 194 * 86400000)).
-
-absent_expires_at_is_kept_test() ->
- Status = status_without_expiry(),
- ?assertEqual(none, remaining_ms(Status, expiry_ms())),
- ?assertEqual(Status, clear_if_expired(Status, expiry_ms())).
-
-null_expires_at_is_kept_test() ->
- Status = status(null),
- ?assertEqual(none, remaining_ms(Status, expiry_ms())),
- ?assertEqual(Status, clear_if_expired(Status, expiry_ms())).
-
-malformed_expires_at_is_kept_test() ->
- lists:foreach(
- fun(Value) ->
- Status = status(Value),
- ?assertEqual(none, remaining_ms(Status, expiry_ms())),
- ?assertEqual(Status, clear_if_expired(Status, expiry_ms()))
- end,
- [<<"">>, <<"not-a-date">>, <<"2026-13-45T99:99:99Z">>, 1747141347, [], #{}, true]
- ).
-
-wakeup_none_without_expiry_test() ->
- ?assertEqual(none, wakeup_delay(remaining_ms(status_without_expiry(), expiry_ms()))),
- ?assertEqual(none, wakeup_delay(remaining_ms(null, expiry_ms()))).
-
-wakeup_none_when_already_expired_test() ->
- ?assertEqual(none, wakeup_delay({ok, 0})),
- ?assertEqual(none, wakeup_delay({ok, -1000})).
-
-wakeup_is_never_early_test() ->
- {ok, DelayMs} = wakeup_delay({ok, 1000}),
- ?assert(DelayMs > 1000),
- ?assert(DelayMs =< 1000 + ?WAKEUP_JITTER_MS).
-
-wakeup_clamps_to_the_timer_limit_test() ->
- {ok, DelayMs} = wakeup_delay({ok, 400 * ?MAX_TIMER_MS}),
- ?assert(DelayMs > ?MAX_TIMER_MS),
- ?assert(DelayMs =< ?MAX_TIMER_MS + ?WAKEUP_JITTER_MS).
-
-clears_expired_and_arms_future_test() ->
- Live = future_status(),
- ?assertEqual(null, clear_if_expired(status(?LIVE_EXPIRES_AT))),
- ?assertEqual(Live, clear_if_expired(Live)),
- ?assertMatch({ok, _}, next_wakeup_ms(Live)).
-
-future_status() ->
- status(rfc3339(erlang:system_time(millisecond) + 3600000)).
-
--endif.