\

@@ -0,0 +1,68 @@
+'use strict';
+
+const qu = require('../utils/qu');
+const http = require('../utils/http');
+const slugify = require('../utils/slugify');
+
+function scrapeAll(scenes) {
+	return scenes.map((scene) => {
+		const release = {};
+
+		release.entryId = scene.id;
+		release.url = `https://tour.topwebmodels.com/scenes/${scene.id}/${slugify(scene.title)}`;
+
+		release.title = scene.title;
+		release.description = scene.description;
+
+		release.duration = qu.durationToSeconds(scene.videos_duration);
+		release.date = new Date(scene.release_date);
+
+		release.actors = scene.models.map(actor => ({
+			name: actor.name,
+			gender: actor.gender || null,
+			avatar: actor.thumb,
+			url: `https://tour.topwebmodels.com/models/${actor.id}/${slugify(actor.name)}`,
+		}));
+
+		release.stars = scene.rating;
+		release.tags = scene.tags.map(tag => tag.name);
+
+		release.poster = scene.thumb;
+
+		release.channel = slugify(scene.sites[0]?.name, '');
+
+		console.log(scene);
+		console.log(release);
+		return release;
+	});
+}
+
+async function fetchLatest(channel, page) {
+	console.log(channel);
+	const res = await http.get(`https://tour.topwebmodels.com/api/sites/${channel.parameters?.slug || channel.slug}?page=${page}`, {
+		headers: {
+			Referer: 'https://tour.topwebmodels.com',
+			'api-key': channel.parameters?.apiKey || channel.parent?.parameters?.apiKey,
+			'x-Requested-With': 'XMLHttpRequest',
+		},
+	});
+
+	console.log(res.body, res.request);
+
+	if (res.ok) {
+		return scrapeAll(res.body.videos.items);
+	}
+
+	return res.status;
+}
+
+async function fetchScene(url) {
+	const res = await http.get(url, { extract: { runScripts: 'dangerously', } });
+
+	console.log(res.);
+}
+
+module.exports = {
+	fetchLatest,
+	fetchScene,
+};

assets/components/album/album.vue

