Reconstructed Project

src/TeamSpeak3QueryApi.Demo/Program.cs

@@ -4,8 +4,8 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using TeamSpeak3QueryApi.Net.Specialized;
-using TeamSpeak3QueryApi.Net.Specialized.Notifications;
+using TeamSpeak3QueryApi.Net.Enums;
+using TeamSpeak3QueryApi.Net.Notifications;
 
 namespace TeamSpeak3QueryApi.Net.Demo
 {
@@ -20,28 +20,27 @@ static async Task Main(string[] args)
             var password = loginData[2].Trim();
 
             var rc = new TeamSpeakClient(host);
-
             await rc.Connect();
 
-            await rc.Login(user, password);
-            await rc.UseServer(1);
-
-            await rc.WhoAmI();
+            await rc.LoginAsync(user, password);
+            await rc.UseServerAsync(1);
 
-            await rc.RegisterServerNotification();
-            await rc.RegisterChannelNotification(30);
+            await rc.WhoAmIAsync();
 
-            var serverGroups = await rc.GetServerGroups();
-            var firstNormalGroup = serverGroups?.FirstOrDefault(s => s.ServerGroupType == ServerGroupType.NormalGroup);
-            var groupClients = await rc.GetServerGroupClientList(firstNormalGroup.Id);
+            await rc.RegisterServerNotificationAsync();
+            await rc.RegisterAllChannelNotificationAsync();
+
+            var serverGroups = await rc.GetServerGroupsAsync();
+            var firstNormalGroup = serverGroups?.FirstOrDefault(s => s.ServerGroupType == ServerGroupType.NormalGroup && s.Id != 46); // Id 46 is default Servergroup
 
-            var currentClients = await rc.GetClients();
+            var groupClients = await rc.GetServerGroupClientListAsync(firstNormalGroup.Id);
+            var currentClients = await rc.GetClientsAsync();
 
             var fullClients = currentClients.Where(c => c.Type == ClientType.FullClient).ToList();
-            await rc.KickClient(fullClients, KickOrigin.Channel);
+            await rc.KickClientAsync(fullClients, KickOrigin.Channel, "You're kicked from channel");
 
-            // await rc.MoveClient(1, 1);
-            // await rc.KickClient(1, KickTarget.Server);
+            // await rc.MoveClientAsync(1, 1);
+            // await rc.KickClientAsync(1, KickTarget.Server);
 
             rc.Subscribe<ClientEnterView>(data => data.ForEach(c => Debug.WriteLine($"Client {c.NickName} joined.")));
             rc.Subscribe<ClientLeftView>(data => data.ForEach(c => Debug.WriteLine($"Client with id {c.Id} left (kicked/banned/left).")));

src/TeamSpeak3QueryApi.Demo/TeamSpeak3QueryApi.Demo.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

src/TeamSpeak3QueryApi/Specialized/DataProxy.cs → src/TeamSpeak3QueryApi/DataProxy.cs

@@ -4,8 +4,11 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using TeamSpeak3QueryApi.Net.Enums;
+using TeamSpeak3QueryApi.Net.Interfaces;
+using TeamSpeak3QueryApi.Net.Query;
 
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net
 {
     internal static class DataProxy
     {

src/TeamSpeak3QueryApi/Specialized/ClientType.cs → src/TeamSpeak3QueryApi/Enums/ClientType.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     public enum ClientType
     {

src/TeamSpeak3QueryApi/Specialized/GetChannelOptions.cs → src/TeamSpeak3QueryApi/Enums/GetChannelOptions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     [Flags]
     public enum GetChannelOptions

src/TeamSpeak3QueryApi/Specialized/GetClientOptions.cs → src/TeamSpeak3QueryApi/Enums/GetClientOptions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     [Flags]
     public enum GetClientOptions

src/TeamSpeak3QueryApi/Specialized/GetServerOptions.cs → src/TeamSpeak3QueryApi/Enums/GetServerOptions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     [Flags]
     public enum GetServerOptions

src/TeamSpeak3QueryApi/Specialized/KickOrigin.cs → src/TeamSpeak3QueryApi/Enums/KickOrigin.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     public enum KickOrigin
     {

src/TeamSpeak3QueryApi/ManualEnums.cs → src/TeamSpeak3QueryApi/Enums/ManualEnums.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     public enum HostMessageMode
     {

src/TeamSpeak3QueryApi/Specialized/MessageTarget.cs → src/TeamSpeak3QueryApi/Enums/MessageTarget.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     public enum MessageTarget
     {

src/TeamSpeak3QueryApi/Specialized/NotificationEventTarget.cs → src/TeamSpeak3QueryApi/Enums/NotificationEventTarget.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     internal enum NotificationEventTarget
     {

src/TeamSpeak3QueryApi/Specialized/NotificationType.cs → src/TeamSpeak3QueryApi/Enums/NotificationType.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     ///<remarks>http://redeemer.biz/medien/artikel/ts3-query-notify/</remarks>
     public enum NotificationType

src/TeamSpeak3QueryApi/Specialized/ReasonId.cs → src/TeamSpeak3QueryApi/Enums/ReasonId.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     public enum ReasonId
     {

src/TeamSpeak3QueryApi/Specialized/ServerGroupType.cs → src/TeamSpeak3QueryApi/Enums/ServerGroupType.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Enums
 {
     public enum ServerGroupType
     {

src/TeamSpeak3QueryApi/Specialized/EnumExtensions.cs → src/TeamSpeak3QueryApi/Extensions/EnumExtensions.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Collections.Generic;
 
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Extensions
 {
     internal static class EnumExtensions
     {

src/TeamSpeak3QueryApi/ListExtensions.cs → src/TeamSpeak3QueryApi/Extensions/ListExtensions.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TeamSpeak3QueryApi.Net
+namespace TeamSpeak3QueryApi.Net.Extensions
 {
     internal static class ListExtensions
     {

src/TeamSpeak3QueryApi/StringExtensions.cs → src/TeamSpeak3QueryApi/Extensions/StringExtensions.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net
+namespace TeamSpeak3QueryApi.Net.Extensions
 {
     internal static class StringExtensions
     {

src/TeamSpeak3QueryApi/TaskExtensions.cs → src/TeamSpeak3QueryApi/Extensions/TaskExtensions.cs

@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace TeamSpeak3QueryApi.Net
+namespace TeamSpeak3QueryApi.Net.Extensions
 {
     internal static class TaskExtensions
     {

src/TeamSpeak3QueryApi/FileTransferClient.cs → src/TeamSpeak3QueryApi/FileTransfer/FileTransferClient.cs

@@ -3,7 +3,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace TeamSpeak3QueryApi.Net
+namespace TeamSpeak3QueryApi.Net.FileTransfer
 {
     internal class FileTransferClient
     {
@@ -20,43 +20,43 @@ public int GetFileTransferId()
             return _currentFileTransferId++;
         }
 
-        public async Task SendFile(byte[] data, int port, string key)
+        public async Task SendFileAsync(byte[] data, int port, string key)
         {
             using var client = new TcpClient();
             await client.ConnectAsync(_host, port).ConfigureAwait(false);
             using var ns = client.GetStream();
 
-            // Send key
+            // SendAsync key
             var keyBytes = Encoding.ASCII.GetBytes(key);
             await ns.WriteAsync(keyBytes, 0, keyBytes.Length).ConfigureAwait(false);
             await ns.FlushAsync().ConfigureAwait(false);
 
-            // Send data
+            // SendAsync data
             await ns.WriteAsync(data, 0, data.Length).ConfigureAwait(false);
         }
 
-        public async Task SendFile(Stream dataStream, int port, string key)
+        public async Task SendFileAsync(Stream dataStream, int port, string key)
         {
             using var client = new TcpClient();
             await client.ConnectAsync(_host, port).ConfigureAwait(false);
             using var ns = client.GetStream();
 
-            // Send key
+            // SendAsync key
             var keyBytes = Encoding.ASCII.GetBytes(key);
             await ns.WriteAsync(keyBytes, 0, keyBytes.Length).ConfigureAwait(false);
             await ns.FlushAsync().ConfigureAwait(false);
 
-            // Send data
+            // SendAsync data
             await dataStream.CopyToAsync(ns).ConfigureAwait(false);
         }
 
-        public async Task<Stream> ReceiveFile(int size, int port, string key)
+        public async Task<Stream> ReceiveFileAsync(int size, int port, string key)
         {
             using var client = new TcpClient();
             await client.ConnectAsync(_host, port).ConfigureAwait(false);
             using var ns = client.GetStream();
 
-            // Send key
+            // SendAsync key
             var keyBytes = Encoding.ASCII.GetBytes(key);
             await ns.WriteAsync(keyBytes, 0, keyBytes.Length).ConfigureAwait(false);
             await ns.FlushAsync().ConfigureAwait(false);

src/TeamSpeak3QueryApi/FileTransferException.cs → src/TeamSpeak3QueryApi/FileTransfer/FileTransferException.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TeamSpeak3QueryApi.Net
+namespace TeamSpeak3QueryApi.Net.FileTransfer
 {
     /// <summary>Represents errors that occur during file transfers.</summary>
     [Serializable]

src/TeamSpeak3QueryApi/Specialized/ITeamSpeakSerializable.cs → src/TeamSpeak3QueryApi/Interfaces/ITeamSpeakSerializable.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Interfaces
 {
     interface ITeamSpeakSerializable
     {

src/TeamSpeak3QueryApi/Specialized/ITypeCaster.cs → src/TeamSpeak3QueryApi/Interfaces/ITypeCaster.cs

@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using TeamSpeak3QueryApi.Net.Extensions;
 
-namespace TeamSpeak3QueryApi.Net.Specialized
+namespace TeamSpeak3QueryApi.Net.Interfaces
 {
     interface ITypeCaster
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/ChannelCreated.cs → src/TeamSpeak3QueryApi/Notifications/ChannelCreated.cs

@@ -1,6 +1,7 @@
 using System;
+using TeamSpeak3QueryApi.Net.Enums;
 
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ChannelCreated : InvokerInformation
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/ChannelDeleted.cs → src/TeamSpeak3QueryApi/Notifications/ChannelDeleted.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ChannelDeleted : InvokerInformation
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/ChannelDescriptionChanged.cs → src/TeamSpeak3QueryApi/Notifications/ChannelDescriptionChanged.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ChannelDescriptionChanged : Notification
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/ChannelEdited.cs → src/TeamSpeak3QueryApi/Notifications/ChannelEdited.cs

@@ -1,6 +1,7 @@
 using System;
+using TeamSpeak3QueryApi.Net.Enums;
 
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ChannelEdited : InvokerInformation
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/ChannelMoved.cs → src/TeamSpeak3QueryApi/Notifications/ChannelMoved.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ChannelMoved : InvokerInformation
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/ChannelPasswordChanged.cs → src/TeamSpeak3QueryApi/Notifications/ChannelPasswordChanged.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ChannelPasswordChanged : Notification
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/ClientEnterView.cs → src/TeamSpeak3QueryApi/Notifications/ClientEnterView.cs

@@ -1,6 +1,7 @@
 using System;
+using TeamSpeak3QueryApi.Net.Enums;
 
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ClientEnterView : Notification
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/ClientLeftView.cs → src/TeamSpeak3QueryApi/Notifications/ClientLeftView.cs

@@ -1,6 +1,7 @@
 using System;
+using TeamSpeak3QueryApi.Net.Enums;
 
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ClientLeftView : Notification
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/ClientMoved.cs → src/TeamSpeak3QueryApi/Notifications/ClientMoved.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ClientMoved : InvokerInformation
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/InvokerInformation.cs → src/TeamSpeak3QueryApi/Notifications/InvokerInformation.cs

@@ -1,4 +1,6 @@
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+using TeamSpeak3QueryApi.Net.Enums;
+
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public abstract class InvokerInformation : Notification
     {

src/TeamSpeak3QueryApi/Notifications/Notification.cs

@@ -0,0 +1,7 @@
+using TeamSpeak3QueryApi.Net.Interfaces;
+
+namespace TeamSpeak3QueryApi.Net.Notifications
+{
+    public abstract class Notification : ITeamSpeakSerializable
+    { }
+}

src/TeamSpeak3QueryApi/NotificationData.cs → src/TeamSpeak3QueryApi/Notifications/NotificationData.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using TeamSpeak3QueryApi.Net.Query;
 
-namespace TeamSpeak3QueryApi.Net
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     /// <summary>Provides data that was retrieved by a notification.</summary>
     public class NotificationData

src/TeamSpeak3QueryApi/Specialized/Notifications/ServerEdited.cs → src/TeamSpeak3QueryApi/Notifications/ServerEdited.cs

@@ -1,6 +1,7 @@
 using System;
+using TeamSpeak3QueryApi.Net.Enums;
 
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class ServerEdited : Notification
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/TextMessage.cs → src/TeamSpeak3QueryApi/Notifications/TextMessage.cs

@@ -1,4 +1,6 @@
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+using TeamSpeak3QueryApi.Net.Enums;
+
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class TextMessage : InvokerInformation
     {

src/TeamSpeak3QueryApi/Specialized/Notifications/TokenUsed.cs → src/TeamSpeak3QueryApi/Notifications/TokenUsed.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net.Specialized.Notifications
+namespace TeamSpeak3QueryApi.Net.Notifications
 {
     public class TokenUsed : InvokerInformation
     {

src/TeamSpeak3QueryApi/IParameterValue.cs → src/TeamSpeak3QueryApi/Parameters/IParameterValue.cs

@@ -1,4 +1,4 @@
-namespace TeamSpeak3QueryApi.Net
+namespace TeamSpeak3QueryApi.Net.Parameters
 {
     /// <summary>Represents an abstraction of a parameter value.</summary>
     public interface IParameterValue

src/TeamSpeak3QueryApi/Parameter.cs → src/TeamSpeak3QueryApi/Parameters/Parameter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
 
-namespace TeamSpeak3QueryApi.Net
+namespace TeamSpeak3QueryApi.Net.Parameters
 {
     /// <summary>Represents a Query API parameter.</summary>
     public class Parameter