Don't store messages with <no-store/> hint

Honor the <no-store/> hint defined in XEP-0334.
This commit is contained in:
Holger Weiss 2014-05-12 00:00:34 +02:00
parent 9b16d09261
commit 03fd88e4ec
2 changed files with 29 additions and 11 deletions

View File

@ -42,6 +42,7 @@
-define(NS_IQDATA, <<"jabber:iq:data">>). -define(NS_IQDATA, <<"jabber:iq:data">>).
-define(NS_DELAY91, <<"jabber:x:delay">>). -define(NS_DELAY91, <<"jabber:x:delay">>).
-define(NS_DELAY, <<"urn:xmpp:delay">>). -define(NS_DELAY, <<"urn:xmpp:delay">>).
-define(NS_HINTS, <<"urn:xmpp:hints">>).
-define(NS_EXPIRE, <<"jabber:x:expire">>). -define(NS_EXPIRE, <<"jabber:x:expire">>).
-define(NS_EVENT, <<"jabber:x:event">>). -define(NS_EVENT, <<"jabber:x:event">>).
-define(NS_CHATSTATES, -define(NS_CHATSTATES,

View File

@ -237,22 +237,39 @@ store_packet(From, To, Packet) ->
Type = xml:get_tag_attr_s(<<"type">>, Packet), Type = xml:get_tag_attr_s(<<"type">>, Packet),
if (Type /= <<"error">>) and (Type /= <<"groupchat">>) if (Type /= <<"error">>) and (Type /= <<"groupchat">>)
and (Type /= <<"headline">>) -> and (Type /= <<"headline">>) ->
case check_event(From, To, Packet) of case has_no_storage_hint(Packet) of
true -> false ->
#jid{luser = LUser, lserver = LServer} = To, case check_event(From, To, Packet) of
TimeStamp = now(), true ->
#xmlel{children = Els} = Packet, #jid{luser = LUser, lserver = LServer} = To,
Expire = find_x_expire(TimeStamp, Els), TimeStamp = now(),
gen_mod:get_module_proc(To#jid.lserver, ?PROCNAME) ! #xmlel{children = Els} = Packet,
#offline_msg{us = {LUser, LServer}, Expire = find_x_expire(TimeStamp, Els),
timestamp = TimeStamp, expire = Expire, gen_mod:get_module_proc(To#jid.lserver, ?PROCNAME) !
from = From, to = To, packet = Packet}, #offline_msg{us = {LUser, LServer},
stop; timestamp = TimeStamp, expire = Expire,
from = From, to = To, packet = Packet},
stop;
_ -> ok
end;
_ -> ok _ -> ok
end; end;
true -> ok true -> ok
end. end.
has_no_storage_hint(Packet) ->
case xml:get_subtag(Packet, <<"no-store">>) of
#xmlel{attrs = Attrs} ->
case xml:get_attr_s(<<"xmlns">>, Attrs) of
?NS_HINTS ->
true;
_ ->
false
end;
_ ->
false
end.
%% Check if the packet has any content about XEP-0022 or XEP-0085 %% Check if the packet has any content about XEP-0022 or XEP-0085
check_event(From, To, Packet) -> check_event(From, To, Packet) ->
#xmlel{name = Name, attrs = Attrs, children = Els} = #xmlel{name = Name, attrs = Attrs, children = Els} =