all repos — felt @ 6fc78c333ce18f6951ea6809580861d131cdc3a1

virtual tabletop for dungeons and dragons (and similar) using Go, MongoDB, and websockets

make it compile
Iris Lightshard nilix@nilfm.cc
PGP Signature 
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEkFh6dA+k/6CXFXU4O3+8IhROY5gFAmPo7+0ACgkQO3+8IhRO
Y5holRAAhFkCZ4qCDJSXPiByLnpcgs0Psu5DKhGo/VDgPI00UERfUvk6iKawwe7Y
OJiitCix1RGwtMZeuheF6VYwSWCYRBeHkXELWYMuxq5ey5hWFxqr1rEB23v99TZ2
maGsqtF6z4RHxqrIm1S51DvCMMfkiVmA13kPnuq+DmPkXapWg3XTC2MzBGvDXIHS
mg/ALjhrWIpi+lhHD07HxQgzz0yoSu2wajVd7V1RCn/jLn0hUr1+SvCH3qbkeeYI
aBsmCkMcwQoayS28CgUf1pGxn8hJZOuQDSPaBukOzUhU1Oh/4ypmtUsdF2JJNnsv
wLGqaFshgKt0w6cy3f+yqrwyQ4gWIJTcDI0YoL0pfR0oUZuwnsyxRBsFS6y812Sb
wWWVj0wotdeQR6wY5g3fa29acG2nXaXgOONHuVA5TLIr4r4cK0ZJPlmE36quPtTD
YIRppJqYxdbMqCTuTNYRzQRpUbTRp8gv4XT5fjvYy4P9qQ/KcA5Ga1Ks4HIDvoGs
P52MZCINjjVR8PDwg24sJG73wC9VdKWyuEqKCBLNDDmAHuLQBP8jxktV9uoqwAKN
ljGq80Xo5YMvj1HAtsmFXvb2w5dKFlbtkQheCxcpIvOIODrPBihm+qRmjgrYAyg6
RUkaxV0VoZxnyLDDDxPZejiaLPZIl89YhchYp/7farFcfQWwSbE=
=h6V8
-----END PGP SIGNATURE-----
commit

6fc78c333ce18f6951ea6809580861d131cdc3a1

parent

cd14def1f840b107289749046caf6ae2a42dbfc8

1 files changed, 8 insertions(+), 6 deletions(-)

jump to
M gametable/server.go → gametable/server.go 
@@ -1,14 +1,16 @@ 
 package gametable
 
 import (
+  "bytes"
 	"context"
+	"encoding/json"
 	"errors"
+	"fmt"
 	"golang.org/x/time/rate"
 	"hacklab.nilfm.cc/felt/admin"
 	"hacklab.nilfm.cc/felt/models"
 	"hacklab.nilfm.cc/felt/mongodb"
 	"hacklab.nilfm.cc/quartzgun/auth"
-	"hacklab.nilfm.cc/quartzgun/cookie"
 	"hacklab.nilfm.cc/quartzgun/renderer"
 	"io/ioutil"
 	"log"

@@ -90,7 +92,7 @@ tableKey := models.TableKey{}
 	err := json.NewDecoder(r.Body).Decode(&tableKey)
 	if err != nil {
 		fmt.Println(err.Error())
-		return
+		return err
 	}
 
 	if !self.dbAdapter.CheckTable(tableKey) {

@@ -142,7 +144,7 @@ defer self.subscribersLock.Unlock()
 
 	// decode message and store in DB
 	tableMsg := models.TableMessage{}
-	err := json.NewDecoder(msg).Decode(&tableMsg)
+	err := json.NewDecoder(bytes.NewReader(msg)).Decode(&tableMsg)
 	if err != nil {
 		fmt.Println(err.Error())
 		return

@@ -153,7 +155,7 @@ 
 	self.publishLimiter.Wait(context.Background())
 
 	for s, k := range self.subscribers {
-		if k == tableMsg.tableKey {
+		if k == tableMsg.Key {
 			select {
 			case s.msgs <- msg:
 			default:

@@ -163,12 +165,12 @@ }
 	}
 }
 
-func (self *GameTableServer) getCurrentState(tableKey models.TableKey) ([]byte, error) {
+func (self *GameTableServer) getCurrentState(tableKey models.TableKey) ([]byte) {
 	// get diceroll log, map, and token state
 
 	// build into a []byte message
 
-	return make([]byte, 1), nil
+	return make([]byte, 1)
 }
 
 func (self *GameTableServer) writeToDB(tableMsg models.TableMessage) error {