Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2015-12-09 00:15:55 +0300
committerHolger Weiss <holger@zedat.fu-berlin.de>2015-12-09 00:15:55 +0300
commit14609dbfa2a85ef0abc40b0720acfa2e6e26026c (patch)
treef8f7c0390426b9b03b20ea5ed5d9d0d97f778cfa /src/mod_mam.erl
parent59ba09826b5c9e74fc4c7279ceba084cb4cd39a7 (diff)
mod_mam: Remove unused code
Diffstat (limited to 'src/mod_mam.erl')
-rw-r--r--src/mod_mam.erl15
1 files changed, 1 insertions, 14 deletions
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.