A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(gateway): add a created channel to viewable maps, drop tests
Hampusf9b3a67409bd
diff --git a/fluxer_gateway/src/guild/guild_state.erl b/fluxer_gateway/src/guild/guild_state.erlindex 3b1d8316d..f1733e7c3 100644--- a/fluxer_gateway/src/guild/guild_state.erl+++ b/fluxer_gateway/src/guild/guild_state.erl@@ -11,9 +11,9 @@-type event_data() :: map().-type user_id() :: integer().--export_type([guild_state/0, event/0, event_data/0]).+-export_type([guild_state/0]).--spec update_state(event(), event_data(), guild_state()) -> guild_state().+-spec update_state(atom(), map(), guild_state()) -> guild_state().update_state(Event, EventData, State) ->StateWithUpdatedUser0 = guild_user_data:maybe_update_cached_user_data(Event, EventData, State@@ -21,7 +21,7 @@ update_state(Event, EventData, State) ->Data0 = maps:get(data, StateWithUpdatedUser0),Data = ensure_normalized(Data0),StateWithUpdatedUser = StateWithUpdatedUser0#{data => Data},- UpdatedData = update_data_for_event(Event, EventData, Data, State),+ UpdatedData = update_data_for_event(Event, EventData, Data),UpdatedState = StateWithUpdatedUser#{data => UpdatedData},maybe_latch_stale_engines(Event, handle_post_update(Event, EventData, StateWithUpdatedUser, UpdatedState)@@ -50,22 +50,22 @@ ensure_normalized(Data) ->false -> guild_data_index:normalize_map(Data)end.--spec update_data_for_event(event(), event_data(), guild_data(), guild_state()) -> guild_data().-update_data_for_event(Event, EventData, Data, State) ->- case update_member_event(Event, EventData, Data, State) of+-spec update_data_for_event(event(), event_data(), guild_data()) -> guild_data().+update_data_for_event(Event, EventData, Data) ->+ case update_member_event(Event, EventData, Data) of{handled, Result} -> Result;unhandled -> update_other_event(Event, EventData, Data)end.--spec update_member_event(event(), event_data(), guild_data(), guild_state()) ->+-spec update_member_event(event(), event_data(), guild_data()) ->{handled, guild_data()} | unhandled.-update_member_event(guild_member_add, EventData, Data, _State) ->+update_member_event(guild_member_add, EventData, Data) ->{handled, guild_state_member:handle_member_add(EventData, Data)};-update_member_event(guild_member_update, EventData, Data, _State) ->+update_member_event(guild_member_update, EventData, Data) ->{handled, guild_state_member:handle_member_update(EventData, Data)};-update_member_event(guild_member_remove, EventData, Data, State) ->- {handled, guild_state_member:handle_member_remove(EventData, Data, State)};-update_member_event(_Event, _EventData, _Data, _State) ->+update_member_event(guild_member_remove, EventData, Data) ->+ {handled, guild_state_member:handle_member_remove(EventData, Data)};+update_member_event(_Event, _EventData, _Data) ->unhandled.-spec update_other_event(event(), event_data(), guild_data()) -> guild_data().@@ -104,7 +104,6 @@ update_channel_event(_Event, _EventData, Data) ->-spec handle_post_update(event(), event_data(), guild_state(), guild_state()) -> guild_state().handle_post_update(guild_update, _EventData, OldState, NewState) ->- maybe_sync_member_list_permission_state(NewState),guild_availability:handle_unavailability_transition(OldState, NewState);handle_post_update(guild_member_add, EventData, _OldState, NewState) ->guild_state_member:sync_member(EventData, NewState),@@ -159,9 +158,8 @@ resync_roles_after_permission_change(RoleIds, OldState, NewState) ->Recomputed.-spec post_update_channel(event(), event_data(), guild_state(), guild_state()) -> guild_state().-post_update_channel(channel_create, _EventData, _OldState, NewState) ->- maybe_sync_member_list_permission_state(NewState),- NewState;+post_update_channel(channel_create, EventData, _OldState, NewState) ->+ guild_visibility_channels:add_created_channel_to_sessions(EventData, NewState);post_update_channel(channel_update, EventData, OldState, NewState) ->ChanIds = guild_state_channels:extract_channel_ids_from_channel_update(EventData),resync_channels_after_permission_change(ChanIds, OldState, NewState);@@ -169,7 +167,6 @@ post_update_channel(channel_update_bulk, EventData, OldState, NewState) ->ChanIds = guild_state_channels:extract_channel_ids_from_channel_update_bulk(EventData),resync_channels_after_permission_change(ChanIds, OldState, NewState);post_update_channel(channel_delete, EventData, _OldState, NewState) ->- maybe_sync_member_list_permission_state(NewState),ChannelId = snowflake_id:parse_optional(maps:get(<<"id">>, EventData, undefined)),ok = guild_voice_lifecycle:cast_disconnect_all_voice_users_in_channel(ChannelId, NewState),NewState.@@ -230,94 +227,3 @@ refresh_member_session_cache(UserId, State) when is_integer(UserId), UserId > 0guild_sessions:refresh_user_session_cache(UserId, State);refresh_member_session_cache(_UserId, State) ->State.---spec maybe_sync_member_list_permission_state(guild_state()) -> ok.-maybe_sync_member_list_permission_state(_State) ->- ok.---ifdef(TEST).--include_lib("eunit/include/eunit.hrl").--guild_member_remove_asks_the_voice_server_to_disconnect_test() ->- Self = self(),- VoicePid = spawn(fun() ->- receive- Message -> Self ! {voice_server_got, Message}- end- end),- State = build_voice_test_state(VoicePid),- EventData = #{<<"user">> => #{<<"id">> => <<"5">>}},- UpdatedState = update_state(guild_member_remove, EventData, State),- ?assertEqual(#{}, maps:get(sessions, UpdatedState, #{})),- receive- {voice_server_got, {'$gen_cast', {disconnect_voice_user, Request}}} ->- ?assertEqual(#{user_id => 5, connection_id => null}, Request)- after 200 ->- exit(VoicePid, kill),- ?assert(false)- end.--guild_member_remove_leaves_the_stale_guild_copy_alone_test() ->- VoicePid = spawn(fun() ->- receive- _ -> ok- end- end),- State = build_voice_test_state(VoicePid),- UpdatedState = update_state(- guild_member_remove, #{<<"user">> => #{<<"id">> => <<"5">>}}, State- ),- ?assertEqual(maps:get(voice_states, State), maps:get(voice_states, UpdatedState)).--build_voice_test_state(VoicePid) ->- #{- id => 42,- data => #{- <<"guild">> => #{<<"owner_id">> => <<"999">>},- <<"roles">> => [#{<<"id">> => <<"42">>, <<"permissions">> => <<"0">>}],- <<"members">> => #{5 => #{<<"user">> => #{<<"id">> => <<"5">>}, <<"roles">> => []}},- <<"channels">> => [#{<<"id">> => <<"20">>}]- },- voice_states => #{- <<"conn">> => #{- <<"user_id">> => <<"5">>,- <<"guild_id">> => <<"42">>,- <<"channel_id">> => <<"20">>,- <<"connection_id">> => <<"conn">>- }- },- sessions => #{<<"s1">> => #{user_id => 5, pid => self()}},- voice_server_pid => VoicePid- }.--make_cache_test_state(GuildId) ->- #{- id => GuildId,- data => #{<<"guild">> => #{<<"features">> => []}, <<"members">> => []},- sessions => #{}- }.--guild_update_syncs_unavailability_cache_test() ->- GuildId = 420042,- CleanupState = #{id => GuildId, data => #{<<"guild">> => #{<<"features">> => []}}},- _ = guild_availability:update_unavailability_cache_for_state(CleanupState),- try- State0 = make_cache_test_state(GuildId),- State1 = update_state(- guild_update,- #{<<"features">> => [<<"UNAVAILABLE_FOR_EVERYONE">>]},- State0- ),- ?assertEqual(- unavailable_for_everyone,- guild_availability_cache:get_cached_unavailability_mode(GuildId)- ),- _State2 = update_state(guild_update, #{<<"features">> => []}, State1),- ?assertEqual(- available, guild_availability_cache:get_cached_unavailability_mode(GuildId)- )- after- _ = guild_availability:update_unavailability_cache_for_state(CleanupState)- end.---endif.diff --git a/fluxer_gateway/src/guild/guild_visibility_channels.erl b/fluxer_gateway/src/guild/guild_visibility_channels.erlindex 15cbdbcdf..a61dfbabb 100644--- a/fluxer_gateway/src/guild/guild_visibility_channels.erl+++ b/fluxer_gateway/src/guild/guild_visibility_channels.erl@@ -15,7 +15,8 @@filter_connected_session_entries/1,ensure_viewable_channel_map/3,ensure_new_channel_visibility/5,- update_viewable_map_for_channel/3+ update_viewable_map_for_channel/3,+ add_created_channel_to_sessions/2]).-export_type([guild_state/0, user_id/0, channel_id/0]).@@ -66,16 +67,18 @@ shares_viewable_channel(UserId, ChannelMap, State) ->undefined ->false;Member ->- lists:any(- fun(Channel) ->- shares_channel_or_parent(- Channel, UserId, Member, ChannelMap, Channels, State- )- end,- Channels- )+ shares_any_channel(UserId, Member, ChannelMap, Channels, State)end.+-spec shares_any_channel(user_id(), map(), map(), [map()], guild_state()) -> boolean().+shares_any_channel(UserId, Member, ChannelMap, Channels, State) ->+ lists:any(+ fun(Channel) ->+ shares_channel_or_parent(Channel, UserId, Member, ChannelMap, Channels, State)+ end,+ Channels+ ).+-spec shares_channel_or_parent(map(), user_id(), map(), map(), [map()], guild_state()) ->boolean().shares_channel_or_parent(Channel, UserId, Member, ChannelMap, Channels, State) ->@@ -295,6 +298,59 @@ maybe_grant_virtual_access(UserId, ChannelId, State) ->{State2, true}end.+-spec add_created_channel_to_sessions(map(), guild_state()) -> guild_state().+add_created_channel_to_sessions(Channel, State) ->+ case channel_id(Channel) of+ ChannelId when is_integer(ChannelId) ->+ Added = [Id || Id <- [ChannelId, channel_parent_id(Channel)], is_integer(Id)],+ {Sessions, _Visible} = maps:fold(+ fun(SessionId, SessionData, {Acc, Memo}) ->+ add_created_channel(SessionId, SessionData, ChannelId, Added, State, {+ Acc, Memo+ })+ end,+ {maps:get(sessions, State, #{}), #{}},+ maps:get(sessions, State, #{})+ ),+ State#{sessions => Sessions};+ undefined ->+ State+ end.++-spec add_created_channel(+ binary(), map(), channel_id(), [channel_id()], guild_state(), {map(), map()}+) -> {map(), map()}.+add_created_channel(+ SessionId,+ #{user_id := UserId, viewable_channels := Viewable} = SessionData,+ ChannelId,+ Added,+ State,+ {Sessions, Memo}+) when is_integer(UserId), is_map(Viewable) ->+ {CanView, Memo1} =+ case maps:find(UserId, Memo) of+ {ok, Known} ->+ {Known, Memo};+ error ->+ Member = guild_permissions_check:find_member_by_user_id(UserId, State),+ Visible =+ Member =/= undefined andalso+ guild_permissions_check:can_view_channel(+ UserId, ChannelId, Member, State+ ),+ {Visible, Memo#{UserId => Visible}}+ end,+ case CanView of+ true ->+ NewViewable = maps:merge(Viewable, maps:from_keys(Added, true)),+ {Sessions#{SessionId => SessionData#{viewable_channels => NewViewable}}, Memo1};+ false ->+ {Sessions, Memo1}+ end;+add_created_channel(_SessionId, _SessionData, _ChannelId, _Added, _State, Acc) ->+ Acc.+-spec update_viewable_map_for_channel(map(), channel_id(), boolean()) -> map().update_viewable_map_for_channel(ViewableMap, ChannelId, true) ->ViewableMap#{ChannelId => true};@@ -317,21 +373,3 @@ channel_id(Channel) ->-spec channel_parent_id(map()) -> channel_id() | undefined.channel_parent_id(Channel) ->snowflake_id:parse_maybe(maps:get(<<"parent_id">>, Channel, undefined)).---ifdef(TEST).--include_lib("eunit/include/eunit.hrl").--get_user_viewable_channels_returns_empty_for_non_member_test() ->- State = #{- data => #{- <<"channels">> => [#{<<"id">> => <<"100">>, <<"type">> => 0}],- <<"members">> => []- }- },- ?assertEqual([], guild_visibility_channels:get_user_viewable_channels(999, State)).--viewable_channel_set_returns_empty_for_invalid_user_test() ->- State = #{data => #{}},- ?assertEqual(sets:new(), guild_visibility_channels:viewable_channel_set(0, State)).---endif.