assets/components/actors/actor.vue

@@ -23,18 +23,34 @@
                 <span>{{ actor.aliases.join(', ') }}</span>
             </li>
 
-            <Social
+            <div
                 v-if="actor.social && actor.social.length > 0"
-                :actor="actor"
+                class="social header-social"
-                class="header-social"
+            >
-            />
+                <a
+                    v-for="social in actor.social"
+                    :key="`social-${social.id}`"
+                    v-tooltip.bottom="social.url"
+                    :href="social.url"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    class="social-link"
+                >
+                    <Icon
+                        v-if="social.platform"
+                        :icon="social.platform"
+                    />
+
+                    <Icon
+                        v-else
+                        icon="link"
+                    />
+                </a>
+            </div>
         </div>
 
         <div class="actor-inner">
-            <div
+            <div class="profile">
-                class="profile"
-                :class="{ expanded }"
-            >
                 <a
                     v-if="actor.avatar"
                     :href="`/media/${actor.avatar.path}`"
@@ -48,12 +64,6 @@
                     >
                 </a>
 
-                <span
-                    v-show="expanded"
-                    class="expand collapse-header noselect"
-                    @click="expanded = false"
-                ><Icon icon="arrow-up3" /></span>
-
                 <ul class="bio nolist">
                     <li
                         v-if="actor.birthdate"
@@ -76,10 +86,10 @@
                         <span>
                             <span
                                 v-if="actor.origin.city"
-                                class="city hideable"
+                                class="city"
                             >{{ actor.origin.city }}</span><span
                                 v-if="actor.origin.state && (!actor.origin.city || (actor.origin.country && actor.origin.country.alpha2 === 'US'))"
-                                class="state hideable"
+                                class="state"
                             >{{ actor.origin.city ? `, ${actor.origin.state}` : actor.origin.state }}</span>
 
                             <span
@@ -103,10 +113,10 @@
                         <span>
                             <span
                                 v-if="actor.residence.city"
-                                class="city hideable"
+                                class="city"
                             >{{ actor.residence.city }}</span><span
                                 v-if="actor.residence.state && actor.residence.country && actor.residence.country.alpha2 === 'US'"
-                                class="state hideable"
+                                class="state"
                             >{{ actor.residence.city ? `, ${actor.residence.state}` : actor.residence.state }}</span>
 
                             <span
@@ -123,7 +133,7 @@
 
                     <li
                         v-if="actor.ethnicity"
-                        class="bio-item ethnicity hideable"
+                        class="bio-item ethnicity"
                     >
                         <dfn class="bio-label"><Icon icon="earth2" />Ethnicity</dfn>
                         <span>{{ actor.ethnicity }}</span>
@@ -158,7 +168,7 @@
 
                     <li
                         v-if="actor.weight"
-                        class="bio-item weight hideable"
+                        class="bio-item weight"
                     >
                         <dfn class="bio-label"><Icon icon="scale" />Weight</dfn>
 
@@ -170,7 +180,7 @@
 
                     <li
                         v-if="actor.hasTattoos"
-                        class="bio-item tattoos hideable"
+                        class="bio-item tattoos"
                     >
                         <dfn class="bio-label"><Icon icon="flower" />Tattoos</dfn>
 
@@ -184,7 +194,7 @@
 
                     <li
                         v-if="actor.hasPiercings"
-                        class="bio-item piercings hideable"
+                        class="bio-item piercings"
                     >
                         <dfn class="bio-label"><Icon icon="trophy4" />Piercings</dfn>
 
@@ -196,33 +206,16 @@
                         <span v-else>Yes</span>
                     </li>
 
-                    <li class="bio-item scraped hideable">Updated on {{ formatDate(actor.scrapedAt, 'YYYY-MM-DD HH:mm') }}</li>
+                    <li class="bio-item scraped">Updated on {{ formatDate(actor.scrapedAt, 'YYYY-MM-DD HH:mm') }}</li>
                 </ul>
 
-                <span
-                    v-show="!expanded"
-                    class="expand expand-header collapse-header noselect"
-                    @click="expanded = true"
-                ><Icon icon="arrow-down3" /></span>
-
                 <p
                     v-if="actor.description"
                     class="description"
                 >{{ actor.description }}</p>
-
-                <Social
-                    v-if="actor.social && actor.social.length > 0"
-                    :actor="actor"
-                    class="profile-social"
-                />
-
-                <span
-                    v-show="expanded"
-                    class="expand expand-header collapse-header noselect"
-                    @click="expanded = false"
-                ><Icon icon="arrow-up3" /></span>
             </div>
 
