sydney/DiscordBot
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed a few things around

Browse Source
This commit is contained in:
Chris Darnell committed 2021-05-10 06:15:23 -07:00
1 parent 66e52c4f7f
commit e694fc494b
4 files changed
+15 -142
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

StarsiegeBot/ChannelManagement.cs
+7 -1
View File
@@ -23,6 +23,13 @@ namespace StarsiegeBot
Console.WriteLine("Channel Management Module loaded."); Console.WriteLine("Channel Management Module loaded.");
} }
[GroupCommand]
public async Task NothingHere (CommandContext ctx)
{
await ctx.TriggerTypingAsync();
}
[Group("allow")] [Group("allow")]
class Allow class Allow
{ {
@@ -120,7 +127,6 @@ namespace StarsiegeBot
[Command("deny")]
private static DiscordEmbedBuilder StartEmbed(string desc) private static DiscordEmbedBuilder StartEmbed(string desc)
{ {
StarsiegeBot/EventTriggers.cs
+5 -1
View File
@@ -46,7 +46,11 @@ namespace StarsiegeBot
{ {
string gId = e.Guild.Id.ToString(); string gId = e.Guild.Id.ToString();
bool allowedToPost = false; bool allowedToPost = false;
if (BotSettings.GuildSettings[gId].DenyChannels.Contains("all")) if (BotSettings.GuildSettings[gId].DenyChannels is null)
{
allowedToPost = true;
}
else if (BotSettings.GuildSettings[gId].DenyChannels.Contains("all"))
{ {
if (BotSettings.GuildSettings[gId].AllowChannels.Contains(e.Channel.Id.ToString())) if (BotSettings.GuildSettings[gId].AllowChannels.Contains(e.Channel.Id.ToString()))
{ {
StarsiegeBot/Json/guildsettings.json
+1 -138
View File
@@ -1,138 +1 @@
{ {"default":{"UseGlobalPrefix":true,"UseSelfRoles":false,"UseLevelRoles":false,"UseLevels":false,"AllowRolesPurchase":false,"UseAutoRoles":false,"Prefixes":[">"],"HiddenRolesList":null,"SelfRoles":{},"LevelRoles":{},"WelcomeChannel":null,"UseWelcome":false,"WelcomeMessage":null,"AllowChannels":null,"DenyChannels":null},"376937422010974209":{"UseGlobalPrefix":true,"UseSelfRoles":false,"UseLevelRoles":false,"UseLevels":false,"AllowRolesPurchase":false,"UseAutoRoles":false,"Prefixes":[],"HiddenRolesList":null,"SelfRoles":{},"LevelRoles":{},"WelcomeChannel":null,"UseWelcome":false,"WelcomeMessage":"","AllowChannels":null,"DenyChannels":null},"768366579468468244":{"UseGlobalPrefix":true,"UseSelfRoles":false,"UseLevelRoles":false,"UseLevels":false,"AllowRolesPurchase":false,"UseAutoRoles":false,"Prefixes":[],"HiddenRolesList":null,"SelfRoles":{},"LevelRoles":{},"WelcomeChannel":null,"UseWelcome":false,"WelcomeMessage":"","AllowChannels":null,"DenyChannels":null},"831348953097961534":{"UseGlobalPrefix":true,"UseSelfRoles":false,"UseLevelRoles":false,"UseLevels":false,"AllowRolesPurchase":false,"UseAutoRoles":false,"Prefixes":[],"HiddenRolesList":null,"SelfRoles":{},"LevelRoles":{},"WelcomeChannel":null,"UseWelcome":false,"WelcomeMessage":"","AllowChannels":null,"DenyChannels":null}}
"default": {
"UseGlobalPrefix": true,
"UseSelfRoles": false,
"UseLevelRoles": false,
"UseLevels": false,
"AllowRolesPurchase": false,
"UseAutoRoles": false,
"Prefixes": [
"::"
],
"SelfRoles": {
},
"LevelRoles": {
},
"HiddenRolesList": null,
"WelcomeChannel": null,
"UseWelcome": false,
"WelcomeMessage": null
},
"297873205316681728": {
"UseGlobalPrefix": true,
"UseSelfRoles": false,
"UseLevelRoles": false,
"UseLevels": false,
"AllowRolesPurchase": false,
"UseAutoRoles": false,
"Prefixes": [
">",
"::",
"~"
],
"SelfRoles": {
},
"LevelRoles": {
},
"HiddenRolesList": null,
"WelcomeChannel": null,
"UseWelcome": false,
"WelcomeMessage": null
},
"376937422010974209": {
"UseGlobalPrefix": true,
"UseSelfRoles": false,
"UseLevelRoles": false,
"UseLevels": false,
"AllowRolesPurchase": false,
"UseAutoRoles": false,
"Prefixes": [
">"
],
"SelfRoles": {
},
"LevelRoles": {
},
"HiddenRolesList": null,
"WelcomeChannel": null,
"UseWelcome": false,
"WelcomeMessage": null
},
"768366579468468244": {
"UseGlobalPrefix": true,
"UseSelfRoles": false,
"UseLevelRoles": false,
"UseLevels": false,
"AllowRolesPurchase": false,
"UseAutoRoles": false,
"Prefixes": [
">"
],
"SelfRoles": {
},
"LevelRoles": {
},
"HiddenRolesList": null,
"WelcomeChannel": null,
"UseWelcome": false,
"WelcomeMessage": null
},
"831348953097961534": {
"UseGlobalPrefix": true,
"UseSelfRoles": false,
"UseLevelRoles": false,
"UseLevels": false,
"AllowRolesPurchase": false,
"UseAutoRoles": false,
"Prefixes": [
">",
"::",
"~",
"!",
"%",
"^",
"&",
"*",
"(",
")",
"-",
"_",
"=",
"+",
"[",
"]",
"{",
"}",
";",
":",
"<",
">",
",",
".",
"?"
],
"SelfRoles": {
},
"LevelRoles": {
},
"HiddenRolesList": null,
"WelcomeChannel": {
"permission_overwrites": [
],
"guild_id": 831348953097961534,
"parent_id": 831348953097961535,
"name": "general",
"type": 0,
"position": 0,
"topic": "",
"last_message_id": 836202598540509245,
"bitrate": 0,
"user_limit": 0,
"rate_limit_per_user": 0,
"nsfw": false,
"id": 831348953097961537
},
"UseWelcome": true,
"WelcomeMessage": "Welcome to channel <#831348953097961537>!"
}
}
StarsiegeBot/Starsiege/GameInfo.cs
+2 -2
View File
@@ -141,8 +141,8 @@ namespace StarsiegeBot
int count = 0; int count = 0;
foreach (GameServer item in _gameData.Games) foreach (GameServer item in _gameData.Games)
{ {
// if (item.PlayerCount > playerCount) if (item.PlayerCount > playerCount)
if (item.GameStatus["Started"]) // if (item.GameStatus["Started"])
{ {
count++; count++;
msg.Content += $"{count} | {item.Name} | {item.PlayerCount}/{item.MaxPlayers} | {item.Address}\r\n"; msg.Content += $"{count} | {item.Name} | {item.PlayerCount}/{item.MaxPlayers} | {item.Address}\r\n";