From d73497dff47540d3e7537ff7056a97e390ad55ce Mon Sep 17 00:00:00 2001 From: Madpeterz <57852827+Madpeterz@users.noreply.github.com> Date: Thu, 25 Feb 2021 03:07:15 +0000 Subject: [PATCH] correct parcel commands issue --- BetterSecondBot.sln | 1 + BetterSecondbot/Dockerfile | 1 + Core/HttpService/HttpAsService.cs | 2 +- Core/bottypes/EventsBot.cs | 2 +- Dockerfile | 10 +--------- Shared/Json/JsonConfig.cs | 2 ++ Shared/Json/JsonConfigApi.cs | 5 +++++ 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/BetterSecondBot.sln b/BetterSecondBot.sln index 9083f60..4d4edb7 100644 --- a/BetterSecondBot.sln +++ b/BetterSecondBot.sln @@ -10,6 +10,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Items", "Project Items", "{C343303B-F9BF-46B3-BBB5-5596823EC71C}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore + Dockerfile = Dockerfile NuGet.Config = NuGet.Config README.md = README.md EndProjectSection diff --git a/BetterSecondbot/Dockerfile b/BetterSecondbot/Dockerfile index 67c2de3..69a623e 100644 --- a/BetterSecondbot/Dockerfile +++ b/BetterSecondbot/Dockerfile @@ -39,6 +39,7 @@ ENV Setting_AllowFunds='false' ENV Setting_LogCommands='false' ENV Setting_DefaultSit_UUID='' ENV Setting_loginURI='secondlife' +ENV Setting_Tracker='false' ENV DiscordFull_Enable='false' ENV DiscordFull_Token='' diff --git a/Core/HttpService/HttpAsService.cs b/Core/HttpService/HttpAsService.cs index d44c30e..0af155a 100644 --- a/Core/HttpService/HttpAsService.cs +++ b/Core/HttpService/HttpAsService.cs @@ -439,7 +439,7 @@ namespace BetterSecondBot.HttpService return new KeyValuePair(false, "Parcel data not ready"); } } - Parcel targetparcel = bot.GetClient.Network.CurrentSim.Parcels[localid]; + targetparcel = bot.GetClient.Network.CurrentSim.Parcels[localid]; return new KeyValuePair(true, ""); } diff --git a/Core/bottypes/EventsBot.cs b/Core/bottypes/EventsBot.cs index 184c5b3..8c6bee8 100644 --- a/Core/bottypes/EventsBot.cs +++ b/Core/bottypes/EventsBot.cs @@ -274,7 +274,7 @@ namespace BetterSecondBot.bottypes if (group_members_storage.ContainsKey(group) == true) { long dif = last_cleanup - group_members_storage[group].Key; - if (dif < 60) + if (dif < 240) { result= false; } diff --git a/Dockerfile b/Dockerfile index ce22268..69a623e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,12 +37,10 @@ ENV Security_WebUIKey='' ENV Setting_AllowRLV='false' ENV Setting_AllowFunds='false' ENV Setting_LogCommands='false' -ENV Setting_RelayImToAvatarUUID='' ENV Setting_DefaultSit_UUID='' ENV Setting_loginURI='secondlife' +ENV Setting_Tracker='false' -ENV DiscordRelay_URL='' -ENV DiscordRelay_GroupUUID='' ENV DiscordFull_Enable='false' ENV DiscordFull_Token='' ENV DiscordFull_ServerID='' @@ -55,12 +53,6 @@ ENV Name2Key_Enable='false' ENV Name2Key_Url='http://localhost:1234' ENV Name2Key_Key='magic' -ENV DiscordTTS_Enable='false' -ENV DiscordTTS_server_id='' -ENV DiscordTTS_channel_name='' -ENV DiscordTTS_avatar_uuid='' -ENV DiscordTTS_Nickname='' - ENV Log2File_Enable='false' ENV Log2File_Level=1 diff --git a/Shared/Json/JsonConfig.cs b/Shared/Json/JsonConfig.cs index cab6c00..efdad55 100644 --- a/Shared/Json/JsonConfig.cs +++ b/Shared/Json/JsonConfig.cs @@ -43,6 +43,8 @@ namespace BetterSecondBotShared.Json public string Setting_DefaultSit_UUID { get; set; } public string Setting_loginURI { get; set; } + public string Setting_Tracker { get; set; } + // Discord FullFat public bool DiscordFull_Enable { get; set; } public string DiscordFull_Token { get; set; } diff --git a/Shared/Json/JsonConfigApi.cs b/Shared/Json/JsonConfigApi.cs index d2068fb..a1b523a 100644 --- a/Shared/Json/JsonConfigApi.cs +++ b/Shared/Json/JsonConfigApi.cs @@ -84,6 +84,10 @@ namespace BetterSecondBotShared.Json { return "Allow the bot to send command to console and discord full if enabled"; } + else if(cmd == "Setting_Tracker") + { + return "should the avatar tracker be enabled (anything but \"false\") and if so where should it go: (Channel number or a url)"; + } return ""; } protected string GetHelp_Discord(string cmd) @@ -209,6 +213,7 @@ namespace BetterSecondBotShared.Json else if (cmd == "Setting_DefaultSit_UUID") { return ""; } else if (cmd == "Setting_loginURI") { return "secondlife"; } else if (cmd == "Setting_LogCommands") { return "True"; } + else if(cmd == "Setting_Tracker") { return "False"; } return ""; } protected string GetValueHint_Discord(string cmd)