+
             <div class="actor-content">
                 <div
                     v-if="actor.avatar || (actor.photos && actor.photos.length > 0)"
@@ -232,23 +225,11 @@
 
                     <Photos
                         :actor="actor"
-                        :class="{ expanded }"
                         class="compact"
+                        @wheel.native.prevent="scrollPhotos"
                     />
                 </div>
 
-                <span
-                    v-show="!expanded"
-                    class="expand noselect"
-                    @click="expanded = true"
-                ><Icon icon="arrow-down3" /></span>
-
-                <span
-                    v-show="expanded"
-                    class="expand noselect"
-                    @click="expanded = false"
-                ><Icon icon="arrow-up3" /></span>
-
                 <Releases :releases="actor.releases" />
             </div>
         </div>
@@ -259,7 +240,6 @@
 import Photos from './photos.vue';
 import FilterBar from '../header/filter-bar.vue';
 import Releases from '../releases/releases.vue';
-import Social from './social.vue';
 
 async function fetchActor() {
     this.actor = await this.$store.dispatch('fetchActors', { actorSlug: this.$route.params.actorSlug });
@@ -282,7 +262,6 @@ export default {
         FilterBar,
         Photos,
         Releases,
-        Social,
     },
     data() {
         return {
@@ -371,6 +350,7 @@ export default {
     height: 100%;
     display: flex;
     flex-direction: column;
+    flex-shrink: 0;
     flex-wrap: wrap;
     box-sizing: border-box;
     overflow: hidden;
@@ -417,7 +397,6 @@ export default {
 }
 
 .bio-value {
-    margin: 0 0 0 2rem;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
@@ -490,10 +469,6 @@ export default {
     padding: 0 .5rem;
 }
 
-.ethnicity {
-    text-transform: capitalize;
-}
-
 .scraped {
     color: $highlight-weak;
     font-size: .8rem;
@@ -518,6 +493,26 @@ export default {
     }
 }
 
+.social {
+    display: block;
+}
+
+.social-link {
+    display: inline-block;
+    padding: 0 0 0 1rem;
+
+    .icon {
+        color: $highlight;
+        fill: $highlight;
+        width: 1.5rem;
+        height: 1.5rem;
+    }
+
+    &:hover .icon {
+        fill: $primary;
+    }
+}
+
 .actor-content {
     display: flex;
     flex-grow: 1;
@@ -546,14 +541,6 @@ export default {
     padding: 1rem;
 }
 
-.profile-social {
-    display: none;
-}
-
-.collapse-header {
-    display: none;
-}
-
 @media(max-width: $breakpoint4) {
     .description {
         display: none;
@@ -589,45 +576,28 @@ export default {
         height: auto;
         flex-direction: column;
         padding: 0 0 .5rem 0;
-
-        &:not(.expanded) .hideable {
-            display: none;
-        }
     }
 
     .bio {
         width: 100%;
-        height: auto;
         padding: 0 1rem;
         margin: 0;
     }
 
     .bio-item {
-        width: 100%;
+        width: auto;
         margin: 0;
     }
 
-    .expand-header {
+    .city,
-        display: block;
+    .state,
-    }
+    .ethnicity,
-
+    .residence,
-    .expanded .description {
+    .weight,
-        display: block;
+    .tattoos,
-        max-width: 100%;
+    .piercings,
-        max-height: none;
+    .scraped {
-        margin: 0;
+        display: none;
-        padding: 0 1rem;
-        overflow: bisible;
-    }
-
-    .expanded {
-        .collapse-header {
-            display: block;
-        }
-
-        .bio-value {
-            white-space: normal;
-        }
     }
 }
 
@@ -636,11 +606,6 @@ export default {
         display: none;
     }
 
-    .expanded .profile-social {
-        display: block;
-        margin: 1rem 0 0 0;
-    }
-
     .header-name {
         flex-grow: 1;
     }

assets/components/actors/actors.vue

@@ -12,7 +12,6 @@
 import Actor from '../tile/actor.vue';
 
 async function mounted() {
-    this.pageTitle = 'Actors';
     this.actors = await this.$store.dispatch('fetchActors', { limit: 1000 });
 }
 
@@ -23,7 +22,6 @@ export default {
     data() {
         return {
             actors: [],
-            pageTitle: null,
         };
     },
     mounted,

assets/components/actors/social.vue

@@ -1,61 +0,0 @@
-<template>
-    <div
-        v-if="actor"
-        class="social"
-    >
-        <a
-            v-for="social in actor.social"
-            :key="`social-${social.id}`"
-            v-tooltip.bottom="social.url"
-            :href="social.url"
-            target="_blank"
-            rel="noopener noreferrer"
-            class="social-link"
-        >
-            <Icon
-                v-if="social.platform"
-                :icon="social.platform"
-            />
-
-            <Icon
-                v-else
-                icon="link"
-            />
-        </a>
-    </div>
-</template>
-
-<script>
-export default {
-    props: {
-        actor: {
-            type: Object,
-            default: null,
-        },
-    },
-};
-</script>
-
-<style lang="scss" scoped>
-@import 'theme';
-
-.social {
-    display: block;
-}
-
-.social-link {
-    display: inline-block;
-    padding: 0 0 0 1rem;
-
-    .icon {
-        color: $highlight;
-        fill: $highlight;
-        width: 1.5rem;
-        height: 1.5rem;
-    }
-
-    &:hover .icon {
-        fill: $primary;
-    }
-}
-</style>

assets/components/networks/network.vue

@@ -81,8 +81,8 @@
 
                     <Sites
                         :sites="sites"
-                        :class="{ expanded }"
                         class="compact"
+                        :class="{ expanded }"
                     />
 
                     <span
@@ -234,16 +234,63 @@ export default {
     }
 }
 
+.expand {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: .5rem 0;
+    font-weight: bold;
+    font-size: .9rem;
+    cursor: pointer;
+
+    .icon {
+        fill: $shadow;
+        margin: 0 .5rem;
+    }
+
+    &:hover .icon {
+        fill: $shadow-strong;
+    }
+}
+
+.expand-sidebar:hover {
+    background: $shadow-hint;
+}
+
+.expand-header {
+    display: none;
+
+    &:hover {
+        background: $shadow-hint;
+    }
+}
+
+.collapse-header {
+    width: 100%;
+    display: none;
+    justify-content: center;
+    align-items: center;
+    padding: 0;
+    background: $profile;
+
+    .icon {
+        width: 100%;
+        fill: $highlight;
+        padding: .5rem 0;
+    }
+
+    &:hover .icon {
+        background: $highlight-hint;
+        fill: $text-contrast;
+    }
+}
+
 .sites.compact {
     display: none;
     background: $profile;
     grid-row: 1;
 }
 
-.collapse-header {
-    display: none;
-}
-
 @media(max-width: $breakpoint3) {
     .header,
     .header.hideable {

assets/css/style.scss

@@ -37,56 +37,3 @@ body {
         fill: $primary;
     }
 }
-
-.expand {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: .5rem 0;
-    font-weight: bold;
-    font-size: .9rem;
-    cursor: pointer;
-
-    .icon {
-        fill: $shadow;
-    }
-
-    &:hover {
-        background: $shadow-hint;
-
-        .icon {
-            fill: $shadow-strong;
-        }
-    }
-}
-
-.expand-sidebar:hover {
-    background: $shadow-hint;
-}
-
-.expand-header {
-    display: none;
-
-    &:hover {
-        background: $shadow-hint;
-    }
-}
-
-.collapse-header {
-    width: 100%;
-    justify-content: center;
-    align-items: center;
-    padding: 0;
-    background: $profile;
-
-    .icon {
-        width: 100%;
-        fill: $highlight;
-        padding: .5rem 0;
-    }
-
-    &:hover .icon {
-        background: $highlight-hint;
-        fill: $text-contrast;
-    }
-}

package-lock.json

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

package.json

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

src/actors.js

@@ -177,6 +177,11 @@ function curateSocialEntry(url, actorId) {
             pattern: 'http(s)\\://(*)modelhub.com/:username(/)(?*)',
             format: username => `https://www.modelhub.com/${username}`,
         },
+        {
+            label: 'imdb',
+            pattern: 'http(s)\\://(*)imdb.com/name/:userId(/)(?*)',
+            format: userId => `https://www.imdb.com/name/${userId}/`,
+        },
     ];
 
     const match = platforms.reduce((acc, platform) => {
@@ -393,7 +398,7 @@ async function scrapeActors(actorNames) {
                 }, newActorEntry.name);
             }
         } catch (error) {
-            logger.warn(`${actorName}: ${error}`);
+            logger.warn(actorName, error);
         }
     }, {
         concurrency: 3,

src/scrapers/xempire.js

@@ -98,16 +98,10 @@ async function scrapeScene(html, url, site) {
         duration,
         poster,
         photos,
-        trailer: [
+        trailer: {
-            {
+            src: trailer,
-                src: trailer.replace('hd', '1080p'),
+            quality: parseInt(videoData.sizeOnLoad, 10),
-                quality: 1080,
+        },
-            },
-            {
-                src: trailer,
-                quality: parseInt(videoData.sizeOnLoad, 10),
-            },
-        ],
         tags,
         rating: {
             stars,