jacob.eva
/
ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod_mam_mnesia: Also check for <no-store/> hint 

Check for the <no-store/> and <no-permanent-store/> hints in addition to
<no-storage/> and <no-permanent-storage/>.  XEP-0334 (version 0.1)
mentions both variants, and unfortunately, both of them are in use.
This commit is contained in:
Holger Weiss 2015-07-21 16:05:47 +02:00
parent 1c79c86168
commit 7cba0f88e8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod_mam_mnesia/src/mod_mam_mnesia.erl
View File

@ -321,7 +321,7 @@ send_stanza(Stanza, _C2SState, _From, _To) -> Stanza.
is_desired(Route, JID, To, Message) ->
is_chat_or_normal_message(Message) andalso
has_non_empty_body(Message) andalso
not has_no_storage_hint(Message) andalso
not has_no_store_hint(Message) andalso
not is_bare_copy(Route, JID, To) andalso
not is_resent(Message).
@ -354,11 +354,15 @@ has_non_empty_body(Message) ->
xml:get_subtag_cdata(Message, <<"body">>) =/= <<"">> orelse
xml:get_subtag(Message, <<"axolotl_message">>) =/= false.
-spec has_no_storage_hint(xmlel()) -> boolean().
-spec has_no_store_hint(xmlel()) -> boolean().
has_no_storage_hint(Message) ->
has_no_store_hint(Message) ->
xml:get_subtag_with_xmlns(Message, <<"no-store">>, ?NS_HINTS)
=/= false orelse
xml:get_subtag_with_xmlns(Message, <<"no-storage">>, ?NS_HINTS)
=/= false orelse
xml:get_subtag_with_xmlns(Message, <<"no-permanent-store">>, ?NS_HINTS)
=/= false orelse
xml:get_subtag_with_xmlns(Message, <<"no-permanent-storage">>, ?NS_HINTS)
=/= false.