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

Revert "adjusts group lockout to be per group"

Browse source 
This reverts commit b000dd0eb0.
This commit is contained in:
Madpeterz 2020-12-01 16:02:58 +00:00
parent ffaf871082
commit 325a30c2b8
2 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/Commands/Group/GroupInvite.cs
View file

@ -33,9 +33,9 @@ namespace BSB.Commands.Group
{
if (bot.MyGroups.ContainsKey(target_group) == true)
{
if (bot.GetAllowGroupInvite(target_avatar, target_group) == true)
if (bot.GetAllowGroupInvite(target_avatar) == true)
{
bot.GroupInviteLockoutArm(target_avatar,target_group); // enable 120 sec cooldown
bot.GroupInviteLockoutArm(target_avatar); // enable 120 sec cooldown
ForRealGroupInvite(args, target_group, target_avatar);
return true;
}

49
Core/bottypes/CommandsBot.cs
View file

@ -88,7 +88,7 @@ namespace BSB.bottypes
protected Dictionary<string, string> Scripts_content = new Dictionary<string, string>();
protected Dictionary<string, string> notecards_content = new Dictionary<string, string>();
protected Dictionary<UUID, Dictionary<UUID, long>> group_invite_lockout_timer = new Dictionary<UUID, Dictionary<UUID, long>>();
protected Dictionary<UUID, long> group_invite_lockout_timer = new Dictionary<UUID, long>();
protected long last_cleanup_commands;
public override string GetStatus()
@ -102,46 +102,35 @@ namespace BSB.bottypes
CommandsInterface.StatusTick();
return base.GetStatus();
}
public bool GetAllowGroupInvite(UUID avatar, UUID group)
public bool GetAllowGroupInvite(UUID avatar)
{
if (group_invite_lockout_timer.ContainsKey(group) == true)
{
return !group_invite_lockout_timer[group].ContainsKey(avatar);
}
return true;
return !group_invite_lockout_timer.ContainsKey(avatar);
}
public void GroupInviteLockoutArm(UUID avatar, UUID group)
{
if (group_invite_lockout_timer.ContainsKey(group) == false)
{
group_invite_lockout_timer.Add(group, new Dictionary<UUID, long>());
}
if (group_invite_lockout_timer[group].ContainsKey(avatar) == false)
public void GroupInviteLockoutArm(UUID avatar)
{
if (group_invite_lockout_timer.ContainsKey(avatar) == false)
{
group_invite_lockout_timer[group].Add(avatar,0);
group_invite_lockout_timer.Add(avatar,0);
}
group_invite_lockout_timer[group][avatar] = helpers.UnixTimeNow();
group_invite_lockout_timer[avatar] = helpers.UnixTimeNow();
}
protected void PurgeOldGroupinviteLockouts()
{
long now = helpers.UnixTimeNow();
foreach (UUID group in group_invite_lockout_timer.Keys)
{
List<UUID> clear_locks = new List<UUID>();
foreach (KeyValuePair<UUID, long> Glock in group_invite_lockout_timer[group])
{
long dif = now - Glock.Value;
if (dif >= 120)
{
clear_locks.Add(Glock.Key);
}
}
foreach (UUID glock in clear_locks)
{
group_invite_lockout_timer[group].Remove(glock);
List<UUID> clear_locks = new List<UUID>();
foreach(KeyValuePair<UUID,long> Glock in group_invite_lockout_timer)
{
long dif = now - Glock.Value;
if(dif >= 120)
{
clear_locks.Add(Glock.Key);
}
}
foreach(UUID glock in clear_locks)
{
group_invite_lockout_timer.Remove(glock);
}
}
protected void custom_commands_loop(string command,string arg,UUID caller)