Fixed channel subscription

Pusher/Event.cs

@@ -45,7 +45,7 @@ public override Type GetDataType()
 	}
 
 	[DataContract]
-	public class Event
+	public class Event : IEvent
 	{
 		[DataMember(Name = "event")]
 		public string EventName { get; set; }

Pusher/Events/SubscribeEvent.cs

@@ -1,14 +1,28 @@
-using System.Runtime.Serialization;
+using System;
+using System.Runtime.Serialization;
 
 namespace Pusher.Events
 {
 	[DataContract]
-	public class SubscribeEvent : Event<SubscribeEventArgs>
+	public class SubscribeEvent : IEvent
 	{
 		public SubscribeEvent(string channel)
 		{
 			EventName = Pusher.EventSubscribe;
-			DataObject = new SubscribeEventArgs { Channel = channel };
+            DataObject = new SubscribeEventArgs { Channel = channel };
 		}
+
+        [DataMember(Name = "event")]
+        public string EventName { get; set; }
+
+	    public string Channel { get; set; }
+
+	    public Type GetDataType()
+	    {
+	        return typeof (SubscribeEventArgs);
+	    }
+
+	    [DataMember(Name = "data")]
+        public SubscribeEventArgs DataObject { get; set; }
 	}
 }

Pusher/IEvent.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Pusher
+{
+    public interface IEvent
+    {
+        [DataMember(Name = "event")]
+        string EventName { get; set; }
+
+        [DataMember(Name = "channel", EmitDefaultValue = false, IsRequired = false)]
+        string Channel { get; set; }
+
+        Type GetDataType();
+    }
+}

Pusher/Pusher.cs

@@ -139,7 +139,7 @@ private void ReceivedEvent(object sender, DataReceivedEventArgs dataReceivedEven
 			}
 		}
 
-		internal async Task TriggerEventAsync(Event e)
+		internal async Task TriggerEventAsync(IEvent e)
 		{
 			var json = JsonConvert.SerializeObject(e);
 			_logger.Debug("Sending event {0} to {1}: {2}", e.EventName, e.Channel ?? "all channels", json);

Pusher/Pusher.csproj

@@ -49,6 +49,7 @@
     <Compile Include="IAuthenticator.cs" />
     <Compile Include="IConnection.cs" />
     <Compile Include="IConnectionFactory.cs" />
+    <Compile Include="IEvent.cs" />
     <Compile Include="IEventContract.cs" />
     <Compile Include="ILogger.cs" />
     <Compile Include="Logger.cs" />