assets/components/actors/actor.vue

@@ -315,20 +315,12 @@
 				/>
 			</div>
 
-			<Album
-				v-if="showAlbum"
-				:items="actor.photos"
-				:title="actor.name"
-				class="portrait"
-				@close="showAlbum = false"
-			/>
-
 			<div class="actor-content">
 				<Scroll
 					v-if="actor.avatar || (actor.photos && actor.photos.length > 0)"
 					v-slot="scroll"
-					:expandable="false"
-					@album="showAlbum = true"
+					:expanded="photosExpanded"
+					@expand="(state) => photosExpanded = state"
 				>
 					<Photos
 						:actor="actor"
@@ -337,12 +329,6 @@
 					/>
 				</Scroll>
 
-				<button
-					v-if="actor.photos && actor.photos.length > 2"
-					class="album-toggle"
-					@click="showAlbum = true"
-				><Icon icon="grid3" />View album</button>
-
 				<FilterBar
 					ref="filter"
 					:fetch-releases="fetchActor"
@@ -372,7 +358,6 @@ import Pagination from '../pagination/pagination.vue';
 import FilterBar from '../filters/filter-bar.vue';
 import Releases from '../releases/releases.vue';
 import Photos from './photos.vue';
-import Album from '../album/album.vue';
 import Expand from '../expand/expand.vue';
 import Scroll from '../scroll/scroll.vue';
 import Gender from './gender.vue';
@@ -409,7 +394,6 @@ async function mounted() {
 
 export default {
 	components: {
-		Album,
 		FilterBar,
 		Pagination,
 		Photos,
@@ -424,7 +408,6 @@ export default {
 			actor: null,
 			releases: null,
 			totalCount: 0,
-			showAlbum: false,
 			limit: 20,
 			pageTitle: null,
 			bioExpanded: false,
@@ -711,30 +694,6 @@ export default {
 	border-bottom: solid 1px var(--shadow-hint);
 }
 
-.album-toggle {
-	height: fit-content;
-	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: var(--background-dim);
-	font-size: 1rem;
-	font-weight: bold;
-
-	.icon {
-		fill: var(--shadow);
-		margin: -.1rem .5rem 0 0;
-	}
-
-	&:hover {
-		background: var(--shadow-hint);
-		cursor: pointer;
-	}
-}
-
 @media(max-width: $breakpoint4) {
     .descriptions-container {
         display: none;

assets/components/album/album.vue

@@ -122,18 +122,6 @@ export default {
 	margin: 0 0 1rem 0;
 }
 
-@media(max-width: $breakpoint-small) {
-	.album-items.portrait {
-		grid-template-columns: repeat(auto-fill, minmax(7rem, 1fr));
-	}
-}
-
-@media(max-width: $breakpoint-micro) {
-	.album-items {
-		grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
-	}
-}
-
 @media(max-width: $breakpoint-pico) {
 	.album-items {
 		grid-template-columns: repeat(auto-fill, minmax(7rem, 1fr));

assets/components/scroll/scroll.vue

@@ -111,10 +111,6 @@ export default {
 			type: Boolean,
 			default: false,
 		},
-		items: {
-			type: Array,
-			default: null,
-		},
 	},
 	data() {
 		return {

package-lock.json

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

package.json

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

src/scrapers/vixen.js

@@ -42,8 +42,7 @@ function getAvatarFallbacks(avatar) {
 		.flat();
 }
 
-/*
-async function getTrailerLegacy(scene, site, url) {
+async function getTrailer(scene, site, url) {
 	const qualities = [360, 480, 720, 1080, 2160];
 
 	const tokenRes = await http.post(`${site.url}/api/__record_tknreq`, {
@@ -73,100 +72,6 @@ async function getTrailerLegacy(scene, site, url) {
 
 	return null;
 }
-*/
-
-async function getTrailer(scene, channel, url) {
-	const res = await http.post(`${channel.url}/graphql`, {
-		operationName: 'getToken',
-		variables: {
-			videoId: scene.newId,
-			device: 'trailer',
-		},
-		query: `
-			query getToken($videoId: ID!, $device: Device!) {
-				generateVideoToken(input: {videoId: $videoId, device: $device}) {
-					p270 {
-						token
-						cdn
-						__typename
-					}
-					p360 {
-						token
-						cdn
-						__typename
-					}
-					p480 {
-						token
-						cdn
-						__typename
-					}
-					p480l {
-						token
-						cdn
-						__typename
-					}
-					p720 {
-						token
-						cdn
-						__typename
-					}
-					p1080 {
-						token
-						cdn
-						__typename
-					}
-					p2160 {
-						token
-						cdn
-						__typename
-					}
-					hls {
-						token
-						cdn
-						__typename
-					}
-					__typename
-				}
-			}
-		`,
-	}, {
-		headers: {
-			referer: url,
-			origin: channel.url,
-		},
-	});
-
-	if (res.ok && res.body.data?.generateVideoToken) {
-		return [
-			{
-				src: res.body.data.generateVideoToken.p2160?.token,
-				quality: 2160,
-			},
-			{
-				src: res.body.data.generateVideoToken.p1080?.token,
-				quality: 1080,
-			},
-			{
-				src: res.body.data.generateVideoToken.p720?.token,
-				quality: 720,
-			},
-			{
-				src: res.body.data.generateVideoToken.p480?.token,
-				quality: 480,
-			},
-			{
-				src: res.body.data.generateVideoToken.p360?.token,
-				quality: 360,
-			},
-			{
-				src: res.body.data.generateVideoToken.p270?.token,
-				quality: 270,
-			},
-		];
-	}
-
-	return null;
-}
 
 function scrapeAll(scenes, site, origin) {
 	return scenes.map((scene) => {