Latest goflow

Ilhasoft · Apr 11, 2019 · ecafbe2 · ecafbe2
1 parent e71eb62
commit ecafbe2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/mattn/go-sqlite3 v1.10.0 // indirect
 	github.com/nyaruka/ezconf v0.2.1
 	github.com/nyaruka/gocommon v1.0.0
-	github.com/nyaruka/goflow v0.33.7
+	github.com/nyaruka/goflow v0.33.8
 	github.com/nyaruka/librato v0.0.0-20180827155909-cacc769357b8
 	github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d
 	github.com/nyaruka/null v1.1.1

diff --git a/go.sum b/go.sum
@@ -72,8 +72,8 @@ github.com/nyaruka/gocommon v0.2.0 h1:1Le4Ok0Zp2RYULue0n4/02zL+1MrykN/C79HhirGeR
 github.com/nyaruka/gocommon v0.2.0/go.mod h1:ZrhaOKNc+kK1qWNuCuZivskT+ygLyIwu4KZVgcaC1mw=
 github.com/nyaruka/gocommon v1.0.0 h1:4gdAMOR4BTMHHZjOy5WhfKYGUZVmJ+3LPh1sj011Qzk=
 github.com/nyaruka/gocommon v1.0.0/go.mod h1:QbdU2J9WBsqBmeZRuwndf2f6O7rD7mkC0bGn5UNnwjI=
-github.com/nyaruka/goflow v0.33.7 h1:B1T2QXXc78Ck4i+QsOCNuiU7GsVjTWpRVIKn79DYQR4=
-github.com/nyaruka/goflow v0.33.7/go.mod h1:IMktU/eAl8TdrqCjHBKseHzJY6Vb52RjLIo4tYmTMR4=
+github.com/nyaruka/goflow v0.33.8 h1:KJCQ98Gl4H2HuaIGuct/PA5yq3buvLYc5nDfcrcCduY=
+github.com/nyaruka/goflow v0.33.8/go.mod h1:IMktU/eAl8TdrqCjHBKseHzJY6Vb52RjLIo4tYmTMR4=
 github.com/nyaruka/librato v0.0.0-20180827155909-cacc769357b8 h1:TOvxy0u6LNTWP3gwbdNVCiByXJupr9ATFdzBnBJ2TY8=
 github.com/nyaruka/librato v0.0.0-20180827155909-cacc769357b8/go.mod h1:huVocfMEHkttMHD4hSr/wjWNyTx/YMzwwajVzV2bq+0=
 github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d h1:hyp9u36KIwbTCo2JAJ+TuJcJBc+UZzEig7RI/S5Dvkc=

diff --git a/handler/worker.go b/handler/worker.go
@@ -400,14 +400,13 @@ func HandleChannelEvent(ctx context.Context, db *sqlx.DB, rp *redis.Pool, eventT
 	}
 
 	// create our parameters, we just convert this from JSON
-	// TODO: this is done because a nil XJSONObject doesn't know how to marshal itself, goflow could fix
-	params := types.NewXJSONObject([]byte("{}"))
+	var params types.XValue
 	if event.Extra() != nil {
 		asJSON, err := json.Marshal(event.Extra())
 		if err != nil {
 			return nil, errors.Wrapf(err, "unable to marshal extra from channel event")
 		}
-		params = types.NewXJSONObject(asJSON)
+		params = types.JSONToXValue(asJSON)
 	}
 
 	// build our flow trigger