From 3f843cc0fcbaa80bbb7bf6df31171187f29834aa Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Fri, 25 Sep 2020 21:21:26 +0200 Subject: [PATCH] Added version to stats page. --- assets/components/stats/stats.vue | 4 ++++ seeds/00_tags.js | 11 +++++++++++ src/updates.js | 12 ++++++++---- webpack.config.js | 4 ++++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/assets/components/stats/stats.vue b/assets/components/stats/stats.vue index e6e2794b..4118e0f5 100644 --- a/assets/components/stats/stats.vue +++ b/assets/components/stats/stats.vue @@ -3,6 +3,8 @@

Stats

+ Version {{ version }} +
Networks
@@ -44,6 +46,8 @@ async function mounted() { this.totalActors = stats.totalActors; this.totalNetworks = stats.totalNetworks; this.totalChannels = stats.totalChannels; + + this.version = VERSION; // eslint-disable-line no-undef } export default { diff --git a/seeds/00_tags.js b/seeds/00_tags.js index 85e5c550..492da568 100644 --- a/seeds/00_tags.js +++ b/seeds/00_tags.js @@ -701,6 +701,13 @@ const tags = [ slug: 'pussy-eating', group: 'oral', }, + { + name: 'pussy to mouth', + slug: 'pussy-to-mouth', + priority: 5, + description: 'Sucking off a cock right fresh out of your pussy.', + group: 'oral', + }, { name: 'pyjamas', slug: 'pyjamas', @@ -1277,6 +1284,10 @@ const aliases = [ name: 'cum on tits', for: 'cum-on-boobs', }, + { + name: 'cum swallow', + for: 'swallowing', + }, { name: 'cum swallowing', for: 'swallowing', diff --git a/src/updates.js b/src/updates.js index 3005f712..87d8972f 100644 --- a/src/updates.js +++ b/src/updates.js @@ -37,10 +37,14 @@ async function filterUniqueReleases(latestReleases, accReleases) { // add entry IDs of accumulated releases to prevent an infinite scrape loop // when one page contains the same release as the previous const duplicateReleasesBySiteIdAndEntryId = duplicateReleases - .concat(accReleases) + .concat(accReleases.uniqueReleases) .reduce(mapReleasesToSiteIdAndEntryId, {}); - const localDuplicateReleasesBySiteIdAndEntryId = accReleases.reduce(mapReleasesToSiteIdAndEntryId, {}); + const localDuplicateReleasesBySiteIdAndEntryId = accReleases.uniqueReleases + .concat(accReleases.duplicateReleases) + .reduce(mapReleasesToSiteIdAndEntryId, {}); + + console.log(localDuplicateReleasesBySiteIdAndEntryId); const uniqueReleases = latestReleases.filter(release => !duplicateReleasesBySiteIdAndEntryId[release.entity.id]?.[release.entryId]); const localUniqueReleases = latestReleases.filter(release => !localDuplicateReleasesBySiteIdAndEntryId[release.entity.id]?.[release.entryId]); @@ -113,8 +117,8 @@ async function scrapeReleases(scraper, entity, preData, upcoming = false, page = || releasesWithEntity.slice(0, Math.max(argv.nullDateLimit - totalReleases, 0)); const { uniqueReleases, localUniqueReleases, duplicateReleases } = argv.force - ? { uniqueReleases: limitedReleases, localUniqueReleases: limitedReleases, duplicateReleases: [] } - : await filterUniqueReleases(limitedReleases, acc.uniqueReleases); + ? { uniqueReleases: limitedReleases, localUniqueReleases: releases, duplicateReleases: [] } + : await filterUniqueReleases(limitedReleases, acc); const accReleases = { uniqueReleases: acc.uniqueReleases.concat(uniqueReleases), diff --git a/webpack.config.js b/webpack.config.js index c6a5b0e7..0b6a224d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,3 +1,4 @@ +const webpack = require('webpack'); const path = require('path'); const VueLoaderPlugin = require('vue-loader/lib/plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); @@ -63,6 +64,9 @@ module.exports = { new MiniCssExtractPlugin({ filename: '../css/style.css', }), + new webpack.DefinePlugin({ + VERSION: JSON.stringify(process.env.npm_package_version), + }), ], resolve: { alias: {