Merge pull request #3913 from esl/hooks/simplify_filter_room_packet

Simplify filter_room_packet
esl · Jan 2, 2023 · f811db6 · f811db6
2 parents 5523359 + fb2af0d
commit f811db6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/mam/mod_mam_muc.erl b/src/mam/mod_mam_muc.erl
@@ -151,9 +151,9 @@ disco_muc_features(Acc, _Params, _Extra) ->
 %% @doc Handle public MUC-message.
 -spec filter_room_packet(Acc, Params, Extra) -> {ok, Acc} when
     Acc :: exml:element(),
-    Params :: map(),
+    Params :: mod_muc:room_event_data(),
     Extra :: gen_hook:extra().
-filter_room_packet(Packet, #{event_data := #{} = EventData}, #{host_type := HostType}) ->
+filter_room_packet(Packet, EventData, #{host_type := HostType}) ->
     ?LOG_DEBUG(#{what => mam_room_packet, text => <<"Incoming room packet">>,
                  packet => Packet, event_data => EventData}),
     IsArchivable = is_archivable_message(HostType, incoming, Packet),

diff --git a/src/mongoose_hooks.erl b/src/mongoose_hooks.erl
@@ -1390,8 +1390,7 @@ amp_verify_support(HostType, Rules) ->
     EventData :: mod_muc:room_event_data(),
     Result :: exml:element().
 filter_room_packet(HostType, Packet, EventData) ->
-    Params = #{packet => Packet, event_data => EventData},
-    run_hook_for_host_type(filter_room_packet, HostType, Packet, Params).
+    run_hook_for_host_type(filter_room_packet, HostType, Packet, EventData).
 
 %%% @doc The `forget_room' hook is called when a room is removed from the database.
 -spec forget_room(HostType, MucHost, Room) -> Result when