split management into server- and user-; wrote docs for server/user

This commit is contained in:
Christopher F
2016-02-25 19:02:31 -05:00
parent b3438c9309
commit 47cbac95cc
5 changed files with 7 additions and 8 deletions

View File

@@ -1,4 +0,0 @@
|stub| Server Management
========================
|stub-desc|

View File

@@ -29,7 +29,8 @@ This Documentation is **currently undergoing a rewrite**. Some pages (marked wit
getting_started getting_started
features/logging features/logging
features/management features/server-management
features/user-management
features/permissions features/permissions
features/commands features/commands
features/voice features/voice

View File

@@ -37,7 +37,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\DiscordBot\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />

View File

@@ -42,7 +42,7 @@ namespace Discord.Tests
//Create new server and invite the other bots to it //Create new server and invite the other bots to it
_testServer = _hostClient.CreateServer("Discord.Net Testing", _hostClient.Regions.First()).Result; _testServer = _hostClient.CreateServer("Discord.Net Testing", _hostClient.Regions.First()).Result;
_testServerChannel = _testServer.DefaultChannel; _testServerChannel = _testServer.DefaultChannel;
Invite invite = _testServer.CreateInvite(60, 1, false, false).Result; var invite = _testServer.CreateInvite(60, 2, false, false).Result;
WaitAll( WaitAll(
_targetBot.GetInvite(invite.Code).Result.Accept(), _targetBot.GetInvite(invite.Code).Result.Accept(),
_observerBot.GetInvite(invite.Code).Result.Accept()); _observerBot.GetInvite(invite.Code).Result.Accept());
@@ -122,6 +122,8 @@ namespace Discord.Tests
_observerBot.Disconnect()); _observerBot.Disconnect());
} }
// Unit Test Helpers
private static void AssertEvent<TArgs>(string msg, Func<Task> action, Action<EventHandler<TArgs>> addEvent, Action<EventHandler<TArgs>> removeEvent, Func<object, TArgs, bool> test = null) private static void AssertEvent<TArgs>(string msg, Func<Task> action, Action<EventHandler<TArgs>> addEvent, Action<EventHandler<TArgs>> removeEvent, Func<object, TArgs, bool> test = null)
{ {
AssertEvent(msg, action, addEvent, removeEvent, test, true); AssertEvent(msg, action, addEvent, removeEvent, test, true);

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="8.0.1" targetFramework="net45" /> <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
</packages> </packages>