Merge branch 'cms' of ghghgh.us:stone-island into cms

2 files changed, 18 insertions, 4 deletions

diff --git a/lib/okpush/index.js b/lib/okpush/index.js
index 49fc5363..a0211bed 100644
--- a/lib/okpush/index.js
+++ b/lib/okpush/index.js
@@ -113,7 +113,7 @@ function OKPush (options) {
     var channel = req.body.channel
     var opt = options.config.notifications[channel]
     var note = apn.buildPayload(opt, options.config.bundleId)
-    apn.push(channel, note)
+    apn.push('hub', note)
     db.addNotification(channel, function(){
       res.sendStatus(200)
     })
@@ -138,19 +138,32 @@ function OKPush (options) {
 
   // should work without middleware
   router.post('/add', bodyParser.urlencoded({ extended: false }), function (req, res) {
-    console.log(req.body)
+    if (! req.body.registrationId || ! req.body.channel) {
+      return res.sendStatus(500)
+    }
     db.addToken({
       token: req.body.registrationId,
       channel: req.body.channel,
       platform: req.body.platform.toLowerCase(),
+    }).then(function(){
+      console.log('added token', req.body.channel, req.body.registrationId)
+    }).catch(function(){
+      console.log('error adding token', req.body.channel, req.body.registrationId)
     })
     res.sendStatus(200)
   })
   
   router.post('/remove', bodyParser.urlencoded({ extended: false }), function (req, res) {
+    if (! req.body.registrationId || ! req.body.channel) {
+      return res.sendStatus(500)
+    }
     db.removeToken({
       token: req.body.registrationId,
       channel: req.body.channel,
+    }).then(function(){
+      console.log('removed token', req.body.channel, req.body.registrationId)
+    }).catch(function(){
+      console.log('error removing token', req.body.channel, req.body.registrationId)
     })
     res.sendStatus(200)
   })
diff --git a/lib/okpush/templates/index.liquid b/lib/okpush/templates/index.liquid
index ec639646..beb2c7e2 100644
--- a/lib/okpush/templates/index.liquid
+++ b/lib/okpush/templates/index.liquid
@@ -42,6 +42,7 @@ tr:nth-child(2n+1) {
       <th>Tokens</th>
       <th></th>
     </tr>
+  {% assign count = notifications.hub.count %}
   {% for pair in notifications %}
     {% assign name = pair[0] %}
     {% assign spec = pair[1] %}
@@ -53,10 +54,10 @@ tr:nth-child(2n+1) {
         {{spec.alert}}
       </td>
       <td>
-        {{spec.count}}
+        {{count}}
       </td>
       <td>
-        <button data-key="{{name}}" data-count="{{spec.count}}" class="btn">send</button>
+        <button data-key="{{name}}" data-count="{{count}}" class="btn">send</button>
       </td>
     </tr>
   {% endfor %}