scripting system, hue fixes and such

cmd/lucifer4-server/main.go

@@ -9,6 +9,8 @@ import (
 	"git.aiterp.net/lucifer3/server/services/hue"
 	"git.aiterp.net/lucifer3/server/services/mysqldb"
 	"git.aiterp.net/lucifer3/server/services/nanoleaf"
+	"git.aiterp.net/lucifer3/server/services/script"
+	"git.aiterp.net/lucifer3/server/services/tradfri"
 	"git.aiterp.net/lucifer3/server/services/uistate"
 	"log"
 	"os"
@@ -21,7 +23,7 @@ func main() {
 	bus := lucifer3.EventBus{}
 
 	resolver := services.NewResolver()
-	sceneMap := services.NewSceneMap(resolver)
+	variables := script.NewVariables()
 
 	database, err := mysqldb.Connect(
 		env("LUCIFER4_DB_HOST"),
@@ -40,13 +42,15 @@ func main() {
 	}
 
 	bus.JoinPrivileged(resolver)
-	bus.JoinPrivileged(sceneMap)
-	bus.Join(effectenforcer.NewService(resolver, sceneMap))
+	bus.Join(effectenforcer.NewService(resolver))
 	bus.Join(nanoleaf.NewService())
 	bus.Join(hue.NewService())
+	bus.Join(tradfri.NewService())
 	bus.Join(uistate.NewService())
+	bus.Join(script.NewService(resolver, variables))
 	bus.Join(database)
 	bus.Join(httpAPI)
+	bus.Join(variables)
 
 	bus.RunEvent(events.Started{})