diff --git a/assets/components/tags/tags.vue b/assets/components/tags/tags.vue index 3eb18eb1c..235d8ac71 100644 --- a/assets/components/tags/tags.vue +++ b/assets/components/tags/tags.vue @@ -66,6 +66,8 @@ async function mounted() { 'blonde', 'brunette', 'redhead', + 'tattoos', + 'piercings', ], extreme: [ 'airtight', diff --git a/public/img/tags/tattoo/lazy/poster.jpeg b/public/img/tags/tattoo/lazy/poster.jpeg deleted file mode 100644 index e82d9c22f..000000000 Binary files a/public/img/tags/tattoo/lazy/poster.jpeg and /dev/null differ diff --git a/public/img/tags/tattoo/poster.jpeg b/public/img/tags/tattoo/poster.jpeg deleted file mode 100755 index b8b424398..000000000 Binary files a/public/img/tags/tattoo/poster.jpeg and /dev/null differ diff --git a/public/img/tags/tattoo/thumbs/poster.jpeg b/public/img/tags/tattoo/thumbs/poster.jpeg deleted file mode 100644 index 50a23189d..000000000 Binary files a/public/img/tags/tattoo/thumbs/poster.jpeg and /dev/null differ diff --git a/seeds/00_tags.js b/seeds/00_tags.js index 54ecda59e..40278cd1a 100644 --- a/seeds/00_tags.js +++ b/seeds/00_tags.js @@ -768,8 +768,8 @@ const tags = [ priority: 6, }, { - name: 'tattoo', - slug: 'tattoo', + name: 'tattoos', + slug: 'tattoos', group: 'body', }, { @@ -1564,8 +1564,8 @@ const aliases = [ for: 'bdsm', }, { - name: 'tattoos', - for: 'tattoo', + name: 'tattoo', + for: 'tattoos', secondary: true, }, { diff --git a/seeds/04_media.js b/seeds/04_media.js index 5cc729c82..dbaa64852 100644 --- a/seeds/04_media.js +++ b/seeds/04_media.js @@ -46,12 +46,13 @@ const tagPosters = [ ['nurse', 0, 'Sarah Vandella in "Cum For Nurse Sarah" for Brazzers'], ['oil', 0, 'Jada Stevens in "Jada Stevens Anal Ass Oiled Up For James Deen\'s Cock" for Jules Jordan'], ['orgy', 1, 'Megan Rain (DP), Morgan Lee (anal), Jessa Rhodes, Melissa Moore and Kimmy Granger in "Orgy Masters 8" for Jules Jordan'], + ['piercings', 0, ''], ['pussy-eating', 0, 'Kali Roses licking Emily Willis\' pussy in "Peeping On My Neighbor" for Girl Girl'], ['redhead', 0, 'Penny Pax in "The Submission of Emma Marx: Boundaries" for New Sensations'], ['schoolgirl', 1, 'Eliza Ibarra for Brazzers'], ['swallowing', 'poster'], ['teen', 0, 'Eva Elfie in "Fresh New Talent" for Club Seventeen'], - ['tattoo', 'poster', 'Kali Roses in "Goes All In For Anal" for Hussie Pass'], + ['tattoos', 'poster', 'Kali Roses in "Goes All In For Anal" for Hussie Pass'], ['trainbang', 'poster', 'Kali Roses in "Passing Me Around" for Blacked'], ['triple-anal', 'poster', 'Kristy Black in SZ1986 for LegalPorno'], ] diff --git a/src/app.js b/src/app.js index 152844c04..3538b9b96 100644 --- a/src/app.js +++ b/src/app.js @@ -26,7 +26,6 @@ async function init() { if (argv.actorScenes) { const actorReleases = actors.map(actor => actor.releases).flat().filter(Boolean); - console.log(actors, actorReleases); await storeReleases(actorReleases); } diff --git a/src/scrapers/gamma.js b/src/scrapers/gamma.js index 0e36cc4fe..c3c21aebd 100644 --- a/src/scrapers/gamma.js +++ b/src/scrapers/gamma.js @@ -175,6 +175,9 @@ function scrapeAll(html, site, networkUrl, hasTeaser = true) { const posterEl = $(element).find('.imgLink img, .tlcImageItem'); if (posterEl) release.poster = posterEl.attr('data-original') || posterEl.attr('src'); + const channelEl = $(element).find('.fromSite a'); + if (channelEl) release.channel = channelEl.attr('title').replace('.com', ''); + if (hasTeaser) { release.teaser = [ { src: `https://videothumb.gammacdn.com/600x339/${release.entryId}.mp4` }, @@ -232,7 +235,11 @@ async function scrapeScene(html, url, site, baseRelease, mobileHtml) { const rawTags = data?.keywords?.split(', ') || data2?.keywords?.split(', ') || []; release.tags = hasTrans ? [...rawTags, 'transsexual'] : rawTags; - const channel = data?.productionCompany?.name || $('.studioLink a, .siteLink a').attr('title')?.trim() || $('.siteNameSpan').text()?.trim().toLowerCase().replace('.com', ''); + const channel = data?.productionCompany?.name + || $('.studioLink a, .siteLink a').attr('title')?.trim() + || $('.siteNameSpan').text()?.trim().toLowerCase().replace('.com', '') + || $('meta[name="twitter:domain"]').attr('content')?.replace('.com', ''); + if (channel) release.channel = slugify(channel, ''); if (videoData.picPreview && new URL(videoData.picPreview).pathname.length > 1) release.poster = videoData.picPreview; // sometimes links to just https://images02-fame.gammacdn.com/ @@ -301,7 +308,7 @@ async function fetchActorReleases(profileUrl, getActorReleasesUrl, page = 1, acc if (!res.ok) return []; - const releases = scrapeAll(res.html, null, origin); + const releases = scrapeAll(res.item.html, null, origin); const nextPage = res.item.qu.url('.Gamma_Paginator a.next'); if (nextPage) {