mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-08 21:43:07 +02:00
Fix formatting
This commit is contained in:
parent
c39ce133de
commit
9c37450fe4
|
@ -959,9 +959,7 @@ wait_for_sasl_response(closed, StateData) ->
|
|||
{stop, normal, StateData}.
|
||||
|
||||
resource_conflict_action(U, S, R) ->
|
||||
OptionRaw = case ejabberd_sm:is_existing_resource(U, S,
|
||||
R)
|
||||
of
|
||||
OptionRaw = case ejabberd_sm:is_existing_resource(U, S, R) of
|
||||
true ->
|
||||
ejabberd_config:get_option(
|
||||
{resource_conflict, S},
|
||||
|
@ -1888,8 +1886,7 @@ new_id() -> randoms:get_string().
|
|||
|
||||
is_auth_packet(El) ->
|
||||
case jlib:iq_query_info(El) of
|
||||
#iq{id = ID, type = Type, xmlns = ?NS_AUTH,
|
||||
sub_el = SubEl} ->
|
||||
#iq{id = ID, type = Type, xmlns = ?NS_AUTH, sub_el = SubEl} ->
|
||||
#xmlel{children = Els} = SubEl,
|
||||
{auth, ID, Type,
|
||||
get_auth_tags(Els, <<"">>, <<"">>, <<"">>, <<"">>)};
|
||||
|
@ -2216,18 +2213,16 @@ remove_element(E, Set) ->
|
|||
|
||||
roster_change(IJID, ISubscription, StateData) ->
|
||||
LIJID = jlib:jid_tolower(IJID),
|
||||
IsFrom = (ISubscription == both) or
|
||||
(ISubscription == from),
|
||||
IsFrom = (ISubscription == both) or (ISubscription == from),
|
||||
IsTo = (ISubscription == both) or (ISubscription == to),
|
||||
OldIsFrom = (?SETS):is_element(LIJID,
|
||||
StateData#state.pres_f),
|
||||
FSet = if IsFrom ->
|
||||
(?SETS):add_element(LIJID, StateData#state.pres_f);
|
||||
true -> remove_element(LIJID, StateData#state.pres_f)
|
||||
OldIsFrom = (?SETS):is_element(LIJID, StateData#state.pres_f),
|
||||
FSet = if
|
||||
IsFrom -> (?SETS):add_element(LIJID, StateData#state.pres_f);
|
||||
not IsFrom -> remove_element(LIJID, StateData#state.pres_f)
|
||||
end,
|
||||
TSet = if IsTo ->
|
||||
(?SETS):add_element(LIJID, StateData#state.pres_t);
|
||||
true -> remove_element(LIJID, StateData#state.pres_t)
|
||||
TSet = if
|
||||
IsTo -> (?SETS):add_element(LIJID, StateData#state.pres_t);
|
||||
not IsTo -> remove_element(LIJID, StateData#state.pres_t)
|
||||
end,
|
||||
case StateData#state.pres_last of
|
||||
undefined ->
|
||||
|
@ -2321,8 +2316,7 @@ process_privacy_iq(From, To,
|
|||
NewStateData.
|
||||
|
||||
resend_offline_messages(StateData) ->
|
||||
case
|
||||
ejabberd_hooks:run_fold(resend_offline_messages_hook,
|
||||
case ejabberd_hooks:run_fold(resend_offline_messages_hook,
|
||||
StateData#state.server, [],
|
||||
[StateData#state.user, StateData#state.server])
|
||||
of
|
||||
|
@ -2345,8 +2339,7 @@ resend_offline_messages(StateData) ->
|
|||
end.
|
||||
|
||||
resend_subscription_requests(#state{user = User,
|
||||
server = Server} =
|
||||
StateData) ->
|
||||
server = Server} = StateData) ->
|
||||
PendingSubscriptions =
|
||||
ejabberd_hooks:run_fold(resend_subscription_requests_hook,
|
||||
Server, [], [User, Server]),
|
||||
|
@ -2358,9 +2351,7 @@ resend_subscription_requests(#state{user = User,
|
|||
|
||||
get_showtag(undefined) -> <<"unavailable">>;
|
||||
get_showtag(Presence) ->
|
||||
case xml:get_path_s(Presence,
|
||||
[{elem, <<"show">>}, cdata])
|
||||
of
|
||||
case xml:get_path_s(Presence, [{elem, <<"show">>}, cdata]) of
|
||||
<<"">> -> <<"available">>;
|
||||
ShowTag -> ShowTag
|
||||
end.
|
||||
|
|
Loading…
Reference in New Issue
Block a user