yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 17:59:31 +02:00
Code Issues Releases Wiki Activity

Don't use depraced functions

Browse source
This commit is contained in:
Paweł Chmielowski 2017-10-31 14:21:34 +01:00
parent 0452ffc1df
commit 5f2e33bdd0
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/mod_muc_sql.erl
View file

@ -82,8 +82,8 @@ store_room(LServer, Host, Name, Opts, ChangesHints) ->
ejabberd_sql:sql_transaction(LServer, F). ejabberd_sql:sql_transaction(LServer, F).
change_room(Host, Room, {add_subscription, JID, Nick, Nodes}) -> change_room(Host, Room, {add_subscription, JID, Nick, Nodes}) ->
SJID = jid:to_string(JID), SJID = jid:encode(JID),
SNodes = jlib:term_to_expr(Nodes), SNodes = misc:term_to_expr(Nodes),
?SQL_UPSERT_T( ?SQL_UPSERT_T(
"muc_room_subscribers", "muc_room_subscribers",
["!jid=%(SJID)s", ["!jid=%(SJID)s",
@ -92,7 +92,7 @@ change_room(Host, Room, {add_subscription, JID, Nick, Nodes}) ->
"nick=%(Nick)s", "nick=%(Nick)s",
"nodes=%(SNodes)s"]); "nodes=%(SNodes)s"]);
change_room(Host, Room, {del_subscription, JID}) -> change_room(Host, Room, {del_subscription, JID}) ->
SJID = jid:to_string(JID), SJID = jid:encode(JID),
ejabberd_sql:sql_query_t(?SQL("delete from muc_room_subscribers where " ejabberd_sql:sql_query_t(?SQL("delete from muc_room_subscribers where "
"room=%(Room)s and host=%(Host)s and jid=%(SJID)s")); "room=%(Room)s and host=%(Host)s and jid=%(SJID)s"));
change_room(Host, Room, Change) -> change_room(Host, Room, Change) ->
@ -121,7 +121,7 @@ restore_room(LServer, Host, Name) ->
{selected, Subs} -> {selected, Subs} ->
SubData = lists:map( SubData = lists:map(
fun({Jid, Nick, Nodes}) -> fun({Jid, Nick, Nodes}) ->
{jid:from_string(Jid), Nick, ejabberd_sql:decode_term(Nodes)} {jid:decode(Jid), Nick, ejabberd_sql:decode_term(Nodes)}
end, Subs), end, Subs),
Opts2 = lists:keystore(subscribers, 1, OptsD, {subscribers, SubData}), Opts2 = lists:keystore(subscribers, 1, OptsD, {subscribers, SubData}),
mod_muc:opts_to_binary(Opts2); mod_muc:opts_to_binary(Opts2);
@ -167,7 +167,7 @@ get_rooms(LServer, Host) ->
{selected, Subs} -> {selected, Subs} ->
SubsD = lists:foldl( SubsD = lists:foldl(
fun({Room, Jid, Nick, Nodes}, Dict) -> fun({Room, Jid, Nick, Nodes}, Dict) ->
dict:append(Room, {jid:from_string(Jid), dict:append(Room, {jid:decode(Jid),
Nick, ejabberd_sql:decode_term(Nodes)}, Dict) Nick, ejabberd_sql:decode_term(Nodes)}, Dict)
end, dict:new(), Subs), end, dict:new(), Subs),
lists:map( lists:map(
@ -406,7 +406,7 @@ import(_, _, _) ->
ok. ok.
get_subscribed_rooms(LServer, Host, Jid) -> get_subscribed_rooms(LServer, Host, Jid) ->
JidS = jid:to_string(Jid), JidS = jid:encode(Jid),
case catch ejabberd_sql:sql_query( case catch ejabberd_sql:sql_query(
LServer, LServer,
?SQL("select @(room)s from muc_room_subscribers where jid=%(JidS)s" ?SQL("select @(room)s from muc_room_subscribers where jid=%(JidS)s"