Fix voting, fix sorting, better error handling in log parsing

api/main.js

@@ -163,7 +163,7 @@ app.post('/vote', (req, res) => {
   if (wsByUID.has(token.channel_id)) {
     let ws = wsByUID.get(token.channel_id)
     let vote = {
-      ip: req.ip,
+      ip: token.opaque_user_id,
       user: token.user_id,
       draftID: req.body.draft_id,
       card: req.body.card,

build.sh

@@ -13,6 +13,8 @@
 # esc, :wq, enter, "exit"
 # >docker-machine restart
 
+set -e
+
 rm -rf dist
 mkdir dist
 mkdir dist/twitch

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deckmaster",
-  "version": "2018.8.20",
+  "version": "2018.8.21",
   "author": "Fugi <Fugiman47@gmail.com>",
   "description": "Deckmaster Twitch Extension",
   "repository": "github:fugiman/deckmaster",

client/src/main/parser.js

@@ -86,6 +86,7 @@ export default class Parser {
           end = +m[1]
         } else {
           console.log('Unexpected error parsing JSON!', e)
+          this.buffer = this.buffer.substring(1)
           return
         }
       }
@@ -314,6 +315,7 @@ export default class Parser {
     // order of sorts goes from least important -> most important
     return _.chain(cards)
       .map(c => +c)
+      .sortBy(c => AllCards.get(c).name)
       .sortBy(c => AllCards.get(c).cmc)
       .sortBy(c => {
         let d = AllCards.get(c)