wip

Author: Julusian

meteor/server/api/deviceTriggers/observer.ts

@@ -116,10 +116,10 @@ export async function receiveInputDeviceTrigger(
 	if (!actionManager)
 		throw new Meteor.Error(500, `No Studio Action Manager available to handle trigger in Studio "${studioId}"`)
 
-	const mountedActions = DeviceTriggerMountedActions.findAll({
+	const mountedActions = DeviceTriggerMountedActions.find({
 		deviceId,
 		deviceTriggerId: triggerId,
-	})
+	}).fetch()
 
 	for (const mountedAction of mountedActions) {
 		if (values && !_.isMatch(values, mountedAction.values)) return

meteor/server/api/rest/koa.ts

@@ -54,11 +54,11 @@ Meteor.startup(() => {
 
 			res.on('finish', () => {
 				let route = req.originalUrl
-				if (req.originalUrl.endsWith(req.url.slice(1)) && req.url.length > 1) {
+				if (req.originalUrl && req.url && req.originalUrl.endsWith(req.url.slice(1)) && req.url.length > 1) {
 					route = req.originalUrl.slice(0, -1 * (req.url.length - 1))
 				}
 
-				if (route.endsWith('/')) {
+				if (route && route.endsWith('/')) {
 					route = route.slice(0, -1)
 				}