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

Update mod_message_log to work with ejabberd 16.02

This commit is contained in:
Holger Weiss 2016-03-08 00:32:07 +01:00
parent 4165428780
commit 04cc600772
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod_message_log/src/mod_message_log.erl
View File

@ -169,7 +169,7 @@ reopen_log() ->
-spec log_packet(direction(), jid(), jid(), xmlel()) -> any().
log_packet(Direction, From, To, #xmlel{name = <<"message">>} = Packet) ->
case xml:get_subtag(Packet, <<"body">>) of
case fxml:get_subtag(Packet, <<"body">>) of
#xmlel{children = Body} when length(Body) > 0 ->
Type = get_message_type(Packet),
gen_server:cast(?PROCNAME, {message, Direction, From, To, Type});
@ -188,7 +188,7 @@ log_packet(_Direction, _From, _To, _Packet) ->
-spec get_message_type(xmlel()) -> binary().
get_message_type(#xmlel{attrs = Attrs}) ->
case xml:get_attr_s(<<"type">>, Attrs) of
case fxml:get_attr_s(<<"type">>, Attrs) of
<<"">> ->
<<"normal">>;
Type ->
@ -198,8 +198,8 @@ get_message_type(#xmlel{attrs = Attrs}) ->
-spec is_carbon(xmlel()) -> {true, direction()} | false.
is_carbon(Packet) ->
{Direction, SubTag} = case {xml:get_subtag(Packet, <<"sent">>),
xml:get_subtag(Packet, <<"received">>)} of
{Direction, SubTag} = case {fxml:get_subtag(Packet, <<"sent">>),
fxml:get_subtag(Packet, <<"received">>)} of
{false, false} ->
{false, false};
{false, Tag} ->
@ -210,7 +210,7 @@ is_carbon(Packet) ->
F = fun(_, false) ->
false;
(Name, Tag) ->
xml:get_subtag(Tag, Name)
fxml:get_subtag(Tag, Name)
end,
case lists:foldl(F, SubTag, [<<"forwarded">>, <<"message">>, <<"body">>]) of
#xmlel{children = Body} when length(Body) > 0 ->