github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started major API refactor

Browse Source
This commit is contained in:
RogueException
2015-10-24 01:39:06 -03:00
parent 3fdd39c462
commit dd6ceb8469
31 changed files with 858 additions and 1299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net.Commands/CommandsPlugin.Events.cs
View File

@@ -11,14 +11,10 @@ namespace Discord.Commands
public string ArgText { get; }
public int? Permissions { get; }
public string[] Args { get; }
public User User => Message.User;
public string UserId => Message.UserId;
public Member Member => Message.Member;
public Channel Channel => Message.Channel;
public string ChannelId => Message.ChannelId;
public Server Server => Message.Channel.Server;
public string ServerId => Message.Channel.ServerId;
public CommandEventArgs(Message message, Command command, string commandText, string argText, int? permissions, string[] args)
{

6
src/Discord.Net.Commands/CommandsPlugin.cs
View File

@@ -8,7 +8,7 @@ namespace Discord.Commands
{
private readonly DiscordClient _client;
private List<Command> _commands;
private Func<User, Server, int> _getPermissions;
private Func<Member, int> _getPermissions;
public IEnumerable<Command> Commands => _commands;
@@ -17,7 +17,7 @@ namespace Discord.Commands
public bool RequireCommandCharInPublic { get; set; }
public bool RequireCommandCharInPrivate { get; set; }
public CommandsPlugin(DiscordClient client, Func<User, Server, int> getPermissions = null)
public CommandsPlugin(DiscordClient client, Func<Member, int> getPermissions = null)
{
_client = client;
_getPermissions = getPermissions;
@@ -96,7 +96,7 @@ namespace Discord.Commands
argText = msg.Substring(args[cmd.Parts.Length].Index);
//Check Permissions
int permissions = _getPermissions != null ? _getPermissions(e.Message.User, e.Message.Channel?.Server) : 0;
int permissions = _getPermissions != null ? _getPermissions(e.Message.Member) : 0;
var eventArgs = new CommandEventArgs(e.Message, cmd, msg, argText, permissions, newArgs);
if (permissions < cmd.MinPerms)
{