mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-14 22:00:16 +02:00
Merge pull request #618 from weiss/muc-message-hook
New hook: muc_filter_packet
This commit is contained in:
commit
a724893887
|
@ -947,20 +947,32 @@ 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,
|
StateData#state.server_host,
|
||||||
StateData#state.users,
|
Packet,
|
||||||
Packet),
|
[StateData,
|
||||||
NewStateData2 = case has_body_or_subject(Packet) of
|
StateData#state.jid,
|
||||||
true ->
|
From, FromNick])
|
||||||
add_message_to_history(FromNick, From,
|
of
|
||||||
Packet,
|
drop ->
|
||||||
NewStateData1);
|
{next_state, normal_state, StateData};
|
||||||
false ->
|
NewPacket ->
|
||||||
NewStateData1
|
send_multiple(jlib:jid_replace_resource(StateData#state.jid,
|
||||||
end,
|
FromNick),
|
||||||
{next_state, normal_state, NewStateData2};
|
StateData#state.server_host,
|
||||||
|
StateData#state.users,
|
||||||
|
Packet),
|
||||||
|
NewStateData2 = case has_body_or_subject(Packet) of
|
||||||
|
true ->
|
||||||
|
add_message_to_history(FromNick, From,
|
||||||
|
Packet,
|
||||||
|
NewStateData1);
|
||||||
|
false ->
|
||||||
|
NewStateData1
|
||||||
|
end,
|
||||||
|
{next_state, normal_state, NewStateData2}
|
||||||
|
end;
|
||||||
_ ->
|
_ ->
|
||||||
Err = case
|
Err = case
|
||||||
(StateData#state.config)#config.allow_change_subj
|
(StateData#state.config)#config.allow_change_subj
|
||||||
|
|
Loading…
Reference in New Issue
Block a user