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

Cleaned up a bit of the modules/services add/get format

Browse Source
This commit is contained in:
RogueException
2016-02-15 15:08:59 -04:00
parent 702125fdc6
commit 5c64cb68bf
17 changed files with 85 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net.Commands/CommandExtensions.cs
View File

@@ -6,14 +6,14 @@ namespace Discord.Commands
{
public static DiscordClient UsingCommands(this DiscordClient client, CommandServiceConfig config = null)
{
client.Services.Add(new CommandService(config));
client.AddService(new CommandService(config));
return client;
}
public static DiscordClient UsingCommands(this DiscordClient client, Action<CommandServiceConfigBuilder> configFunc = null)
{
var builder = new CommandServiceConfigBuilder();
configFunc(builder);
client.Services.Add(new CommandService(builder));
client.AddService(new CommandService(builder));
return client;
}
}

2
src/Discord.Net.Commands/Permissions/Levels/PermissionLevelChecker.cs
View File

@@ -10,7 +10,7 @@
internal PermissionLevelChecker(DiscordClient client, int minPermissions)
{
_service = client.Services.Get<PermissionLevelService>(true);
_service = client.GetService<PermissionLevelService>(true);
_minPermissions = minPermissions;
}

2
src/Discord.Net.Commands/Permissions/Levels/PermissionLevelExtensions.cs
View File

@@ -6,7 +6,7 @@ namespace Discord.Commands.Permissions.Levels
{
public static DiscordClient UsingPermissionLevels(this DiscordClient client, Func<User, Channel, int> permissionResolver)
{
client.Services.Add(new PermissionLevelService(permissionResolver));
client.AddService(new PermissionLevelService(permissionResolver));
return client;
}

2
src/Discord.Net.Commands/Permissions/Userlist/BlacklistChecker.cs
View File

@@ -6,7 +6,7 @@
internal BlacklistChecker(DiscordClient client)
{
_service = client.Services.Get<BlacklistService>(true);
_service = client.GetService<BlacklistService>(true);
}
public bool CanRun(Command command, User user, Channel channel, out string error)

12
src/Discord.Net.Commands/Permissions/Userlist/BlacklistExtensions.cs
View File

@@ -6,7 +6,7 @@ namespace Discord.Commands.Permissions.Userlist
{
public static DiscordClient UsingGlobalBlacklist(this DiscordClient client, params ulong[] initialUserIds)
{
client.Services.Add(new BlacklistService(initialUserIds));
client.AddService(new BlacklistService(initialUserIds));
return client;
}
@@ -27,22 +27,22 @@ namespace Discord.Commands.Permissions.Userlist
}
public static IEnumerable<ulong> GetBlacklistedUserIds(this DiscordClient client)
=> client.Services.Get<BlacklistService>().UserIds;
=> client.GetService<BlacklistService>().UserIds;
public static void BlacklistUser(this DiscordClient client, User user)
{
client.Services.Get<BlacklistService>().Add(user.Id);
client.GetService<BlacklistService>().Add(user.Id);
}
public static void BlacklistUser(this DiscordClient client, ulong userId)
{
client.Services.Get<BlacklistService>().Add(userId);
client.GetService<BlacklistService>().Add(userId);
}
public static void UnBlacklistUser(this DiscordClient client, User user)
{
client.Services.Get<BlacklistService>().Remove(user.Id);
client.GetService<BlacklistService>().Remove(user.Id);
}
public static void UnBlacklistUser(this DiscordClient client, ulong userId)
{
client.Services.Get<BlacklistService>().Remove(userId);
client.GetService<BlacklistService>().Remove(userId);
}
}
}

2
src/Discord.Net.Commands/Permissions/Userlist/WhitelistChecker.cs
View File

@@ -6,7 +6,7 @@
internal WhitelistChecker(DiscordClient client)
{
_service = client.Services.Get<WhitelistService>(true);
_service = client.GetService<WhitelistService>(true);
}
public bool CanRun(Command command, User user, Channel channel, out string error)

12
src/Discord.Net.Commands/Permissions/Userlist/WhitelistExtensions.cs
View File

@@ -6,7 +6,7 @@ namespace Discord.Commands.Permissions.Userlist
{
public static DiscordClient UsingGlobalWhitelist(this DiscordClient client, params ulong[] initialUserIds)
{
client.Services.Add(new WhitelistService(initialUserIds));
client.AddService(new WhitelistService(initialUserIds));
return client;
}
@@ -27,22 +27,22 @@ namespace Discord.Commands.Permissions.Userlist
}
public static IEnumerable<ulong> GetWhitelistedUserIds(this DiscordClient client)
=> client.Services.Get<WhitelistService>().UserIds;
=> client.GetService<WhitelistService>().UserIds;
public static void WhitelistUser(this DiscordClient client, User user)
{
client.Services.Get<WhitelistService>().Add(user.Id);
client.GetService<WhitelistService>().Add(user.Id);
}
public static void WhitelistUser(this DiscordClient client, ulong userId)
{
client.Services.Get<WhitelistService>().Add(userId);
client.GetService<WhitelistService>().Add(userId);
}
public static void UnWhitelistUser(this DiscordClient client, User user)
{
client.Services.Get<WhitelistService>().Remove(user.Id);
client.GetService<WhitelistService>().Remove(user.Id);
}
public static void RemoveFromWhitelist(this DiscordClient client, ulong userId)
{
client.Services.Get<WhitelistService>().Remove(userId);
client.GetService<WhitelistService>().Remove(userId);
}
}
}