From 874c07267f5443e2b842d1855e50d3ee42ffe7c6 Mon Sep 17 00:00:00 2001
From: claudemiro <dimiro1@gmail.com>
Date: Thu, 15 Jan 2015 07:53:18 -0300
Subject: [PATCH] Just little changes.

---
 conn.go     | 12 ++++--------
 webhooks.go |  3 +--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/conn.go b/conn.go
index 9480c42..16b64c6 100644
--- a/conn.go
+++ b/conn.go
@@ -126,7 +126,7 @@ func (c *Channel) Subscribe(a *App, s *Subscriber, channelData string) error {
 		a.TriggerMemberAddedHook(c, subscription)
 
 		// pusher_internal:subscription_succeeded
-		data := make(map[string]SubscriptionSucceeedEventPresenceData, 1)
+		data := make(map[string]SubscriptionSucceeedEventPresenceData)
 		data["presence"] = NewSubscriptionSucceedEventPresenceData(c)
 
 		js, err = json.Marshal(data)
@@ -180,7 +180,7 @@ func (c *Channel) Unsubscribe(a *App, s *Subscriber) error {
 	}
 
 	// WebHook
-	if c.TotalSubscriptions() == 0 {
+	if !c.IsOccupied() {
 		a.TriggerChannelVacatedHook(c)
 	}
 
@@ -202,25 +202,21 @@ func NewSubscriber(socketID string, s *websocket.Conn) *Subscriber {
 }
 
 // Publish a MemberAddedEvent to all subscriptions
-func (c *Channel) PublishMemberAddedEvent(a *App, data string, subscription *Subscription) error {
+func (c *Channel) PublishMemberAddedEvent(a *App, data string, subscription *Subscription) {
 	for _, subs := range c.Subscriptions {
 		if subs != subscription {
 			subs.Subscriber.Publish(NewMemberAddedEvent(c.ChannelID, data))
 		}
 	}
-
-	return nil
 }
 
 // Publish a MemberRemovedEvent to all subscriptions
-func (c *Channel) PublishMemberRemovedEvent(a *App, subscription *Subscription) error {
+func (c *Channel) PublishMemberRemovedEvent(a *App, subscription *Subscription) {
 	for _, subs := range c.Subscriptions {
 		if subs != subscription {
 			subs.Subscriber.Publish(NewMemberRemovedEvent(c.ChannelID, subscription))
 		}
 	}
-
-	return nil
 }
 
 // Publish messages to all Subscribers
diff --git a/webhooks.go b/webhooks.go
index bed9931..71c062c 100644
--- a/webhooks.go
+++ b/webhooks.go
@@ -121,7 +121,7 @@ func (a *App) TriggerMemberRemovedHook(c *Channel, s *Subscription) {
 
 func triggerHook(name string, app *App, c *Channel, event HookEvent) {
 	if !app.WebHooks {
-		log.Infof("Checking webhooks enabled for app: %s", app.Name)
+		log.Infof("Webhooks are not enabled for app: %s", app.Name)
 		return
 	}
 
@@ -145,7 +145,6 @@ func triggerHook(name string, app *App, c *Channel, event HookEvent) {
 		var req *http.Request
 
 		req, err = http.NewRequest("POST", app.URLWebHook, bytes.NewReader(js))
-
 		if err != nil {
 			log.Errorf("Error creating request: %+v", err)
 			return