aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/ejabberd_sm.erl4
-rw-r--r--test/offline_tests.erl1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index 3515f6365..659961d10 100644
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -553,7 +553,7 @@ do_route(#presence{to = #jid{lresource = <<"">>} = To} = Packet) ->
end, get_user_present_resources(LUser, LServer));
do_route(#message{to = #jid{lresource = <<"">>}, type = T} = Packet) ->
?DEBUG("processing message to bare JID:~n~s", [xmpp:pp(Packet)]),
- if T == chat; T == headline; T == normal; T == groupchat ->
+ if T == chat; T == headline; T == normal ->
route_message(Packet);
true ->
Lang = xmpp:get_lang(Packet),
@@ -573,7 +573,7 @@ do_route(Packet) ->
[] ->
case Packet of
#message{type = T} when T == chat; T == normal;
- T == headline; T == groupchat ->
+ T == headline ->
route_message(Packet);
#presence{} ->
?DEBUG("dropping presence to unavailable resource:~n~s",
diff --git a/test/offline_tests.erl b/test/offline_tests.erl
index a33840f0a..1d2803db0 100644
--- a/test/offline_tests.erl
+++ b/test/offline_tests.erl
@@ -410,6 +410,7 @@ message_iterator(Config) ->
Els <- AllEls],
lists:partition(
fun(#message{type = error}) -> true;
+ (#message{type = groupchat}) -> false;
(#message{sub_els = [#offline{}|_]}) -> false;
(#message{sub_els = [_, #xevent{id = I}]}) when I /= undefined -> false;
(#message{sub_els = [#xevent{id = I}]}) when I /= undefined -> false;