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

Update Group.cs

Browse source
This commit is contained in:
Madpeterz 2021-02-25 01:51:47 +00:00
parent 23c62b23f3
commit 622189ccfd
1 changed files with 64 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
Core/Commands/Group.cs
View file

@ -9,6 +9,7 @@ using System.Text;
using OpenMetaverse; using OpenMetaverse;
using Newtonsoft.Json; using Newtonsoft.Json;
using BetterSecondBotShared.Static; using BetterSecondBotShared.Static;
using System.Threading;
namespace BetterSecondBot.HttpService namespace BetterSecondBot.HttpService
{ {
@ -43,12 +44,12 @@ namespace BetterSecondBot.HttpService
if (bot.NeedReloadGroupData(groupuuid) == true) if (bot.NeedReloadGroupData(groupuuid) == true)
{ {
bot.GetClient.Groups.RequestGroupMembers(groupuuid); bot.GetClient.Groups.RequestGroupMembers(groupuuid);
return Failure("Updating");
} }
ProcessAvatar(avatar); ProcessAvatar(avatar);
if (avataruuid == UUID.Zero) KeyValuePair<bool, string> reply = waitForReady(true, true, groupuuid);
if (reply.Key == false)
{ {
return Failure("avatar lookup"); return Failure(reply.Value);
} }
bool status = bot.FastCheckInGroup(groupuuid, avataruuid); bool status = bot.FastCheckInGroup(groupuuid, avataruuid);
return BasicReply(status.ToString()); return BasicReply(status.ToString());
@ -79,7 +80,11 @@ namespace BetterSecondBot.HttpService
if (bot.NeedReloadGroupData(groupuuid) == true) if (bot.NeedReloadGroupData(groupuuid) == true)
{ {
bot.GetClient.Groups.RequestGroupMembers(groupuuid); bot.GetClient.Groups.RequestGroupMembers(groupuuid);
return Failure("Updating"); }
KeyValuePair<bool, string> reply = waitForReady(false, true, groupuuid);
if (reply.Key == false)
{
return Failure(reply.Value);
} }
return bot.GetGroupMembers(groupuuid); return bot.GetGroupMembers(groupuuid);
} }
@ -111,12 +116,12 @@ namespace BetterSecondBot.HttpService
if (bot.NeedReloadGroupData(groupuuid) == true) if (bot.NeedReloadGroupData(groupuuid) == true)
{ {
bot.GetClient.Groups.RequestGroupMembers(groupuuid); bot.GetClient.Groups.RequestGroupMembers(groupuuid);
return Failure("Updating");
} }
ProcessAvatar(avatar); ProcessAvatar(avatar);
if (avataruuid == UUID.Zero) KeyValuePair<bool, string> reply = waitForReady(true, true, groupuuid);
if (reply.Key == false)
{ {
return Failure("avatar lookup"); return Failure(reply.Value);
} }
bool status = bot.FastCheckInGroup(groupuuid, avataruuid); bool status = bot.FastCheckInGroup(groupuuid, avataruuid);
if(status == false) if(status == false)
@ -160,12 +165,12 @@ namespace BetterSecondBot.HttpService
if (bot.NeedReloadGroupData(groupuuid) == true) if (bot.NeedReloadGroupData(groupuuid) == true)
{ {
bot.GetClient.Groups.RequestGroupMembers(groupuuid); bot.GetClient.Groups.RequestGroupMembers(groupuuid);
return Failure("Updating");
} }
ProcessAvatar(avatar); ProcessAvatar(avatar);
if (avataruuid == UUID.Zero) KeyValuePair<bool, string> reply = waitForReady(true, true, groupuuid);
if (reply.Key == false)
{ {
return Failure("avatar lookup"); return Failure(reply.Value);
} }
bool status = bot.FastCheckInGroup(groupuuid, avataruuid); bool status = bot.FastCheckInGroup(groupuuid, avataruuid);
if (status == false) if (status == false)
@ -205,12 +210,12 @@ namespace BetterSecondBot.HttpService
if (bot.NeedReloadGroupData(groupuuid) == true) if (bot.NeedReloadGroupData(groupuuid) == true)
{ {
bot.GetClient.Groups.RequestGroupMembers(groupuuid); bot.GetClient.Groups.RequestGroupMembers(groupuuid);
return Failure("Updating");
} }
ProcessAvatar(avatar); ProcessAvatar(avatar);
if (avataruuid == UUID.Zero) KeyValuePair<bool,string> reply = waitForReady(true, true, groupuuid);
if(reply.Key == false)
{ {
return Failure("avatar lookup"); return Failure(reply.Value);
} }
bool status = bot.FastCheckInGroup(groupuuid, avataruuid); bool status = bot.FastCheckInGroup(groupuuid, avataruuid);
if (status == true) if (status == true)
@ -553,6 +558,52 @@ namespace BetterSecondBot.HttpService
bot.GetClient.Self.InstantMessageGroup(groupUUID, message); bot.GetClient.Self.InstantMessageGroup(groupUUID, message);
return BasicReply("Sending"); return BasicReply("Sending");
} }
protected KeyValuePair<bool, string> waitForReady(bool avatar, bool group, UUID groupuuid)
{
bool exit = false;
int sleeps = 0;
string failed_on = "";
bool allok = true;
while (exit == false)
{
allok = true;
failed_on = "";
if (avatar == true)
{
if (avataruuid == UUID.Zero)
{
allok = false;
failed_on = "avatar lookup";
}
}
if ((group == true) && (allok == true))
{
allok = !bot.NeedReloadGroupData(groupuuid);
failed_on = "Updating";
}
if (allok == false)
{
if (sleeps > 3)
{
exit = true;
}
}
if (allok == true)
{
exit = true;
}
else
{
if (exit == false)
{
Thread.Sleep(1000);
sleeps++;
}
}
}
return new KeyValuePair<bool, string>(allok, failed_on);
}
} }
public class GroupRoleDetails public class GroupRoleDetails