diff --git a/assets/components/actors/actor.vue b/assets/components/actors/actor.vue index dc95471b..25419e9e 100644 --- a/assets/components/actors/actor.vue +++ b/assets/components/actors/actor.vue @@ -43,7 +43,7 @@ > diff --git a/assets/components/actors/photos.vue b/assets/components/actors/photos.vue index 61a59210..520d7966 100644 --- a/assets/components/actors/photos.vue +++ b/assets/components/actors/photos.vue @@ -18,7 +18,7 @@ :src="sfw ? `/img/${actor.avatar.sfw.thumbnail}` : `/media/${actor.avatar.thumbnail}`" :data-src="sfw ? `/img/${actor.avatar.sfw.thumbnail}` : `/media/${actor.avatar.thumbnail}`" :data-loading="sfw ? `/img/${actor.avatar.sfw.lazy}` : `/media/${actor.avatar.lazy}`" - :title="actor.avatar.copyright && `© ${actor.avatar.copyright}`" + :title="actor.avatar.credit && `© ${actor.avatar.credit}`" class="avatar photo" @load="$parent.$emit('load')" > @@ -36,7 +36,7 @@ :src="sfw ? `/img/${photo.sfw.thumbnail}` : `/media/${photo.thumbnail}`" :data-src="sfw ? `/img/${photo.sfw.thumbnail}` : `/media/${photo.thumbnail}`" :data-loading="sfw ? `/img/${photo.sfw.lazy}` : `/media/${photo.lazy}`" - :title="`© ${photo.copyright || photo.entity.name}`" + :title="`© ${photo.credit || photo.entity.name}`" class="photo" @load="$parent.$emit('load')" > diff --git a/assets/components/entities/entity.vue b/assets/components/entities/entity.vue index d5dbe297..0efc4180 100644 --- a/assets/components/entities/entity.vue +++ b/assets/components/entities/entity.vue @@ -215,11 +215,14 @@ export default { height: 2.5rem; } -.logo-parent, -.favicon { +.logo-parent { height: 1.5rem; } +.favicon { + height: 1rem; +} + .name { color: var(--text-light); display: flex; diff --git a/assets/js/ui/actions.js b/assets/js/ui/actions.js index db5a9e6f..7c427c66 100644 --- a/assets/js/ui/actions.js +++ b/assets/js/ui/actions.js @@ -116,7 +116,7 @@ function initUiActions(_store, _router) { thumbnail lazy comment - copyright + credit } birthCountry: countryByBirthCountryAlpha2 { alpha2 @@ -135,7 +135,7 @@ function initUiActions(_store, _router) { thumbnail lazy comment - copyright + credit } birthCountry: countryByBirthCountryAlpha2 { alpha2 diff --git a/public/img/logos/fcuk/lazy/favicon.png b/public/img/logos/fcuk/lazy/favicon.png new file mode 100644 index 00000000..7fb15943 Binary files /dev/null and b/public/img/logos/fcuk/lazy/favicon.png differ diff --git a/public/img/logos/fcuk/thumbs/favicon.png b/public/img/logos/fcuk/thumbs/favicon.png new file mode 100644 index 00000000..7fb15943 Binary files /dev/null and b/public/img/logos/fcuk/thumbs/favicon.png differ diff --git a/seeds/00_tags.js b/seeds/00_tags.js index b5e7232f..c45bf2fc 100644 --- a/seeds/00_tags.js +++ b/seeds/00_tags.js @@ -180,6 +180,7 @@ const tags = [ { name: 'behind the scenes', slug: 'behind-the-scenes', + priority: 6, }, { name: 'big dick', diff --git a/src/scrapers/fcuk.js b/src/scrapers/fcuk.js index 7eb8b825..77c850a8 100644 --- a/src/scrapers/fcuk.js +++ b/src/scrapers/fcuk.js @@ -2,6 +2,8 @@ const qu = require('../utils/qu'); +// TODO: profile scraping + function scrapeLatestBlog(scenes, channel) { return scenes.map(({ query }) => { const release = {}; @@ -18,7 +20,10 @@ function scrapeLatestBlog(scenes, channel) { release.description = query.text('p'); release.date = query.date('h5 strong, .videos h3', 'MMM. DD, YYYY', /\w+. \d{2}, \d{4}/); - if (!/\band\b/.test(release.title) && new RegExp(release.title).test(release.description)) { + // remove common patterns so only the name is left + const curatedTitle = release.title.replace(/\b(part \d|\banal|bts)\b/gi, '').trim(); + + if (!/\band\b/.test(curatedTitle) && new RegExp(curatedTitle).test(release.description)) { // scene title is probably the actor name release.actors = [release.title]; } @@ -63,7 +68,7 @@ function scrapeSceneBlog({ query }, url, channel) { release.entryId = new URL(url).pathname.match(/\/scene\/(\d+)\/(\d+)/).slice(1, 3).join('-'); - release.title = query.q('h4 strong, .videos h3', true); + release.title = query.text('h4 strong, .videos h3'); release.description = query.q('#about p, .videos p', true); const actors = query.urls('a[href*="/girl/"]').map(actorUrl => actorUrl.match(/video-([\w\s]+)/)?.[1]).filter(Boolean); @@ -98,7 +103,6 @@ function scrapeScene({ query, html }, url, channel) { }; } - console.log(release); return release; }