package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.161.2",
+    "version": "1.161.1",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.161.2",
+    "version": "1.161.1",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {

src/entities.js

@@ -133,6 +133,7 @@ async function fetchIncludedEntities() {
 			SELECT
 				parents.*,
 				json_agg(included_entities ORDER BY included_entities.id) included_children,
+				row_to_json(grandparents) AS parent,
 				(SELECT json_agg(children)
 				FROM entities AS children
 				WHERE children.parent_id = parents.id) children
@@ -140,22 +141,26 @@ async function fetchIncludedEntities() {
 				included_entities
 			LEFT JOIN
 				entities AS parents ON parents.id = included_entities.parent_id
+			LEFT JOIN
+				entities AS grandparents ON grandparents.id = parents.parent_id
 			WHERE
 				included_entities.type = 'channel'
 			GROUP BY
-				parents.id
+				parents.id, grandparents.id
 		), entity_tree as (
 			/* get recursive parents of networks (necessary for scraper resolve) */
 			SELECT to_jsonb(included_per_network) as entity,
 				parent_id,
-				array['parent'] as parent_path
+				array['parent'] as parent_path,
+				0 as depth
 			FROM included_per_network
 
 			UNION ALL
 
 			SELECT jsonb_set(entity_tree.entity, entity_tree.parent_path, to_jsonb(entities)),
 				   entities.parent_id,
-				   entity_tree.parent_path || array['parent']
+				   entity_tree.parent_path || array['parent'],
+				   depth + 1
 			FROM entity_tree
 			JOIN entities ON entity_tree.parent_id = entities.id
 		)
@@ -180,7 +185,8 @@ async function fetchReleaseEntities(baseReleases) {
 		WITH RECURSIVE entity_tree as (
 			SELECT to_jsonb(entities) as entity,
 				parent_id,
-				array['parent'] as parent_path
+				array['parent'] as parent_path,
+				0 as depth
 			FROM entities
 			WHERE slug = ANY(:entitySlugs)
 
@@ -188,7 +194,8 @@ async function fetchReleaseEntities(baseReleases) {
 
 			SELECT jsonb_set(entity_tree.entity, entity_tree.parent_path, to_jsonb(entities)),
 				   entities.parent_id,
-				   entity_tree.parent_path || array['parent']
+				   entity_tree.parent_path || array['parent'],
+				   depth + 1
 			FROM entity_tree
 			JOIN entities ON entity_tree.parent_id = entities.id
 		)