Merge branch 'master' into patch-11

README.md

@@ -131,17 +131,17 @@ namespace TestConsole
             client = new TwitchClient();
             client.Initialize(credentials, "channel");
 
-	    client.OnLog += Client_OnLog;
+	          client.OnLog += Client_OnLog;
             client.OnJoinedChannel += Client_OnJoinedChannel;
-	    client.OnMessageReceived += Client_OnMessageReceived;
+	          client.OnMessageReceived += Client_OnMessageReceived;
             client.OnWhisperReceived += Client_OnWhisperReceived;
             client.OnNewSubscriber += Client_OnNewSubscriber;
             client.OnConnected += Client_OnConnected;
 
             client.Connect();
         }
 
-	private void Client_OnLog(object sender, OnLogArgs e)
+	      private void Client_OnLog(object sender, OnLogArgs e)
         {
             Console.WriteLine($"{e.DateTime.ToString()}: {e.BotPUsername} - {e.Data}");
         }
@@ -162,13 +162,13 @@ namespace TestConsole
             if (e.ChatMessage.Message.Contains("badword"))
                 client.TimeoutUser(e.ChatMessage.Channel, e.ChatMessage.Username, TimeSpan.FromMinutes(30), "Bad word! 30 minute timeout!");
         }
-	
+        
         private void Client_OnWhisperReceived(object sender, OnWhisperReceivedArgs e)
         {
             if (e.WhisperMessage.Username == "my_friend")
                 client.SendWhisper(e.WhisperMessage.Username, "Hey! Whispers are so cool!!");
         }
-	
+        
         private void Client_OnNewSubscriber(object sender, OnNewSubscriberArgs e)
         {
             if (e.Subscriber.SubscriptionPlan == SubscriptionPlan.Prime)
@@ -255,18 +255,16 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 
 using TwitchLib.Api;
-using TwitchLib.Api.Models.Helix.Users.GetUsersFollows;
-using TwitchLib.Api.Models.v5.Subscriptions;
+using TwitchLib.Api.Helix.Models.Users;
+using TwitchLib.Api.V5.Models.Subscriptions;
 
 namespace Example
 {
     class Program
     {
         private static TwitchAPI api;
 
-        //You will have to supply an entry to point to MainAsync().
-
-        private async Task MainAsync()
+        private void Main()
         {
             api = new TwitchAPI();
             api.Settings.ClientId = "client_id";
@@ -276,22 +274,22 @@ namespace Example
         private async Task ExampleCallsAsync()
         {
             //Checks subscription for a specific user and the channel specified.
-            Subscription subscription = await api.Channels.v5.CheckChannelSubscriptionByUserAsync("channel_id", "user_id");
+            Subscription subscription = await api.V5.Channels.CheckChannelSubscriptionByUserAsync("channel_id", "user_id");
 
             //Gets a list of all the subscritions of the specified channel.
-            List<Subscription> allSubscriptions = await api.Channels.v5.GetAllSubscribersAsync("channel_id");
+            List<Subscription> allSubscriptions = await api.V5.Channels.GetAllSubscribersAsync("channel_id");
 
             //Get channels a specified user follows.
-            GetUsersFollowsResponse userFollows = await api.Users.helix.GetUsersFollowsAsync("user_id");
+            GetUsersFollowsResponse userFollows = await api.Helix.Users.GetUsersFollowsAsync("user_id");
 
             //Get Spedicified Channel Follows
-            var channelFollowers = await api.Channels.v5.GetChannelFollowersAsync("channel_id");
+            var channelFollowers = await api.V5.Channels.GetChannelFollowersAsync("channel_id");
 
             //Return bool if channel is online/offline.
-            bool isStreaming = await api.Streams.v5.BroadcasterOnlineAsync("channel_id");
+            bool isStreaming = await api.V5.Streams.BroadcasterOnlineAsync("channel_id");
 
             //Update Channel Title/Game
-            await api.Channels.v5.UpdateChannelAsync("channel_id", "New stream title", "Stronghold Crusader");
+            await api.V5.Channels.UpdateChannelAsync("channel_id", "New stream title", "Stronghold Crusader");
         }
     }
 }