From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Wed, 12 Oct 2016 21:10:25 +0000 (+0200)
Subject: Don't let MAM messages go into offline storage
X-Git-Tag: 16.12~25^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b693601dd1cc65681d3b518e69843b0d7f6d0800;p=ejabberd

Don't let MAM messages go into offline storage
---

diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index f6d3c8f1f..8f6492047 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -966,13 +966,14 @@ send(From, To, Msgs, RSM, Count, IsComplete, #iq{sub_el = SubEl} = IQ) ->
 		      NS == ?NS_MAM_0; NS == ?NS_MAM_1 ->
 			   [{<<"complete">>, jlib:atom_to_binary(IsComplete)}]
 		   end,
+    Hint = [#xmlel{name = <<"no-store">>, attrs = [{<<"xmlns">>, ?NS_HINTS}]}],
     Els = lists:map(
 	    fun({ID, _IDInt, El}) ->
 		    #xmlel{name = <<"message">>,
 			   children = [#xmlel{name = <<"result">>,
 					      attrs = [{<<"xmlns">>, NS},
 						       {<<"id">>, ID}|QIDAttr],
-					      children = [El]}]}
+					      children = [El]} | Hint]}
 	    end, Msgs),
     RSMOut = make_rsm_out(Msgs, RSM, Count, QIDAttr ++ CompleteAttr, NS),
     if NS == ?NS_MAM_TMP; NS == ?NS_MAM_1 ->
@@ -990,7 +991,7 @@ send(From, To, Msgs, RSM, Count, IsComplete, #iq{sub_el = SubEl} = IQ) ->
 	      end, Els),
 	    ejabberd_router:route(
 	      To, From, #xmlel{name = <<"message">>,
-			       children = RSMOut}),
+			       children = RSMOut ++ Hint}),
 	    ignore
     end.