diff options
author | Holger Weiß <holger@zedat.fu-berlin.de> | 2016-01-12 12:20:35 +0300 |
---|---|---|
committer | Holger Weiß <holger@zedat.fu-berlin.de> | 2016-01-12 12:20:35 +0300 |
commit | 64d96778b452aad72349b21d2ac94e744617b07a (patch) | |
tree | 146783fed29491ff96e1697e14e177700157f9be /src/ejabberd_c2s.erl | |
parent | 3e1425b9058456dc2433ad3c14e503c684012bbe (diff) |
Don't return error for blocked MUC messages
If a message stanza is blocked as per XEP-0016 or XEP-0191, return an
error only if the type of the blocked message is "normal" or "chat".
This makes sure users won't be kicked from MUC rooms when blocking other
participants.
Closes #897.
Diffstat (limited to 'src/ejabberd_c2s.erl')
-rw-r--r-- | src/ejabberd_c2s.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index fbea2a8e3..c21683f89 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1636,6 +1636,8 @@ handle_info({route, From, To, deny -> case xml:get_attr_s(<<"type">>, Attrs) of <<"error">> -> ok; + <<"groupchat">> -> ok; + <<"headline">> -> ok; <<"result">> -> ok; _ -> Err = |