From 14609dbfa2a85ef0abc40b0720acfa2e6e26026c Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Tue, 8 Dec 2015 22:15:55 +0100 Subject: mod_mam: Remove unused code --- src/mod_mam.erl | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/mod_mam.erl') diff --git a/src/mod_mam.erl b/src/mod_mam.erl index 1481c48d2..0e1dbf308 100644 --- a/src/mod_mam.erl +++ b/src/mod_mam.erl @@ -227,8 +227,6 @@ process_iq_v0_2(#jid{lserver = LServer} = From, [{<<"end">>, [xml:get_tag_cdata(El)]}]; (#xmlel{name = <<"with">>} = El) -> [{<<"with">>, [xml:get_tag_cdata(El)]}]; - (#xmlel{name = <<"withroom">>} = El) -> - [{<<"withroom">>, [xml:get_tag_cdata(El)]}]; (#xmlel{name = <<"withtext">>} = El) -> [{<<"withtext">>, [xml:get_tag_cdata(El)]}]; (#xmlel{name = <<"set">>}) -> @@ -342,10 +340,6 @@ process_iq(LServer, From, To, IQ, SubEl, Fs, MsgType) -> With, RSM}; ({<<"with">>, [Data|_]}, {Start, End, _, RSM}) -> {Start, End, jid:tolower(jid:from_string(Data)), RSM}; - ({<<"withroom">>, [Data|_]}, {Start, End, _, RSM}) -> - {Start, End, - {room, jid:tolower(jid:from_string(Data))}, - RSM}; ({<<"withtext">>, [Data|_]}, {Start, End, _, RSM}) -> {Start, End, {text, Data}, RSM}; ({<<"set">>, El}, {Start, End, With, _}) -> @@ -628,14 +622,7 @@ select_and_send(LServer, From, To, Start, End, With, RSM, IQ, MsgType, DBType) - select_and_start(LServer, From, To, Start, End, With, RSM, MsgType, DBType) -> case MsgType of chat -> - case With of - {room, {_, _, <<"">>} = WithJID} -> - select(LServer, jid:make(WithJID), Start, End, - WithJID, RSM, MsgType, DBType); - _ -> - select(LServer, From, Start, End, - With, RSM, MsgType, DBType) - end; + select(LServer, From, Start, End, With, RSM, MsgType, DBType); {groupchat, _Role, _MUCState} -> select(LServer, To, Start, End, With, RSM, MsgType, DBType) end. -- cgit v1.2.3