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

new config value: DiscordFull_Keep_GroupChat

Browse source 
When set to True discord group chat messages will not be removed
This commit is contained in:
Madpeterz 2021-01-31 03:38:06 +00:00
parent 293d39f1c8
commit 3c4158bcf4
3 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BSBshared/Json/JsonConfig.cs
View file

@ -40,6 +40,8 @@ namespace BetterSecondBotShared.Json
public string DiscordFull_Token { get; set; } public string DiscordFull_Token { get; set; }
public ulong DiscordFull_ServerID { get; set; } public ulong DiscordFull_ServerID { get; set; }
public bool DiscordFull_Keep_GroupChat { get; set; }
// HTTP interface // HTTP interface
public bool Http_Enable { get; set; } public bool Http_Enable { get; set; }
public int Http_Port { get; set; } public int Http_Port { get; set; }

4
BSBshared/Json/JsonConfigApi.cs
View file

@ -113,6 +113,10 @@ namespace BetterSecondBotShared.Json
{ {
return "UUID of a object the bot should attempt to sit on after logging in"; return "UUID of a object the bot should attempt to sit on after logging in";
} }
else if (cmd == "DiscordFull_Keep_GroupChat")
{
return "When set to true discord group chat messages will not be removed";
}
return ""; return "";
} }
protected string GetHelp_HTTP(string cmd) protected string GetHelp_HTTP(string cmd)

39
CLI/DiscordSupervisor/ChannelControl.cs
View file

@ -17,26 +17,42 @@ namespace BetterSecondBot.DiscordSupervisor
channelname = channelname.ToLowerInvariant(); channelname = channelname.ToLowerInvariant();
channelname = String.Concat(channelname.Where(char.IsLetterOrDigit)); channelname = String.Concat(channelname.Where(char.IsLetterOrDigit));
ITextChannel Channel = await FindTextChannel(channelname, catmap[catmapid], sender_id, TopicType).ConfigureAwait(true); ITextChannel Channel = await FindTextChannel(channelname, catmap[catmapid], sender_id, TopicType, false).ConfigureAwait(true);
if (Channel != null) if (Channel != null)
{ {
return await Channel.SendMessageAsync(message).ConfigureAwait(false); return await Channel.SendMessageAsync(message).ConfigureAwait(false);
} }
} }
return null; return null;
}
protected async Task<ITextChannel> FindTextChannel(string channelname, ICategoryChannel cat, UUID sender, string TopicType, bool CleanChannel)
{
return await FindTextChannel(DiscordServer, channelname, cat, sender, TopicType, true, CleanChannel);
} }
protected async Task<ITextChannel> FindTextChannel(string channelname, ICategoryChannel cat, UUID sender, string TopicType)
{
return await FindTextChannel(DiscordServer, channelname, cat, sender, TopicType);
}
protected async Task<ITextChannel> FindTextChannel(IGuild onserver, string channelname) protected async Task<ITextChannel> FindTextChannel(IGuild onserver, string channelname)
{ {
return await FindTextChannel(onserver, channelname, null, UUID.Zero, "notUSED", false); return await FindTextChannel(onserver, channelname, null, UUID.Zero, "notUSED");
}
protected async Task<ITextChannel> FindTextChannel(IGuild onserver, string channelname, ICategoryChannel cat)
{
return await FindTextChannel(onserver, channelname, cat, UUID.Zero, "notUSED", true);
}
protected async Task<ITextChannel> FindTextChannel(IGuild onserver, string channelname, ICategoryChannel cat, UUID sender, string TopicType)
{
return await FindTextChannel(onserver, channelname, cat, sender, TopicType, true);
}
protected async Task<ITextChannel> FindTextChannel(IGuild onserver, string channelname, ICategoryChannel cat, UUID sender, string TopicType, bool create_channel)
{
return await FindTextChannel(onserver, channelname, cat, sender, TopicType, create_channel, true);
} }
protected async Task<ITextChannel> FindTextChannel(IGuild onserver,string channelname, ICategoryChannel cat, UUID sender, string TopicType,bool create_channel=true) protected async Task<ITextChannel> FindTextChannel(IGuild onserver,string channelname, ICategoryChannel cat, UUID sender, string TopicType,bool create_channel, bool CleanChannel)
{ {
await WaitForUnlock().ConfigureAwait(false); await WaitForUnlock().ConfigureAwait(false);
channelname = channelname.ToLowerInvariant(); channelname = channelname.ToLowerInvariant();
@ -74,7 +90,10 @@ namespace BetterSecondBot.DiscordSupervisor
} }
else else
{ {
await CleanDiscordChannel(result, 24).ConfigureAwait(false); if (CleanChannel == true)
{
await CleanDiscordChannel(result, 24).ConfigureAwait(false);
}
} }
} }
DiscordLock = false; DiscordLock = false;
@ -256,7 +275,7 @@ namespace BetterSecondBot.DiscordSupervisor
} }
foreach (string A in required_channels) foreach (string A in required_channels)
{ {
_ = await FindTextChannel(A, catmap["bot"], UUID.Zero, "bot").ConfigureAwait(false); _ = await FindTextChannel(A, catmap["bot"], UUID.Zero, "bot", true).ConfigureAwait(false);
} }
if (HasBot() == true) if (HasBot() == true)
@ -267,7 +286,7 @@ namespace BetterSecondBot.DiscordSupervisor
groupname = String.Concat(groupname.Where(char.IsLetterOrDigit)); groupname = String.Concat(groupname.Where(char.IsLetterOrDigit));
if (GroupChannels.Contains(groupname) == false) if (GroupChannels.Contains(groupname) == false)
{ {
_ = await FindTextChannel(groupname, catmap["group"], G.ID, "Group").ConfigureAwait(false); _ = await FindTextChannel(groupname, catmap["group"], G.ID, "Group", !myconfig.DiscordFull_Keep_GroupChat).ConfigureAwait(false);
} }
} }
} }