24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-22 22:23:42 +02:00

Merge pull request #618 from weiss/muc-message-hook

New hook: muc_filter_packet
This commit is contained in:
Evgeny Khramtsov 2015-07-21 12:35:27 +03:00
commit a724893887

View File

@ -947,8 +947,19 @@ process_groupchat_message(From,
end, end,
case IsAllowed of case IsAllowed of
true -> true ->
send_multiple( case
jlib:jid_replace_resource(StateData#state.jid, FromNick), ejabberd_hooks:run_fold(muc_filter_packet,
StateData#state.server_host,
Packet,
[StateData,
StateData#state.jid,
From, FromNick])
of
drop ->
{next_state, normal_state, StateData};
NewPacket ->
send_multiple(jlib:jid_replace_resource(StateData#state.jid,
FromNick),
StateData#state.server_host, StateData#state.server_host,
StateData#state.users, StateData#state.users,
Packet), Packet),
@ -960,7 +971,8 @@ process_groupchat_message(From,
false -> false ->
NewStateData1 NewStateData1
end, end,
{next_state, normal_state, NewStateData2}; {next_state, normal_state, NewStateData2}
end;
_ -> _ ->
Err = case Err = case
(StateData#state.config)#config.allow_change_subj (StateData#state.config)#config.allow_change_subj