Allow admin command to subscribe new users to members_only rooms
This commit is contained in:
parent
be60263d47
commit
54592202ef
|
@ -779,20 +779,24 @@ handle_sync_event({muc_subscribe, From, Nick, Nodes}, _From,
|
||||||
Config = StateData#state.config,
|
Config = StateData#state.config,
|
||||||
CaptchaRequired = Config#config.captcha_protected,
|
CaptchaRequired = Config#config.captcha_protected,
|
||||||
PasswordProtected = Config#config.password_protected,
|
PasswordProtected = Config#config.password_protected,
|
||||||
|
MembersOnly = Config#config.members_only,
|
||||||
TmpConfig = Config#config{captcha_protected = false,
|
TmpConfig = Config#config{captcha_protected = false,
|
||||||
password_protected = false},
|
password_protected = false,
|
||||||
|
members_only = false},
|
||||||
TmpState = StateData#state{config = TmpConfig},
|
TmpState = StateData#state{config = TmpConfig},
|
||||||
case process_iq_mucsub(From, IQ, TmpState) of
|
case process_iq_mucsub(From, IQ, TmpState) of
|
||||||
{result, #muc_subscribe{events = NewNodes}, NewState} ->
|
{result, #muc_subscribe{events = NewNodes}, NewState} ->
|
||||||
NewConfig = (NewState#state.config)#config{
|
NewConfig = (NewState#state.config)#config{
|
||||||
captcha_protected = CaptchaRequired,
|
captcha_protected = CaptchaRequired,
|
||||||
password_protected = PasswordProtected},
|
password_protected = PasswordProtected,
|
||||||
|
members_only = MembersOnly},
|
||||||
{reply, {ok, NewNodes}, StateName,
|
{reply, {ok, NewNodes}, StateName,
|
||||||
NewState#state{config = NewConfig}};
|
NewState#state{config = NewConfig}};
|
||||||
{ignore, NewState} ->
|
{ignore, NewState} ->
|
||||||
NewConfig = (NewState#state.config)#config{
|
NewConfig = (NewState#state.config)#config{
|
||||||
captcha_protected = CaptchaRequired,
|
captcha_protected = CaptchaRequired,
|
||||||
password_protected = PasswordProtected},
|
password_protected = PasswordProtected,
|
||||||
|
members_only = MembersOnly},
|
||||||
{reply, {error, ?T("Request is ignored")},
|
{reply, {error, ?T("Request is ignored")},
|
||||||
NewState#state{config = NewConfig}};
|
NewState#state{config = NewConfig}};
|
||||||
{error, Err} ->
|
{error, Err} ->
|
||||||
|
|
Loading…
Reference in New Issue