mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-30 16:36:29 +01:00
Handle incoherence of argument type in calls to remove_user
This commit is contained in:
parent
48dcc5180a
commit
9a32615122
@ -786,7 +786,12 @@ is_type_match(group, Value, _JID, _Subscription, Groups) ->
|
|||||||
lists:member(Value, Groups).
|
lists:member(Value, Groups).
|
||||||
|
|
||||||
|
|
||||||
remove_user(User, Server) ->
|
%% The ejabberd hook provides the arguments as binaries,
|
||||||
|
%% but the mod_privacy internal functions provide them as strings.
|
||||||
|
%% Once this module stores information as binaries, this incoherence will be solved.
|
||||||
|
remove_user(User, Server) when is_binary(User) and is_binary(Server) ->
|
||||||
|
remove_user(binary_to_list(User), binary_to_list(Server));
|
||||||
|
remove_user(User, Server) when is_list(User) and is_list(Server) ->
|
||||||
LUser = exmpp_stringprep:nodeprep(User),
|
LUser = exmpp_stringprep:nodeprep(User),
|
||||||
LServer = exmpp_stringprep:nameprep(Server),
|
LServer = exmpp_stringprep:nameprep(Server),
|
||||||
LServerB = list_to_binary(LServer),
|
LServerB = list_to_binary(LServer),
|
||||||
|
Loading…
Reference in New Issue
Block a user