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

adds CheckDotNames

Browse source
This commit is contained in:
Madpeter 2025-01-24 16:35:32 +00:00
parent 45b714451c
commit ef735b62c1
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -32,6 +32,7 @@ ENV basic_Username='' \
commands_SharedSecret='examplecode' \ commands_SharedSecret='examplecode' \
commands_EnableMasterControls='true' \ commands_EnableMasterControls='true' \
commands_MastersCSV='Madpeter Zond' \ commands_MastersCSV='Madpeter Zond' \
commands_CheckDotNames='false' \
commands_EnforceTimeWindow='false' \ commands_EnforceTimeWindow='false' \
commands_TimeWindowSecs=35 \ commands_TimeWindowSecs=35 \
commands_Enabled='true' \ commands_Enabled='true' \

6
SecondBotEvents/Config/CommandsConfig.cs
View file

@ -16,6 +16,7 @@ namespace SecondBotEvents.Config
settings.Add("SharedSecret"); settings.Add("SharedSecret");
settings.Add("EnableMasterControls"); settings.Add("EnableMasterControls");
settings.Add("MastersCSV"); settings.Add("MastersCSV");
settings.Add("CheckDotNames");
settings.Add("EnforceTimeWindow"); settings.Add("EnforceTimeWindow");
settings.Add("TimeWindowSecs"); settings.Add("TimeWindowSecs");
settings.Add("Enabled"); settings.Add("Enabled");
@ -32,6 +33,11 @@ namespace SecondBotEvents.Config
return ReadSettingAsBool("Enabled", true); return ReadSettingAsBool("Enabled", true);
} }
public bool GetCheckDotNames()
{
return ReadSettingAsBool("CheckDotNames", false);
}
public bool GetObjectMasterOptout() public bool GetObjectMasterOptout()
{ {
return ReadSettingAsBool("ObjectMasterOptout", false); return ReadSettingAsBool("ObjectMasterOptout", false);

17
SecondBotEvents/Services/CommandsService.cs
View file

@ -149,6 +149,14 @@ namespace SecondBotEvents.Services
{ {
string ownername = master.DataStoreService.GetAvatarName(e.IM.FromAgentID); string ownername = master.DataStoreService.GetAvatarName(e.IM.FromAgentID);
requireSigning = !myConfig.GetMastersCSV().Contains(ownername); requireSigning = !myConfig.GetMastersCSV().Contains(ownername);
if ((requireSigning == false) && (myConfig.GetCheckDotNames() == true))
{
string[] bits = e.IM.FromAgentName.ToLower().Split('.');
if (bits.Length == 2)
{
requireSigning = myConfig.GetMastersCSV().Contains(bits[0].FirstCharToUpper() + " " + bits[1].FirstCharToUpper());
}
}
} }
break; break;
} }
@ -166,6 +174,14 @@ namespace SecondBotEvents.Services
master.DataStoreService.AddAvatar(e.IM.FromAgentID, e.IM.FromAgentName); master.DataStoreService.AddAvatar(e.IM.FromAgentID, e.IM.FromAgentName);
requireSigning = false; requireSigning = false;
acceptMessage = myConfig.GetMastersCSV().Contains(e.IM.FromAgentName); acceptMessage = myConfig.GetMastersCSV().Contains(e.IM.FromAgentName);
if ((acceptMessage == false) && (myConfig.GetCheckDotNames() == true))
{
string[] bits = e.IM.FromAgentName.ToLower().Split('.');
if (bits.Length == 2)
{
acceptMessage = myConfig.GetMastersCSV().Contains(bits[0].FirstCharToUpper()+" " + bits[1].FirstCharToUpper());
}
}
break; break;
} }
default: default:
@ -193,6 +209,7 @@ namespace SecondBotEvents.Services
} }
} }
} }
return false; return false;
} }