diff --git a/StarsiegeBot/ChannelManagement.cs b/StarsiegeBot/ChannelManagement.cs index 48a865f..c79f820 100644 --- a/StarsiegeBot/ChannelManagement.cs +++ b/StarsiegeBot/ChannelManagement.cs @@ -23,6 +23,13 @@ namespace StarsiegeBot Console.WriteLine("Channel Management Module loaded."); } + [GroupCommand] + public async Task NothingHere (CommandContext ctx) + { + await ctx.TriggerTypingAsync(); + } + + [Group("allow")] class Allow { @@ -120,7 +127,6 @@ namespace StarsiegeBot - [Command("deny")] private static DiscordEmbedBuilder StartEmbed(string desc) { diff --git a/StarsiegeBot/EventTriggers.cs b/StarsiegeBot/EventTriggers.cs index f086296..53fb143 100644 --- a/StarsiegeBot/EventTriggers.cs +++ b/StarsiegeBot/EventTriggers.cs @@ -46,7 +46,11 @@ namespace StarsiegeBot { string gId = e.Guild.Id.ToString(); 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())) { diff --git a/StarsiegeBot/Json/guildsettings.json b/StarsiegeBot/Json/guildsettings.json index 1fc1550..9ddfc79 100644 --- a/StarsiegeBot/Json/guildsettings.json +++ b/StarsiegeBot/Json/guildsettings.json @@ -1,138 +1 @@ -{ - "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>!" - } -} \ No newline at end of file +{"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}} \ No newline at end of file diff --git a/StarsiegeBot/Starsiege/GameInfo.cs b/StarsiegeBot/Starsiege/GameInfo.cs index 47bbb3a..dbb3469 100644 --- a/StarsiegeBot/Starsiege/GameInfo.cs +++ b/StarsiegeBot/Starsiege/GameInfo.cs @@ -141,8 +141,8 @@ namespace StarsiegeBot int count = 0; foreach (GameServer item in _gameData.Games) { - // if (item.PlayerCount > playerCount) - if (item.GameStatus["Started"]) + if (item.PlayerCount > playerCount) + // if (item.GameStatus["Started"]) { count++; msg.Content += $"{count} | {item.Name} | {item.PlayerCount}/{item.MaxPlayers} | {item.Address}\r\n";