assets/components/networks/network.vue

@@ -89,7 +89,7 @@ async function fetchNetwork() {
         // .concat(this.studios)
         .sort(({ name: nameA }, { name: nameB }) => nameA.localeCompare(nameB));
 
-    this.releases = this.network.releases;
+    this.releases = this.network.sites.map(site => site.releases).flat();
 }
 
 async function mounted() {

assets/js/actors/actions.js

@@ -52,7 +52,6 @@ function initActorActions(store, _router) {
                 $limit:Int = 1000,
                 $after:Date = "1900-01-01",
                 $before:Date = "2100-01-01",
-                $orderBy:[ReleasesActorsOrderBy!]
             ) {
                 actor: actorBySlug(slug: $actorSlug) {
                     id
@@ -121,7 +120,7 @@ function initActorActions(store, _router) {
                             }
                         },
                         first: $limit,
-                        orderBy: $orderBy
+                        orderBy: RELEASE_BY_RELEASE_ID__DATE_DESC,
                     ) {
                         release {
                             id
@@ -152,7 +151,6 @@ function initActorActions(store, _router) {
             limit,
             after: store.getters.after,
             before: store.getters.before,
-            orderBy: store.state.ui.range === 'upcoming' ? 'RELEASE_BY_RELEASE_ID__DATE_ASC' : 'RELEASE_BY_RELEASE_ID__DATE_DESC',
         });
 
         return curateActor(actor);

assets/js/curate.js

@@ -48,7 +48,7 @@ function curateSite(site, network) {
     return curatedSite;
 }
 
-function curateNetwork(network, releases) {
+function curateNetwork(network) {
     const curatedNetwork = {
         id: network.id,
         name: network.name,
@@ -56,9 +56,13 @@ function curateNetwork(network, releases) {
         url: network.url,
     };
 
-    if (network.sites) curatedNetwork.sites = network.sites.map(site => curateSite(site, curatedNetwork));
+    if (network.sites) {
-    if (network.studios) curatedNetwork.studios = network.studios;
+        curatedNetwork.sites = network.sites.map(site => curateSite(site, curatedNetwork));
-    if (releases) curatedNetwork.releases = releases.map(release => curateRelease(release));
+    }
+
+    if (network.studios) {
+        curatedNetwork.studios = network.studios;
+    }
 
     return curatedNetwork;
 }

assets/js/fragments.js

@@ -95,24 +95,6 @@ const releaseTrailerFragment = `
     }
 `;
 
-const releaseFields = `
-    id
-    title
-    date
-    createdAt
-    url
-    ${releaseActorsFragment}
-    ${releaseTagsFragment}
-    ${releasePosterFragment}
-    ${siteFragment}
-    studio {
-        id
-        name
-        slug
-        url
-    }
-`;
-
 const releasesFragment = `
     releases(
         filter: {
@@ -122,9 +104,23 @@ const releasesFragment = `
             }
         },
         first: $limit,
-        orderBy: $orderBy,
+        orderBy: DATE_DESC,
     ) {
-        ${releaseFields}
+        id
+        title
+        date
+        createdAt
+        url
+        ${releaseActorsFragment}
+        ${releaseTagsFragment}
+        ${releasePosterFragment}
+        ${siteFragment}
+        studio {
+            id
+            name
+            slug
+            url
+        }
     }
 `;
 
@@ -155,7 +151,6 @@ const releaseFragment = `
 
 export {
     releaseActorsFragment,
-    releaseFields,
     releaseTagsFragment,
     releasePosterFragment,
     releasePhotosFragment,

assets/js/networks/actions.js

@@ -1,16 +1,15 @@
 import { graphql } from '../api';
-import { sitesFragment, releaseFields } from '../fragments';
+import { sitesFragment, releasesFragment } from '../fragments';
 import { curateNetwork } from '../curate';
 
 function initNetworksActions(store, _router) {
     async function fetchNetworkBySlug(networkSlug, limit = 100) {
-        const { network, releases } = await graphql(`
+        const { network } = await graphql(`
             query Network(
                 $networkSlug: String!
                 $limit:Int = 1000,
                 $after:Date = "1900-01-01",
                 $before:Date = "2100-01-01",
-                $orderBy: [ReleasesOrderBy!]
             ) {
                 network: networkBySlug(slug: $networkSlug) {
                     id
@@ -18,17 +17,18 @@ function initNetworksActions(store, _router) {
                     slug
                     url
                     sites {
+                      id
+                      name
+                      slug
+                      url
+                      independent
+                      ${releasesFragment}
+                      network {
                         id
                         name
                         slug
                         url
-                        independent
+                      }
-                        network {
-                            id
-                            name
-                            slug
-                            url
-                        }
                     }
                     studios {
                         id
@@ -37,29 +37,15 @@ function initNetworksActions(store, _router) {
                         url
                     }
                 }
-                releases(
-                    first: $limit,
-                    orderBy: $orderBy,
-                    filter: {
-                        site: { network: { slug: { equalTo: $networkSlug } } }
-                        date: {
-                            lessThan: $before,
-                            greaterThan: $after,
-                        }
-                    }
-                ) {
-                    ${releaseFields}
-                }
             }
         `, {
             networkSlug,
             limit,
             after: store.getters.after,
             before: store.getters.before,
-            orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC',
         });
 
-        return curateNetwork(network, releases);
+        return curateNetwork(network);
     }
 
     async function fetchNetworks({ _commit }, networkSlug) {

assets/js/releases/actions.js

@@ -11,7 +11,6 @@ function initReleasesActions(store, _router) {
                 $limit:Int = 1000,
                 $after:Date = "1900-01-01",
                 $before:Date = "2100-01-01",
-                $orderBy:[ReleasesOrderBy!]
             ) {
                 ${releasesFragment}
             }
@@ -19,7 +18,6 @@ function initReleasesActions(store, _router) {
             limit,
             after: store.getters.after,
             before: store.getters.before,
-            orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC',
         });
 
         return releases.map(release => curateRelease(release));

assets/js/sites/actions.js

@@ -10,7 +10,6 @@ function initSitesActions(store, _router) {
                 $limit:Int = 100,
                 $after:Date = "1900-01-01",
                 $before:Date = "2100-01-01",
-                $orderBy:[ReleasesOrderBy!]
             ) {
                 site: siteBySlug(slug: $siteSlug) {
                     name
@@ -30,9 +29,10 @@ function initSitesActions(store, _router) {
             limit,
             after: store.getters.after,
             before: store.getters.before,
-            orderBy: store.state.ui.range === 'upcoming' ? 'DATE_ASC' : 'DATE_DESC',
         });
 
+        console.log(site);
+
         return curateSite(site);
     }
 

assets/js/tags/actions.js

@@ -1,19 +1,16 @@
 import { graphql, get } from '../api';
 import {
-    releaseFields,
+    releasePosterFragment,
+    releaseActorsFragment,
+    releaseTagsFragment,
+    siteFragment,
 } from '../fragments';
 import { curateTag } from '../curate';
 
 function initTagsActions(store, _router) {
-    async function fetchTagBySlug(tagSlug, limit = 100) {
+    async function fetchTagBySlug(tagSlug) {
         const { tagBySlug } = await graphql(`
-            query Tag(
+            query Tag($tagSlug:String!) {
-                $tagSlug:String!
-                $limit:Int = 1000,
-                $after:Date = "1900-01-01",
-                $before:Date = "2100-01-01",
-                $orderBy: [ReleasesTagsOrderBy!]
-            ) {
                 tagBySlug(slug:$tagSlug) {
                     id
                     name
@@ -39,30 +36,23 @@ function initTagsActions(store, _router) {
                             comment
                         }
                     }
-                    releases: releasesTags(
+                    releases: releasesTags {
-                        filter: {
-                            release: {
-                                date: {
-                                    lessThan: $before,
-                                    greaterThan: $after,
-                                }
-                            }
-                        },
-                        first: $limit,
-                        orderBy: $orderBy,
-                    ) {
                         release {
-                            ${releaseFields}
+                            id
+                            title
+                            date
+                            createdAt
+                            url
+                            ${releaseActorsFragment}
+                            ${releaseTagsFragment}
+                            ${releasePosterFragment}
+                            ${siteFragment}
                         }
                     }
                 }
             }
         `, {
             tagSlug,
-            limit,
-            after: store.getters.after,
-            before: store.getters.before,
-            orderBy: store.state.ui.range === 'upcoming' ? 'RELEASE_BY_RELEASE_ID__DATE_ASC' : 'RELEASE_BY_RELEASE_ID__DATE_DESC',
         });
 
         return curateTag(tagBySlug);
@@ -80,27 +70,21 @@ function initTagsActions(store, _router) {
         }
 
         const { tags } = await graphql(`
-            query Tags(
+            query Tags($slugs: [String!] = [], $limit: Int = 100) {
-                $slugs: [String!] = [],
+              tags(filter: {slug: {in: $slugs}}, first: $limit) {
-                $limit: Int = 100
+                id
-            ) {
+                name
-                tags(
+                slug
-                    filter: { slug: { in: $slugs } },
+                poster: tagsPosterByTagId {
-                    first: $limit
+                    media {
-                ) {
+                        thumbnail
-                    id
-                    name
-                    slug
-                    poster: tagsPosterByTagId {
-                        media {
-                            thumbnail
-                        }
-                    }
-                    group {
-                        name
-                        slug
                     }
                 }
+                group {
+                    name
+                    slug
+                }
+              }
             }
         `, {
             slugs,

package-lock.json

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

package.json

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