From cb60d77b30523bd142417d56dbd59b38f0f9791b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chrz=C4=85szcz?=
 <pawel.chrzaszcz@erlang-solutions.com>
Date: Thu, 9 Feb 2023 08:16:09 +0100
Subject: [PATCH] Finish renaming Handler to ModState

It is module-specific state.
---
 src/c2s/mongoose_c2s.erl     | 20 ++++++++++----------
 src/c2s/mongoose_c2s_acc.erl |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/c2s/mongoose_c2s.erl b/src/c2s/mongoose_c2s.erl
index 92dc4275d59..37adcd04e6f 100644
--- a/src/c2s/mongoose_c2s.erl
+++ b/src/c2s/mongoose_c2s.erl
@@ -1039,24 +1039,24 @@ get_lang(#c2s_data{lang = Lang}) ->
 get_stream_id(#c2s_data{streamid = StreamId}) ->
     StreamId.
 
--spec get_mod_state(data(), atom()) -> {ok, term()} | {error, not_found}.
-get_mod_state(#c2s_data{state_mod = Handlers}, HandlerName) ->
-    case maps:get(HandlerName, Handlers, undefined) of
+-spec get_mod_state(data(), module()) -> {ok, term()} | {error, not_found}.
+get_mod_state(#c2s_data{state_mod = ModStates}, ModName) ->
+    case maps:get(ModName, ModStates, undefined) of
         undefined -> {error, not_found};
-        HandlerState -> {ok, HandlerState}
+        ModState -> {ok, ModState}
     end.
 
 -spec get_listener_opts(data()) -> listener_opts().
 get_listener_opts(#c2s_data{listener_opts = ListenerOpts}) ->
     ListenerOpts.
 
--spec merge_mod_state(data(), map()) -> data().
-merge_mod_state(StateData = #c2s_data{state_mod = StateHandlers}, MoreHandlers) ->
-    StateData#c2s_data{state_mod = maps:merge(StateHandlers, MoreHandlers)}.
+-spec merge_mod_state(data(), #{module() => term()}) -> data().
+merge_mod_state(StateData = #c2s_data{state_mod = ModStates}, MoreModStates) ->
+    StateData#c2s_data{state_mod = maps:merge(ModStates, MoreModStates)}.
 
--spec remove_mod_state(data(), atom()) -> data().
-remove_mod_state(StateData = #c2s_data{state_mod = Handlers}, HandlerName) ->
-    StateData#c2s_data{state_mod = maps:remove(HandlerName, Handlers)}.
+-spec remove_mod_state(data(), module()) -> data().
+remove_mod_state(StateData = #c2s_data{state_mod = ModStates}, ModName) ->
+    StateData#c2s_data{state_mod = maps:remove(ModName, ModStates)}.
 
 -spec merge_states(data(), data()) -> data().
 merge_states(S0 = #c2s_data{}, S1 = #c2s_data{}) ->
diff --git a/src/c2s/mongoose_c2s_acc.erl b/src/c2s/mongoose_c2s_acc.erl
index c8e87bdb310..d7deeb35a44 100644
--- a/src/c2s/mongoose_c2s_acc.erl
+++ b/src/c2s/mongoose_c2s_acc.erl
@@ -141,8 +141,8 @@ to_acc_many(Acc, C2SAcc, [Pair | Pairs]) ->
     to_acc_many(Acc, NewCAcc, Pairs).
 
 -spec to_c2s_acc(mongoose_c2s_acc:t(), pair()) -> mongoose_c2s_acc:t().
-to_c2s_acc(C2SAcc = #{state_mod := Handlers}, {state_mod, {Name, Handler}}) ->
-    C2SAcc#{state_mod := Handlers#{Name => Handler}};
+to_c2s_acc(C2SAcc = #{state_mod := ModStates}, {state_mod, {ModName, ModState}}) ->
+    C2SAcc#{state_mod := ModStates#{ModName => ModState}};
 to_c2s_acc(C2SAcc = #{actions := Actions}, {actions, NewActions}) when is_list(NewActions) ->
     C2SAcc#{actions := lists:reverse(NewActions) ++ Actions};
 to_c2s_acc(C2SAcc = #{actions := Actions}, {actions, Action}) ->