mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-18 22:15:20 +02:00
Do not try to retreive vCards via local SM for foreign JIDs
This commit is contained in:
parent
318b0f2208
commit
003fd321ee
|
@ -187,16 +187,23 @@ get_rosteritem_name([], _, _) -> <<"">>;
|
||||||
get_rosteritem_name([ModVcard], U, S) ->
|
get_rosteritem_name([ModVcard], U, S) ->
|
||||||
From = jlib:make_jid(<<"">>, S, jlib:atom_to_binary(?MODULE)),
|
From = jlib:make_jid(<<"">>, S, jlib:atom_to_binary(?MODULE)),
|
||||||
To = jlib:make_jid(U, S, <<"">>),
|
To = jlib:make_jid(U, S, <<"">>),
|
||||||
|
case lists:member(To#jid.lserver, ?MYHOSTS) of
|
||||||
|
true ->
|
||||||
IQ = {iq, <<"">>, get, <<"vcard-temp">>, <<"">>,
|
IQ = {iq, <<"">>, get, <<"vcard-temp">>, <<"">>,
|
||||||
#xmlel{name = <<"vCard">>,
|
#xmlel{name = <<"vCard">>,
|
||||||
attrs = [{<<"xmlns">>, <<"vcard-temp">>}],
|
attrs = [{<<"xmlns">>, <<"vcard-temp">>}],
|
||||||
children = []}},
|
children = []}},
|
||||||
IQ_Vcard = ModVcard:process_sm_iq(From, To, IQ),
|
IQ_Vcard = ModVcard:process_sm_iq(From, To, IQ),
|
||||||
try get_rosteritem_name_vcard(IQ_Vcard#iq.sub_el) catch
|
case catch get_rosteritem_name_vcard(IQ_Vcard#iq.sub_el) of
|
||||||
E1:E2 ->
|
{'EXIT', Err} ->
|
||||||
?ERROR_MSG("Error ~p found when trying to get the "
|
?ERROR_MSG("Error found when trying to get the "
|
||||||
"vCard of ~s@~s in ~p:~n ~p",
|
"vCard of ~s@~s in ~p:~n ~p",
|
||||||
[E1, U, S, ModVcard, E2]),
|
[U, S, ModVcard, Err]),
|
||||||
|
<<"">>;
|
||||||
|
NickName ->
|
||||||
|
NickName
|
||||||
|
end;
|
||||||
|
false ->
|
||||||
<<"">>
|
<<"">>
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user