mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

You can now use embedbuilder in HelpString and DMHelpString

Browse Source
This commit is contained in:
Master Kwoth 2017-11-15 20:52:34 +01:00
parent b6a1e9a420
commit 366f6de9dd
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
NadekoBot.Core/Modules/Help/Help.cs
View File

@ -11,6 +11,8 @@ using System.Collections.Generic;
using NadekoBot.Common.Attributes; using NadekoBot.Common.Attributes;
using NadekoBot.Modules.Help.Services; using NadekoBot.Modules.Help.Services;
using NadekoBot.Modules.Permissions.Services; using NadekoBot.Modules.Permissions.Services;
using NadekoBot.Common;
using NadekoBot.Common.Replacements;
namespace NadekoBot.Modules.Help namespace NadekoBot.Modules.Help
{ {
@ -23,7 +25,23 @@ namespace NadekoBot.Modules.Help
private readonly CommandService _cmds; private readonly CommandService _cmds;
private readonly GlobalPermissionService _perms; private readonly GlobalPermissionService _perms;
public string HelpString => String.Format(_config.BotConfig.HelpString, _creds.ClientId, Prefix); public EmbedBuilder GetHelpStringEmbed()
{
var r = new ReplacementBuilder()
.WithDefault(Context)
.WithOverride("{0}", () => _creds.ClientId.ToString())
.WithOverride("{1}", () => Prefix)
.Build();
if (!CREmbed.TryParse(_config.BotConfig.HelpString, out var embed))
return new EmbedBuilder().WithOkColor()
.WithDescription(String.Format(_config.BotConfig.HelpString, _creds.ClientId, Prefix));
r.Replace(embed);
return embed.ToEmbed();
}
public Help(IBotCredentials creds, GlobalPermissionService perms, IBotConfigProvider config, CommandService cmds) public Help(IBotCredentials creds, GlobalPermissionService perms, IBotConfigProvider config, CommandService cmds)
{ {
@ -93,16 +111,10 @@ namespace NadekoBot.Modules.Help
if (com == null) if (com == null)
{ {
IMessageChannel ch = channel is ITextChannel ? await ((IGuildUser)Context.User).GetOrCreateDMChannelAsync() : channel; IMessageChannel ch = channel is ITextChannel ? await ((IGuildUser)Context.User).GetOrCreateDMChannelAsync() : channel;
await ch.SendMessageAsync(HelpString).ConfigureAwait(false); await ch.EmbedAsync(GetHelpStringEmbed()).ConfigureAwait(false);
return; return;
} }
//if (com == null)
//{
// await ReplyErrorLocalized("command_not_found").ConfigureAwait(false);
// return;
//}
var embed = _service.GetCommandHelp(com, Context.Guild); var embed = _service.GetCommandHelp(com, Context.Guild);
await channel.EmbedAsync(embed).ConfigureAwait(false); await channel.EmbedAsync(embed).ConfigureAwait(false);
} }