From af2bc3a78cf9184418070dd22273cba78d21d848 Mon Sep 17 00:00:00 2001 From: Marc Egerton Date: Mon, 25 May 2020 23:08:30 +0100 Subject: [PATCH] Main/Features: Fix help text typo and update default configuration. --- cmd/bot_config.json | 7 +++---- features/misc.go | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/bot_config.json b/cmd/bot_config.json index c092dc0..75e422e 100644 --- a/cmd/bot_config.json +++ b/cmd/bot_config.json @@ -5,12 +5,13 @@ "status_text": ".help", "welcome_text": "Hi! Welcome to the Hak5 Discord Server. Please be sure to check out the #rules channel and say hello in #general! Remember to use the correct channels and grab a nickname color from #bots!", + "rules_text": "The Hak5 community is a place where pentesters, students, coders, enthusiasts and all-around Hak5 fans come together to help each other, inspire one another and collectively share feedback with Hak5. It's a welcoming place! We just ask that you follow these simple rules:\n\n1. BE GOOD. BE NICE. BEHAVE\nThis isn't a place for trolling – it's a place to help an encourage each other, and to provide constructive feedback. Remember, nobody was born 1337. We all started somewhere.\n\n2. DON'T SPAM\nPlease keep your posts relevant to the topic, thread or board you're posting on. Don't post random junk, troll bait or off topic ramblings – that's what YouTube is for ;)\n\n3. VIEWS EXPRESSED ARE NOT THAT OF HAK5\nWe don't prescreen any information submitted by community members. We retain the right, but not the responsibility, to edit or remove posts which violate the community guidelines. Further, Hak5 does not provide formal product support on the community forums. Hak5 may provide general product or technical information, however any information provided is offered on an \"AS IS\" basis without warranties of any kind. This disclaimer is in addition to the disclaimers and limitation of liability set forth in the Terms of Service. Similarly, community contributions such as payloads come with absolutely no warranty. You are solely responsible for the outcome of their execution.\n\nNo advertising or solicitiaion and please keep chat both ethical & legal.\n\nPlease do not post any personal order information in chat.\nIf you have questions about an order of you've placed with the Hak5 Shop please contact support via the links provided on our website https://shop.hak5.org/", "admin_roles": ["Admin", "Moderator"], "join_role_ids": [], "command_restrictions": [ - { "command": "color", "mode": "white", "channels": ["698567678025138277", "698519835532984470"] }, - { "command": "colors", "mode": "white", "channels": ["698567678025138277", "698519835532984470"] } + { "command": "color", "mode": "white", "channels": ["714366713512067103", "698519835532984470"] }, + { "command": "colors", "mode": "white", "channels": ["714366713512067103", "698519835532984470"] } ], "color_roles": [ @@ -22,7 +23,5 @@ { "color": "pink", "id": "697965484313935966" } ], - "rules_text": "The Hak5 community is a place where pentesters, students, coders, enthusiasts and all-around Hak5 fans come together to help each other, inspire one another and collectively share feedback with Hak5. It's a welcoming place! We just ask that you follow these simple rules:\n\n1. BE GOOD. BE NICE. BEHAVE\nThis isn't a place for trolling – it's a place to help an encourage each other, and to provide constructive feedback. Remember, nobody was born 1337. We all started somewhere.\n\n2. DON'T SPAM\nPlease keep your posts relevant to the topic, thread or board you're posting on. Don't post random junk, troll bait or off topic ramblings – that's what YouTube is for ;)\n\n3. VIEWS EXPRESSED ARE NOT THAT OF HAK5\nWe don't prescreen any information submitted by community members. We retain the right, but not the responsibility, to edit or remove posts which violate the community guidelines. Further, Hak5 does not provide formal product support on the community forums. Hak5 may provide general product or technical information, however any information provided is offered on an \"AS IS\" basis without warranties of any kind. This disclaimer is in addition to the disclaimers and limitation of liability set forth in the Terms of Service. Similarly, community contributions such as payloads come with absolutely no warranty. You are solely responsible for the outcome of their execution.\n\nNo advertising or solicitiaion and please keep chat both ethical & legal.\n\nPlease do not post any personal order information in chat.\nIf you have questions about an order of you've placed with the Hak5 Shop please contact support via the links provided on our website https://shop.hak5.org/", - "logging_channel": "714369335254188053" } diff --git a/features/misc.go b/features/misc.go index 8f0de11..75e7d97 100644 --- a/features/misc.go +++ b/features/misc.go @@ -307,7 +307,7 @@ func (f *Features) handleHelp(s *discordgo.Session, m *discordgo.MessageCreate) desc += "`setconfig` - Manage the runtime configuration\n" desc += "`getconfig` - View the runtime configuration\n" desc += "`reloadconfig` - Reload configuration from disk\n" - desc += "`saveconfig` - View the runtime configuration to disk\n" + desc += "`saveconfig` - Save the runtime configuration to disk\n" } desc += "\n\nAll commands are prefixed with `" + f.Config.CommandKey + "`\n"