diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-26 10:07:12 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-26 10:07:12 +0300 |
| commit | c1439ddd5bff82292919774c224a2bf3c8f63258 (patch) | |
| tree | cc80ebe280ac56fcdfa9656f8f03a1938f53bdeb /src/mod_irc_sql.erl | |
| parent | Don't pass empty resource to jid:make() (diff) | |
Get rid of jid:to_string/1 and jid:from_string/1
Diffstat (limited to 'src/mod_irc_sql.erl')
| -rw-r--r-- | src/mod_irc_sql.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_irc_sql.erl b/src/mod_irc_sql.erl index dd419875..42c075bf 100644 --- a/src/mod_irc_sql.erl +++ b/src/mod_irc_sql.erl @@ -42,7 +42,7 @@ init(_Host, _Opts) -> ok. get_data(LServer, Host, From) -> - SJID = jid:to_string(jid:tolower(jid:remove_resource(From))), + SJID = jid:encode(jid:tolower(jid:remove_resource(From))), case catch ejabberd_sql:sql_query( LServer, ?SQL("select @(data)s from irc_custom" @@ -54,7 +54,7 @@ get_data(LServer, Host, From) -> end. set_data(LServer, Host, From, Data) -> - SJID = jid:to_string(jid:tolower(jid:remove_resource(From))), + SJID = jid:encode(jid:tolower(jid:remove_resource(From))), SData = jlib:term_to_expr(Data), F = fun () -> ?SQL_UPSERT_T( @@ -72,7 +72,7 @@ export(_Server) -> data = Data}) -> case str:suffix(Host, IRCHost) of true -> - SJID = jid:to_string(jid:make(U, S)), + SJID = jid:encode(jid:make(U, S)), SData = jlib:term_to_expr(Data), [?SQL("delete from irc_custom" " where jid=%(SJID)s and host=%(IRCHost)s;"), @@ -86,7 +86,7 @@ export(_Server) -> import(_LServer) -> [{<<"select jid, host, data from irc_custom;">>, fun([SJID, IRCHost, SData]) -> - #jid{luser = U, lserver = S} = jid:from_string(SJID), + #jid{luser = U, lserver = S} = jid:decode(SJID), Data = ejabberd_sql:decode_term(SData), #irc_custom{us_host = {{U, S}, IRCHost}, data = Data} |