RPCS3/archived-discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2026-01-31 01:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

you can mark command for deletion now with the new . command prefix

Browse Source
This commit is contained in:
13xforever
2019-02-25 02:05:29 +05:00
parent 211012d6c1
commit 39c9f166ed
19 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CompatBot/Commands/Attributes/LimitedToHelpChannel.cs
View File

@@ -16,7 +16,7 @@ namespace CompatBot.Commands.Attributes
if (ctx.Channel.Name.Equals("help", StringComparison.InvariantCultureIgnoreCase))
return true;
await ctx.RespondAsync($"`{Config.CommandPrefix}{ctx.Command.QualifiedName}` is limited to help channel and DMs").ConfigureAwait(false);
await ctx.RespondAsync($"`{ctx.Prefix}{ctx.Command.QualifiedName}` is limited to help channel and DMs").ConfigureAwait(false);
return false;
}
}

2
CompatBot/Commands/Attributes/LimitedToSpamChannel.cs
View File

@@ -30,7 +30,7 @@ namespace CompatBot.Commands.Attributes
catch {}
var spamChannel = await ctx.Client.GetChannelAsync(Config.BotSpamId).ConfigureAwait(false);
await ctx.RespondAsync($"`{Config.CommandPrefix}{ctx.Command.QualifiedName}` is limited to {spamChannel.Mention} and DMs").ConfigureAwait(false);
await ctx.RespondAsync($"`{ctx.Prefix}{ctx.Command.QualifiedName}` is limited to {spamChannel.Mention} and DMs").ConfigureAwait(false);
return false;
}

8
CompatBot/Commands/BaseCommandModuleCustom.cs
View File

@@ -20,6 +20,14 @@ namespace CompatBot.Commands
public override async Task BeforeExecutionAsync(CommandContext ctx)
{
try
{
await ctx.Message.DeleteAsync().ConfigureAwait(false);
}
catch (Exception e)
{
Config.Log.Warn(e, "Failed to delete command message with the autodelete command prefix");
}
var disabledCmds = DisabledCommandsProvider.Get();
if (disabledCmds.Contains(ctx.Command.QualifiedName) && !disabledCmds.Contains("*"))
{

2
CompatBot/Commands/Explain.cs
View File

@@ -123,7 +123,7 @@ namespace CompatBot.Commands
var spamChannel = await ctx.Client.GetChannelAsync(Config.BotSpamId).ConfigureAwait(false);
inSpecificLocation = $" in {spamChannel.Mention} or bot DMs";
}
var msg = $"Unknown term `{term.Sanitize()}`. Use `{Config.CommandPrefix}explain list` to look at defined terms{inSpecificLocation}";
var msg = $"Unknown term `{term.Sanitize()}`. Use `{ctx.Prefix}explain list` to look at defined terms{inSpecificLocation}";
await ctx.RespondAsync(msg).ConfigureAwait(false);
}

2
CompatBot/Commands/Sudo.Mod.cs
View File

@@ -23,7 +23,7 @@ namespace CompatBot.Commands
{
await ctx.ReactWithAsync(Config.Reactions.Success,
$"{user.Mention} was successfully added as moderator!\n" +
$"Try using `{Config.CommandPrefix}help` to see new commands available to you"
$"Try using `{ctx.Prefix}help` to see new commands available to you"
).ConfigureAwait(false);
}
else

1
CompatBot/Config.cs
View File