@@ -1,126 +0,0 @@
-<template>
-	<teleport to="body">
-		<div class="album">
-			<div class="album-header">
-				<h3 class="album-title">{{ title }}</h3>
-
-				<Icon
-					icon="cross2"
-					class="close"
-					@click.native="$emit('close')"
-				/>
-			</div>
-
-			<div class="album">
-				<div
-					v-for="item in items"
-					:key="item.id"
-					class="item-container"
-				>
-					<a
-						:href="`/media/${item.path}`"
-						class="item-link"
-						target="_blank"
-					>
-						<img
-							:src="`/media/${item.thumbnail}`"
-							loading="lazy"
-							class="item image"
-						>
-					</a>
-				</div>
-			</div>
-		</div>
-	</teleport>
-</template>
-
-<script>
-export default {
-	props: {
-		items: {
-			type: Array,
-			default: () => [],
-		},
-		title: {
-			type: String,
-			default: null,
-		},
-	},
-	emits: ['close'],
-};
-</script>
-
-<style lang="scss" scoped>
-@import 'breakpoints';
-
-.album {
-	width: 100%;
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	position: fixed;
-	top: 0;
-	left: 0;
-	background: var(--shadow-extreme);
-	z-index: 10;
-	overflow-y: auto;
-}
-
-.album-header {
-	display: flex;
-	justify-content: space-between;
-	flex-shrink: 0;
-	overflow: hidden;
-}
-
-.album-title {
-	display: flex;
-	flex-grow: 1;
-	align-items: center;
-	justify-content: center;
-	padding: 1rem;
-	margin: 0;
-	color: var(--text-light);
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.close {
-	width: 2rem;
-	height: 2rem;
-	padding: 1rem;
-	fill: var(--lighten);
-
-	&:hover {
-		cursor: pointer;
-		fill: var(--text-light);
-	}
-}
-
-.album {
-	display: grid;
-	flex-grow: 1;
-	align-items: center;
-	justify-content: center;
-	grid-template-columns: repeat(auto-fill, minmax(15rem, 1fr));
-	grid-gap: 1rem;
-	padding: 1rem;
-}
-
-.item-container {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.item {
-	height: 15rem;
-}
-
-@media(max-width: $breakpoint) {
-	.album {
-		grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
-	}
-}
-</style>

assets/components/releases/media.vue

@@ -158,13 +158,22 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import 'breakpoints';
+@import 'theme';
 
 .media {
-	height: 18rem;
     flex-shrink: 0;
     white-space: nowrap;
     font-size: 0;
+	height: 18rem;
+
+	&.expanded {
+		display: grid;
+		grid-template-columns: repeat(auto-fill, minmax(25rem, 1fr));
+		grid-gap: 1rem;
+		justify-content: center;
+		padding: 1rem;
+		margin: 0 0 1rem 0;
+	}
 }
 
 .poster-link {
@@ -237,19 +246,20 @@ export default {
 }
 
 .item {
+	height: 100%;
 	max-width: 100%;
 	box-shadow: 0 0 3px var(--shadow-weak);
 	background-size: cover;
 }
 
 .trailer-container {
+	height: 18rem;
 	width: 32rem;
     max-width: 100%;
 }
 
 .trailer {
 	width: 100%;
-	max-width: 32rem;
 	max-height: 100%;
 	object-fit: cover;
 
@@ -269,23 +279,7 @@ export default {
     }
 }
 
-@media(max-width: $breakpoint-kilo) {
+@media(max-width: $breakpoint0) {
-	.media.expanded {
-		grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
-	}
-}
-
-@media(max-width: $breakpoint) {
-	.media.expanded {
-		grid-template-columns: repeat(auto-fill, minmax(16rem, 1fr));
-	}
-}
-
-@media(max-width: $breakpoint-micro) {
-	.media.expanded {
-		grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
-	}
-
 	.media:not(.expanded) .item,
     .trailer-container {
 		height: 56vw; /* 16:9 ratio for full-width video */

assets/components/releases/release.vue

@@ -3,6 +3,13 @@
 		v-if="release"
 		class="content"
 	>
+		<Expand
+			v-if="expanded"
+			class="expand expand-dark"
+			:expanded="expanded"
+			@expand="(state) => expanded = state"
+		/>
+
 		<Scroll
 			v-slot="slotProps"
 			class="scroll-light"
@@ -10,26 +17,22 @@
 		>
 			<Media
 				:release="release"
+				:class="{ expanded }"
 				@load="slotProps.loaded"
 			/>
 		</Scroll>
 
 		<Details :release="release" />
 
-		<button
+		<Expand
-			class="album-toggle"
+			v-if="release.photos && release.photos.length > 0"
-			@click="showAlbum = true"
+			class="expand-bottom expand-dark"
-		><Icon icon="grid3" />View album</button>
+			:expanded="expanded"
-
+			@expand="(state) => expanded = state"
-		<Album
-			v-if="showAlbum"
-			:items="release.photos"
-			:title="release.title"
-			@close="showAlbum = false"
 		/>
 
 		<div class="info column">
-			<div class="row row-title">
+			<div class="row">
 				<h2
 					v-if="release.title"
 					class="title"
@@ -196,14 +199,14 @@
 </template>
 
 <script>
-import Details from './details.vue';
 import Media from './media.vue';
-import Album from '../album/album.vue';
+import Details from './details.vue';
 import Tags from './tags.vue';
 import Clips from './clips.vue';
 import Actor from '../actors/tile.vue';
 import Releases from './releases.vue';
 import Scroll from '../scroll/scroll.vue';
+import Expand from '../expand/expand.vue';
 
 async function fetchRelease() {
 	if (this.$route.name === 'scene') {
@@ -224,10 +227,10 @@ function pageTitle() {
 export default {
 	components: {
 		Actor,
-		Album,
 		Details,
 		Media,
 		Scroll,
+		Expand,
 		Releases,
 		Clips,
 		Tags,
@@ -235,7 +238,7 @@ export default {
 	data() {
 		return {
 			release: null,
-			showAlbum: false,
+			expanded: false,
 		};
 	},
 	computed: {
@@ -289,13 +292,8 @@ export default {
 	margin: 0 2rem 0 0;
 }
 
-.row-title {
-	display: flex;
-	justify-content: space-between;
-}
-
 .title {
-	display: inline-flex;
+	display: inline-block;
 	margin: 0;
 
 	.icon {
@@ -313,28 +311,11 @@ export default {
 	color: var(--shadow);
 }
 
-.album-toggle {
+.title-shoot {
-	height: fit-content;
+	margin: 0 0 0 .5rem;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	padding: .5rem 1rem;
-	border: none;
-	border-bottom: solid 1px var(--shadow-hint);
 	color: var(--shadow);
-	background: none;
+	font-size: .9rem;
-	font-size: 1rem;
 	font-weight: bold;
-
-	.icon {
-		fill: var(--shadow);
-		margin: -.1rem .5rem 0 0;
-	}
-
-	&:hover {
-		background: var(--shadow-hint);
-		cursor: pointer;
-	}
 }
 
 .description {

package-lock.json

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

package.json

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

src/scrapers/gamma.js

@@ -303,20 +303,6 @@ async function scrapeScene(html, url, site, baseRelease, mobileHtml) {
 		},
 	];
 
-	const movie = $('.dvdLink');
-
-	if (movie) {
-		const movieUrl = qu.prefixUrl(movie.attr('href'), site.url);
-
-		release.movie = {
-			url: movieUrl,
-			title: movie.attr('title'),
-			entryId: movieUrl.match(/\/(\d+)(\/|$)/)?.[1],
-			covers: [movie.find('img').attr('src')],
-			entity: site,
-		};
-	}
-
 	return release;
 }