Refactored http timeout handling.

src/stashes.js

@@ -48,19 +48,31 @@ async function stashScene(sceneId, stashId, sessionUser) {
 	await knex('stashes_scenes')
 		.insert({
 			stash_id: stash.id,
-			actor_id: sceneId,
+			scene_id: sceneId,
 		});
 }
 
 async function unstashActor(actorId, stashId, sessionUser) {
 	await knex
-		.from('stashes_actors')
-		.whereIn('stashes_actors.id', knex('stashes_actors')
-			.select('stashes_actors.id')
+		.from('stashes_actors AS deletable')
+		.where('deletable.actor_id', actorId)
+		.where('deletable.stash_id', stashId)
+		.whereExists(knex('stashes_actors') // verify user owns this stash
 			.leftJoin('stashes', 'stashes.id', 'stashes_actors.stash_id')
-			.where('stashes.user_id', sessionUser.id) // verify user owns this stash
-			.where('stashes_actors.actor_id', actorId)
-			.where('stashes_actors.stash_id', stashId))
+			.where('stashes_actors.stash_id', knex.raw('deletable.stash_id'))
+			.where('stashes.user_id', sessionUser.id))
+		.delete();
+}
+
+async function unstashScene(sceneId, stashId, sessionUser) {
+	await knex
+		.from('stashes_scenes AS deletable')
+		.where('deletable.scene_id', sceneId)
+		.where('deletable.stash_id', stashId)
+		.whereExists(knex('stashes_scenes') // verify user owns this stash
+			.leftJoin('stashes', 'stashes.id', 'stashes_scenes.stash_id')
+			.where('stashes_scenes.stash_id', knex.raw('deletable.stash_id'))
+			.where('stashes.user_id', sessionUser.id))
 		.delete();
 }
 
@@ -68,6 +80,6 @@ module.exports = {
 	curateStash,
 	stashActor,
 	stashScene,
-	// unstashScene,
+	unstashScene,
 	unstashActor,
 };