rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

enable better controls

Browse source
This commit is contained in:
Madpeter 2023-11-30 19:10:29 +00:00
parent 180bdb21f3
commit 47de266915
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SecondBotEvents/Config/InteractionConfig.cs
View file

@ -16,6 +16,8 @@ namespace SecondBotEvents.Config
settings.Add("EnableJsonOutputEvents"); settings.Add("EnableJsonOutputEvents");
settings.Add("JsonOutputEventsTarget"); settings.Add("JsonOutputEventsTarget");
settings.Add("AcceptFriendRequests"); settings.Add("AcceptFriendRequests");
settings.Add("AcceptTeleports");
settings.Add("AcceptFromMasterOnly");
settings.Add("Enabled"); settings.Add("Enabled");
} }
@ -24,6 +26,11 @@ namespace SecondBotEvents.Config
return ReadSettingAsBool("Enabled", true); return ReadSettingAsBool("Enabled", true);
} }
public bool GetAcceptFromMasterOnly()
{
return ReadSettingAsBool("AcceptFromMasterOnly", true);
}
public bool GetAcceptTeleports() public bool GetAcceptTeleports()
{ {
return ReadSettingAsBool("AcceptTeleports", true); return ReadSettingAsBool("AcceptTeleports", true);
@ -39,6 +46,11 @@ namespace SecondBotEvents.Config
return ReadSettingAsBool("AcceptInventory", true); return ReadSettingAsBool("AcceptInventory", true);
} }
public bool GetAcceptFriendRequests()
{
return ReadSettingAsBool("AcceptFriendRequests", true);
}
public string GetJsonOutputEventsTarget() public string GetJsonOutputEventsTarget()
{ {
return ReadSettingAsString("JsonOutputEventsTarget", "none"); return ReadSettingAsString("JsonOutputEventsTarget", "none");
@ -48,11 +60,6 @@ namespace SecondBotEvents.Config
{ {
return ReadSettingAsBool("EnableJsonOutputEvents", true); return ReadSettingAsBool("EnableJsonOutputEvents", true);
} }
public bool GetAcceptFriendRequests()
{
return ReadSettingAsBool("AcceptFriendRequests", true);
}
} }
} }

6
SecondBotEvents/Services/InteractionService.cs
View file

@ -51,10 +51,14 @@ namespace SecondBotEvents.Services
JsonOuput(false, sourceName, avatarName, "disabled by config"); JsonOuput(false, sourceName, avatarName, "disabled by config");
return false; return false;
} }
if(myConfig.GetAcceptFromMasterOnly() == false)
{
return true;
}
if (master.CommandsService.myConfig.GetEnableMasterControls() == false) if (master.CommandsService.myConfig.GetEnableMasterControls() == false)
{ {
// master avatars list is not enabled. unable to continue // master avatars list is not enabled. unable to continue
JsonOuput(false, sourceName, avatarName, "masters AV list is disabled"); JsonOuput(false, sourceName, avatarName, "masters AV list is disabled: Please set EnableMasterControls in Commands service to true");
return false; return false;
} }
if (master.CommandsService.myConfig.GetMastersCSV().Contains(avatarName) == false) if (master.CommandsService.myConfig.GetMastersCSV().Contains(avatarName) == false)