@@ -14,6 +14,7 @@ namespace CompatBot
internal static class Config
{
public static readonly string CommandPrefix = "!";
public static readonly string AutoRemoveCommandPrefix = ".";
public static readonly ulong BotGuildId = 272035812277878785; // discord server where the bot is supposed to be
public static readonly ulong BotGeneralChannelId = 272035812277878785;// #rpcs3; main or general channel where noobs come first thing
public static readonly ulong BotChannelId = 291679908067803136; // #compatbot; this is used for !compat/!top results and new builds announcements

5
CompatBot/EventHandlers/AppveyorLinksHandler.cs
View File

@@ -21,10 +21,7 @@ namespace CompatBot.EventHandlers
public static async Task OnMessageCreated(MessageCreateEventArgs args)
{
if (args.Author.IsBot)
return;
if (string.IsNullOrEmpty(args.Message.Content) || args.Message.Content.StartsWith(Config.CommandPrefix))
if (DefaultHandlerFilter.IsFluff(args.Message))
return;
var matches = BuildLinks.Matches(args.Message.Content);

3
CompatBot/EventHandlers/BotReactionsHandler.cs
View File

@@ -75,6 +75,9 @@ namespace CompatBot.EventHandlers
if (DefaultHandlerFilter.IsFluff(args.Message))
return;
if (args.Message.Channel.IsPrivate)
return;
#if DEBUG
if (args.Message.Content == "emoji test")
{

5
CompatBot/EventHandlers/GithubLinksHandler.cs
View File

@@ -18,10 +18,7 @@ namespace CompatBot.EventHandlers
public static async Task OnMessageCreated(MessageCreateEventArgs args)
{
if (args.Author.IsBot)
return;
if (string.IsNullOrEmpty(args.Message.Content) || args.Message.Content.StartsWith(Config.CommandPrefix))
if (DefaultHandlerFilter.IsFluff(args.Message))
return;
var lastBotMessages = await args.Channel.GetMessagesBeforeAsync(args.Message.Id, 20, DateTime.UtcNow.AddSeconds(-30)).ConfigureAwait(false);

5
CompatBot/EventHandlers/IsTheGamePlayableHandler.cs
View File

@@ -30,7 +30,7 @@ namespace CompatBot.EventHandlers
public static async Task OnMessageCreated(MessageCreateEventArgs args)
{
if (args.Author.IsBot)
if (DefaultHandlerFilter.IsFluff(args.Message))
return;
#if !DEBUG
@@ -43,9 +43,6 @@ namespace CompatBot.EventHandlers
&& DateTime.UtcNow - lastCheck < CooldownThreshold)
return;
if (string.IsNullOrEmpty(args.Message.Content) || args.Message.Content.StartsWith(Config.CommandPrefix))
return;
#if !DEBUG
if (args.Author.IsSmartlisted(args.Client, args.Guild))
return;

5
CompatBot/EventHandlers/LogAsTextMonitor.cs
View File

@@ -14,10 +14,7 @@ namespace CompatBot.EventHandlers
public static async Task OnMessageCreated(MessageCreateEventArgs args)
{
if (args.Author.IsBot)
return;
if (string.IsNullOrEmpty(args.Message.Content) || args.Message.Content.StartsWith(Config.CommandPrefix))
if (DefaultHandlerFilter.IsFluff(args.Message))
return;
if (!"help".Equals(args.Channel.Name, StringComparison.InvariantCultureIgnoreCase))

6
CompatBot/EventHandlers/LogParsingHandler.cs
View File

@@ -41,11 +41,7 @@ namespace CompatBot.EventHandlers
public static Task OnMessageCreated(MessageCreateEventArgs args)
{
var message = args.Message;
if (message.Author.IsBot)
return Task.CompletedTask;
if (!string.IsNullOrEmpty(message.Content) && message.Content.StartsWith(Config.CommandPrefix))
if (DefaultHandlerFilter.IsFluff(args.Message))
return Task.CompletedTask;
OnNewLog(args.Client, args.Channel, args.Message);

5
CompatBot/EventHandlers/PostLogHelpHandler.cs
View File

@@ -20,7 +20,7 @@ namespace CompatBot.EventHandlers
public static async Task OnMessageCreated(MessageCreateEventArgs args)
{
if (args.Author.IsBot)
if (DefaultHandlerFilter.IsFluff(args.Message))
return;
#if !DEBUG
@@ -31,9 +31,6 @@ namespace CompatBot.EventHandlers
return;
#endif
if (string.IsNullOrEmpty(args.Message.Content) || args.Message.Content.StartsWith(Config.CommandPrefix))
return;
if (!UploadLogMention.IsMatch(args.Message.Content))
return;

5
CompatBot/EventHandlers/ProductCodeLookup.cs
View File

@@ -25,10 +25,7 @@ namespace CompatBot.EventHandlers
public static async Task OnMessageCreated(MessageCreateEventArgs args)
{
if (args.Author.IsBot)
return;
if (string.IsNullOrEmpty(args.Message.Content) || args.Message.Content.StartsWith(Config.CommandPrefix))
if (DefaultHandlerFilter.IsFluff(args.Message))
return;
var lastBotMessages = await args.Channel.GetMessagesBeforeAsync(args.Message.Id, 20, DateTime.UtcNow.AddSeconds(-30)).ConfigureAwait(false);

8
CompatBot/EventHandlers/TableFlipMonitor.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
using CompatBot.Utils;
using DSharpPlus.EventArgs;
namespace CompatBot.EventHandlers
@@ -10,11 +11,7 @@ namespace CompatBot.EventHandlers
public static async Task OnMessageCreated(MessageCreateEventArgs args)
{
if (args.Author.IsBot)
return;
var content = args.Message.Content;
if (string.IsNullOrEmpty(content) || content.StartsWith(Config.CommandPrefix))
if (DefaultHandlerFilter.IsFluff(args.Message))
return;
/*
@@ -33,6 +30,7 @@ namespace CompatBot.EventHandlers
*/
try
{
var content = args.Message.Content;
if (!(content.Contains("┻━┻") ||
content.Contains("┻━┻")))
return;

4
CompatBot/EventHandlers/UnknownCommandHandler.cs
View File

@@ -15,6 +15,9 @@ namespace CompatBot.EventHandlers
{
public static async Task OnError(CommandErrorEventArgs e)
{
if (e.Context.User.IsBot)
return;
if (!(e.Exception is CommandNotFoundException cnfe))
{
Config.Log.Error(e.Exception);
@@ -25,6 +28,7 @@ namespace CompatBot.EventHandlers
return;
if (e.Context.Prefix != Config.CommandPrefix
&& e.Context.Prefix != Config.AutoRemoveCommandPrefix
&& (e.Context.Message.Content?.EndsWith("?") ?? false)
&& e.Context.CommandsNext.RegisteredCommands.TryGetValue("8ball", out var cmd))
{

2
CompatBot/Program.cs
View File

@@ -121,7 +121,7 @@ namespace CompatBot
{
var commands = client.UseCommandsNext(new CommandsNextConfiguration
{
StringPrefixes = new[] {Config.CommandPrefix},
StringPrefixes = new[] {Config.CommandPrefix, Config.AutoRemoveCommandPrefix},
Services = new ServiceCollection().BuildServiceProvider(),
});
commands.RegisterConverter(new CustomDiscordChannelConverter());

7
CompatBot/Utils/DefaultHandlerFilter.cs
View File

@@ -6,13 +6,12 @@ namespace CompatBot.Utils
{
internal static bool IsFluff(DiscordMessage message)
{
if (message.Channel.IsPrivate)
return true;
if (message.Author.IsBot)
return true;
if (string.IsNullOrEmpty(message.Content) || message.Content.StartsWith(Config.CommandPrefix))
if (string.IsNullOrEmpty(message.Content)
|| message.Content.StartsWith(Config.CommandPrefix)
|| message.Content.StartsWith(Config.AutoRemoveCommandPrefix))
return true;
return false;

2
CompatBot/Utils/DiscordClientExtensions.cs
View File

@@ -90,7 +90,7 @@ namespace CompatBot.Utils
public static Task ReactWithAsync(this CommandContext ctx, DiscordEmoji emoji, string fallbackMessage = null, bool? showBoth = null)
{
return ReactWithAsync(ctx.Message, ctx.Client, emoji, fallbackMessage, showBoth);
return ReactWithAsync(ctx.Message, ctx.Client, emoji, fallbackMessage, showBoth ?? (ctx.Prefix == Config.AutoRemoveCommandPrefix));
}
public static async Task<IReadOnlyCollection<DiscordMessage>> GetMessagesBeforeAsync(this DiscordChannel channel, ulong beforeMessageId, int limit = 100, DateTime? timeLimit = null)