aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Khramtsov <xramtsov@gmail.com>2016-01-12 14:07:58 +0300
committerEvgeny Khramtsov <xramtsov@gmail.com>2016-01-12 14:07:58 +0300
commit04b3efd14c2eaee7819e6714737a0b8a1856def2 (patch)
tree146783fed29491ff96e1697e14e177700157f9be
parentMerge remote-tracking branch 'processone/pr/899' (diff)
parentDon't return error for blocked MUC messages (diff)
Merge pull request #900 from weiss/suppress-groupchat-error16.01
Don't return error for blocked headlines and MUC messages
-rw-r--r--src/ejabberd_c2s.erl2
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 =