From 0e784a274f6954a7d2d60c3f7494f1a2d7100373 Mon Sep 17 00:00:00 2001
From: Niels Simenon <niels.simenon@gmail.com>
Date: Mon, 28 Oct 2019 00:58:54 +0100
Subject: [PATCH] Reworked tag matching. Added tag filter groundwork.

---
 assets/components/home/home.vue       |  33 +-
 assets/components/release/release.vue |   4 +-
 migrations/20190325001339_releases.js |   5 +-
 seeds/02_tags.js                      | 558 +++++++++++++-------------
 src/fetch-releases.js                 |   9 +-
 src/releases.js                       |   2 +-
 src/tags.js                           |  17 +-
 7 files changed, 338 insertions(+), 290 deletions(-)

diff --git a/assets/components/home/home.vue b/assets/components/home/home.vue
index 1e082205..87a8fe10 100644
--- a/assets/components/home/home.vue
+++ b/assets/components/home/home.vue
@@ -1,5 +1,32 @@
 <template>
     <div class="content-inner">
+        <div class="filters-bar">
+            Content:
+            <ul class="filters">
+                <li>
+                    <label>
+                        <input
+                            type="checkbox"
+                        >Lesbian
+                    </label>
+                </li>
+                <li>
+                    <label>
+                        <input
+                            type="checkbox"
+                        >Gay
+                    </label>
+                </li>
+                <li>
+                    <label>
+                        <input
+                            type="checkbox"
+                        >Transsexual
+                    </label>
+                </li>
+            </ul>
+        </div>
+
         <h2 class="heading">Latest releases</h2>
 
         <ul class="scenes nolist">
@@ -82,13 +109,13 @@
                     </span>
 
                     <span
-                        :title="release.tags.map(tag => tag.tag).join(', ')"
+                        :title="release.tags.map(tag => tag.name).join(', ')"
                         class="scene-row"
                     >
                         <ul class="scene-tags nolist">
                             <li
                                 v-for="tag in release.tags"
-                                :key="tag.tag"
+                                :key="`tag-${tag.id}`"
                                 class="scene-tag"
                             >
                                 <a
@@ -96,7 +123,7 @@
                                     target="_blank"
                                     rel="noopener noreferrer"
                                     class="tag-link"
-                                >{{ tag.tag }}</a>
+                                >{{ tag.name }}</a>
                             </li>
                         </ul>
                     </span>
diff --git a/assets/components/release/release.vue b/assets/components/release/release.vue
index bef14582..7bd5464b 100644
--- a/assets/components/release/release.vue
+++ b/assets/components/release/release.vue
@@ -76,7 +76,7 @@
         <ul class="row tags">
             <li
                 v-for="tag in release.tags"
-                :key="tag.tag"
+                :key="`tag-${tag.id}`"
                 class="tag"
             >
                 <a
@@ -84,7 +84,7 @@
                     target="_blank"
                     rel="noopener noreferrer"
                     class="tag-link"
-                >{{ tag.tag }}</a>
+                >{{ tag.name }}</a>
             </li>
         </ul>
     </div>
diff --git a/migrations/20190325001339_releases.js b/migrations/20190325001339_releases.js
index 89680e1c..efbac908 100644
--- a/migrations/20190325001339_releases.js
+++ b/migrations/20190325001339_releases.js
@@ -34,7 +34,7 @@ exports.up = knex => Promise.resolve()
     }))
     .then(() => knex.schema.createTable('tags', (table) => {
         table.increments('id', 12);
-        table.string('tag');
+        table.string('name');
 
         table.integer('group_id', 12)
             .references('id')
@@ -53,6 +53,7 @@ exports.up = knex => Promise.resolve()
         table.string('name');
         table.string('url');
         table.text('description');
+        table.enum('orientation', ['gay', 'bi', 'lesbian', 'trans']);
 
         table.string('slug', 32)
             .unique();
@@ -68,6 +69,7 @@ exports.up = knex => Promise.resolve()
         table.string('name');
         table.string('url');
         table.text('description');
+        table.enum('orientation', ['gay', 'bi', 'lesbian', 'trans']);
         table.string('parameters');
 
         table.string('slug', 32)
@@ -107,6 +109,7 @@ exports.up = knex => Promise.resolve()
         table.integer('rating')
             .unsigned();
 
+        table.enum('orientation', ['gay', 'bi', 'lesbian', 'trans']);
         table.boolean('deep');
 
         table.datetime('created_at')
diff --git a/seeds/02_tags.js b/seeds/02_tags.js
index 7b1e1b43..b1ba5cd5 100644
--- a/seeds/02_tags.js
+++ b/seeds/02_tags.js
@@ -51,724 +51,724 @@ exports.seed = knex => Promise.resolve()
 
         return knex.raw(`${knex('tags').insert([
             {
-                tag: '69',
+                name: '69',
                 slug: '69',
                 alias_for: null,
                 group_id: groupsMap['position'],
             },
             {
-                tag: 'airtight',
+                name: 'airtight',
                 slug: 'airtight',
                 alias_for: null,
                 group_id: groupsMap['penetration'],
             },
             {
-                tag: 'amateur',
+                name: 'amateur',
                 slug: 'amateur',
                 alias_for: null,
             },
             {
-                tag: 'american',
+                name: 'american',
                 slug: 'american',
                 alias_for: null,
                 group_id: groupsMap['ethnicity'],
             },
             {
-                tag: 'anal creampie',
+                name: 'anal creampie',
                 slug: 'anal-creampie',
                 alias_for: null,
             },
             {
-                tag: 'anal sex',
+                name: 'anal sex',
                 slug: 'anal-sex',
                 alias_for: null,
             },
             {
-                tag: 'anal fingering',
+                name: 'anal fingering',
                 slug: 'anal-fingering',
                 alias_for: null,
             },
             {
-                tag: 'anal fisting',
+                name: 'anal fisting',
                 slug: 'anal-fisting',
                 alias_for: null,
             },
             {
-                tag: 'anal prolapse',
+                name: 'anal prolapse',
                 slug: 'anal-prolapse',
                 alias_for: null,
             },
             {
-                tag: 'anal toys',
+                name: 'anal toys',
                 slug: 'anal-toys',
                 alias_for: null,
             },
             {
-                tag: 'asian',
+                name: 'asian',
                 slug: 'asian',
                 alias_for: null,
                 group_id: groupsMap['ethnicity'],
             },
             {
-                tag: 'ass licking',
+                name: 'ass licking',
                 slug: 'ass-licking',
                 alias_for: null,
             },
             {
-                tag: 'athletic',
+                name: 'athletic',
                 slug: 'athletic',
                 alias_for: null,
                 group_id: groupsMap['body'],
             },
             {
-                tag: 'ass to mouth',
+                name: 'ass to mouth',
                 slug: 'ass-to-mouth',
                 alias_for: null,
             },
             {
-                tag: 'ball licking',
+                name: 'ball licking',
                 slug: 'ball-licking',
                 alias_for: null,
             },
             {
-                tag: 'ballerina',
+                name: 'ballerina',
                 slug: 'ballerina',
                 alias_for: null,
                 group_id: groupsMap['roleplay'],
             },
             {
-                tag: 'bathroom',
+                name: 'bathroom',
                 slug: 'bathroom',
                 alias_for: null,
                 group_id: groupsMap['location'],
             },
             {
-                tag: 'BDSM',
+                name: 'BDSM',
                 slug: 'bdsm',
                 alias_for: null,
             },
             {
-                tag: 'BBC',
+                name: 'BBC',
                 slug: 'bbc',
                 alias_for: null,
                 group_id: groupsMap['body'],
             },
             {
-                tag: 'big cock',
+                name: 'big cock',
                 slug: 'big-cock',
                 alias_for: null,
                 group_id: groupsMap['body'],
             },
             {
-                tag: 'big butt',
+                name: 'big butt',
                 slug: 'big-butt',
                 alias_for: null,
                 group_id: groupsMap['body'],
             },
             {
-                tag: 'big boobs',
+                name: 'big boobs',
                 slug: 'big-boobs',
                 alias_for: null,
                 group_id: groupsMap['body'],
             },
             {
-                tag: 'black hair',
+                name: 'black hair',
                 slug: 'black-hair',
                 alias_for: null,
                 group_id: groupsMap['hair'],
             },
             {
-                tag: 'blonde hair',
+                name: 'blonde hair',
                 slug: 'blonde-hair',
                 alias_for: null,
                 group_id: groupsMap['hair'],
             },
             {
-                tag: 'blowjob',
+                name: 'blowjob',
                 slug: 'blowjob',
                 alias_for: null,
             },
             {
-                tag: 'blowbang',
+                name: 'blowbang',
                 slug: 'blowbang',
                 alias_for: null,
                 group_id: groupsMap['group'],
             },
             {
-                tag: 'bondage',
+                name: 'bondage',
                 slug: 'bondage',
                 alias_for: null,
             },
             {
-                tag: 'brown hair',
+                name: 'brown hair',
                 slug: 'brown-hair',
                 alias_for: null,
                 group_id: groupsMap['hair'],
             },
             {
-                tag: 'bukkake',
+                name: 'bukkake',
                 slug: 'bukkake',
                 alias_for: null,
             },
             {
-                tag: 'cheerleader',
+                name: 'cheerleader',
                 slug: 'cheerleader',
                 alias_for: null,
                 group_id: groupsMap['roleplay'],
             },
             {
-                tag: 'choking',
+                name: 'choking',
                 slug: 'choking',
                 alias_for: null,
             },
             {
-                tag: 'corporal punishment',
+                name: 'corporal punishment',
                 slug: 'corporal-punishment',
                 alias_for: null,
             },
             {
-                tag: 'couples',
+                name: 'couples',
                 slug: 'couples',
                 alias_for: null,
             },
             {
-                tag: 'cowgirl',
+                name: 'cowgirl',
                 slug: 'cowgirl',
                 alias_for: null,
             },
             {
-                tag: 'creampie',
+                name: 'creampie',
                 slug: 'creampie',
                 alias_for: null,
             },
             {
-                tag: 'cum licking',
+                name: 'cum licking',
                 slug: 'cum-licking',
                 alias_for: null,
             },
             {
-                tag: 'cum on butt',
+                name: 'cum on butt',
                 slug: 'cum-on-butt',
                 alias_for: null,
             },
             {
-                tag: 'cum on boobs',
+                name: 'cum on boobs',
                 slug: 'cum-on-boobs',
                 alias_for: null,
             },
             {
-                tag: 'cumshot',
+                name: 'cumshot',
                 slug: 'cumshot',
                 alias_for: null,
             },
             {
-                tag: 'curvy',
+                name: 'curvy',
                 slug: 'curvy',
                 alias_for: null,
             },
             {
-                tag: 'double anal penetration',
+                name: 'double anal penetration',
                 slug: 'double-anal',
                 alias_for: null,
             },
             {
-                tag: 'deepthroat',
+                name: 'deepthroat',
                 slug: 'deepthroat',
                 alias_for: null,
             },
             {
-                tag: 'double penetration',
+                name: 'double penetration',
                 slug: 'double-penetration',
                 alias_for: null,
             },
             {
-                tag: 'dungeon',
+                name: 'dungeon',
                 slug: 'dungeon',
                 alias_for: null,
             },
             {
-                tag: 'double vaginal penetration',
+                name: 'double vaginal penetration',
                 slug: 'double-vaginal',
                 alias_for: null,
             },
             {
-                tag: 'double blowjob',
+                name: 'double blowjob',
                 slug: 'double-blowjob',
                 alias_for: null,
             },
             {
-                tag: 'doggy style',
+                name: 'doggy style',
                 slug: 'doggy-style',
                 alias_for: null,
             },
             {
-                tag: 'dress',
+                name: 'dress',
                 slug: 'dress',
                 alias_for: null,
                 group_id: groupsMap['clothing'],
             },
             {
-                tag: 'ebony',
+                name: 'ebony',
                 slug: 'ebony',
                 alias_for: null,
                 group_id: groupsMap['ethnicity'],
             },
             {
-                tag: 'electric shock',
+                name: 'electric shock',
                 slug: 'electric-shock',
                 alias_for: null,
             },
             {
-                tag: 'enhanced boobs',
+                name: 'enhanced boobs',
                 slug: 'enhanced-boobs',
                 alias_for: null,
             },
             {
-                tag: 'European',
+                name: 'European',
                 slug: 'european',
                 alias_for: null,
                 group_id: groupsMap['ethnicity'],
             },
             {
-                tag: 'facefuck',
+                name: 'facefuck',
                 slug: 'facefuck',
                 alias_for: null,
                 group_id: groupsMap['position'],
             },
             {
-                tag: 'facesitting',
+                name: 'facesitting',
                 slug: 'facesitting',
                 alias_for: null,
                 group_id: groupsMap['position'],
             },
             {
-                tag: 'facial',
+                name: 'facial',
                 slug: 'facial',
                 alias_for: null,
             },
             {
-                tag: 'feet',
+                name: 'feet',
                 slug: 'feet',
                 alias_for: null,
             },
             {
-                tag: 'femdom',
+                name: 'femdom',
                 slug: 'femdom',
                 alias_for: null,
             },
             {
-                tag: 'fingering',
+                name: 'fingering',
                 slug: 'fingering',
                 alias_for: null,
             },
             {
-                tag: 'fisting',
+                name: 'fisting',
                 slug: 'fisting',
                 alias_for: null,
             },
             {
-                tag: 'FMF threesome',
+                name: 'FMF threesome',
                 slug: 'fmf',
                 alias_for: null,
                 group_id: groupsMap['group'],
             },
             {
-                tag: 'gag',
+                name: 'gag',
                 slug: 'gag',
                 alias_for: null,
             },
             {
-                tag: 'gangbang',
+                name: 'gangbang',
                 slug: 'gangbang',
                 alias_for: null,
                 group_id: groupsMap['group'],
             },
             {
-                tag: 'gaping',
+                name: 'gaping',
                 slug: 'gaping',
                 alias_for: null,
             },
             {
-                tag: 'gonzo',
+                name: 'gonzo',
                 slug: 'gonzo',
                 alias_for: null,
             },
             {
-                tag: 'hairy',
+                name: 'hairy',
                 slug: 'hairy',
                 alias_for: null,
                 group_id: groupsMap['body'],
             },
             {
-                tag: 'hardcore',
+                name: 'hardcore',
                 slug: 'hardcore',
                 alias_for: null,
             },
             {
-                tag: 'high heels',
+                name: 'high heels',
                 slug: 'high-heels',
                 alias_for: null,
                 group_id: groupsMap['clothing'],
             },
             {
-                tag: 'hungarian',
+                name: 'hungarian',
                 slug: 'hungarian',
                 alias_for: null,
                 group_id: groupsMap['ethnicity'],
             },
             {
-                tag: 'humiliation',
+                name: 'humiliation',
                 slug: 'humiliation',
                 alias_for: null,
             },
             {
-                tag: 'innie pussy',
+                name: 'innie pussy',
                 slug: 'innie-pussy',
                 alias_for: null,
             },
             {
-                tag: 'interracial',
+                name: 'interracial',
                 slug: 'interracial',
                 alias_for: null,
             },
             {
-                tag: 'kissing',
+                name: 'kissing',
                 slug: 'kissing',
                 alias_for: null,
             },
             {
-                tag: 'latex',
+                name: 'latex',
                 slug: 'latex',
                 alias_for: null,
             },
             {
-                tag: 'Latina',
+                name: 'Latina',
                 slug: 'latina',
                 alias_for: null,
             },
             {
-                tag: 'leather',
+                name: 'leather',
                 slug: 'leather',
                 alias_for: null,
             },
             {
-                tag: 'lesbian',
+                name: 'lesbian',
                 slug: 'lesbian',
                 alias_for: null,
             },
             {
-                tag: 'machine dildo',
+                name: 'machine dildo',
                 slug: 'machine-dildo',
                 alias_for: null,
             },
             {
-                tag: 'lingerie',
+                name: 'lingerie',
                 slug: 'lingerie',
                 alias_for: null,
                 group_id: groupsMap['clothing'],
             },
             {
-                tag: 'maid',
+                name: 'maid',
                 slug: 'maid',
                 alias_for: null,
                 group_id: groupsMap['roleplay'],
             },
             {
-                tag: 'masturbation',
+                name: 'masturbation',
                 slug: 'masturbation',
                 alias_for: null,
             },
             {
-                tag: 'MILF',
+                name: 'MILF',
                 slug: 'milf',
                 alias_for: null,
                 group_id: groupsMap['age'],
             },
             {
-                tag: 'MFM threesome',
+                name: 'MFM threesome',
                 slug: 'mfm',
                 alias_for: null,
                 group_id: groupsMap['group'],
             },
             {
-                tag: 'miniskirt',
+                name: 'miniskirt',
                 slug: 'miniskirt',
                 alias_for: null,
                 group_id: groupsMap['clothing'],
             },
             {
-                tag: 'missionary',
+                name: 'missionary',
                 slug: 'missionary',
                 alias_for: null,
                 group_id: groupsMap['position'],
             },
             {
-                tag: 'natural boobs',
+                name: 'natural boobs',
                 slug: 'natural-boobs',
                 alias_for: null,
                 group_id: groupsMap['body'],
             },
             {
-                tag: 'nipple clamps',
+                name: 'nipple clamps',
                 slug: 'nipple-clamps',
                 alias_for: null,
             },
             {
-                tag: 'oral creampie',
+                name: 'oral creampie',
                 slug: 'oral-creampie',
                 alias_for: null,
             },
             {
-                tag: 'orgy',
+                name: 'orgy',
                 slug: 'orgy',
                 alias_for: null,
                 group_id: groupsMap['group'],
             },
             {
-                tag: 'outdoors',
+                name: 'outdoors',
                 slug: 'outdoors',
                 alias_for: null,
                 group_id: groupsMap['location'],
             },
             {
-                tag: 'outie pussy',
+                name: 'outie pussy',
                 slug: 'outie-pussy',
                 alias_for: null,
             },
             {
-                tag: 'pain',
+                name: 'pain',
                 slug: 'pain',
                 alias_for: null,
             },
             {
-                tag: 'pegging',
+                name: 'pegging',
                 slug: 'pegging',
                 alias_for: null,
             },
             {
-                tag: 'petite',
+                name: 'petite',
                 slug: 'petite',
                 alias_for: null,
             },
             {
-                tag: 'piercings',
+                name: 'piercings',
                 slug: 'piercings',
                 alias_for: null,
             },
             {
-                tag: 'POV',
+                name: 'POV',
                 slug: 'pov',
                 alias_for: null,
             },
             {
-                tag: 'pussy eating',
+                name: 'pussy eating',
                 slug: 'pussy-eating',
                 alias_for: null,
             },
             {
-                tag: 'red hair',
+                name: 'red hair',
                 slug: 'red-hair',
                 alias_for: null,
                 group_id: groupsMap['hair'],
             },
             {
-                tag: 'reverse cowgirl',
+                name: 'reverse cowgirl',
                 slug: 'reverse-cowgirl',
                 alias_for: null,
             },
             {
-                tag: 'roleplay',
+                name: 'roleplay',
                 slug: 'roleplay',
                 alias_for: null,
             },
             {
-                tag: 'rough',
+                name: 'rough',
                 slug: 'rough',
                 alias_for: null,
             },
             {
-                tag: 'russian',
+                name: 'russian',
                 slug: 'russian',
                 alias_for: null,
                 group_id: groupsMap['ethnicity'],
             },
             {
-                tag: 'saliva',
+                name: 'saliva',
                 slug: 'saliva',
                 alias_for: null,
             },
             {
-                tag: 'schoolgirl',
+                name: 'schoolgirl',
                 slug: 'schoolgirl',
                 alias_for: null,
                 group_id: groupsMap['roleplay'],
             },
             {
-                tag: 'shaved',
+                name: 'shaved',
                 slug: 'shaved',
                 alias_for: null,
             },
             {
-                tag: 'shoes on',
+                name: 'shoes on',
                 slug: 'shoes-on',
                 alias_for: null,
                 group_id: groupsMap['clothing'],
             },
             {
-                tag: 'short hair',
+                name: 'short hair',
                 slug: 'short-hair',
                 alias_for: null,
                 group_id: groupsMap['hair'],
             },
             {
-                tag: 'skirt',
+                name: 'skirt',
                 slug: 'skirt',
                 alias_for: null,
                 group_id: groupsMap['clothing'],
             },
             {
-                tag: 'slapping',
+                name: 'slapping',
                 slug: 'slapping',
                 alias_for: null,
             },
             {
-                tag: 'socks',
+                name: 'socks',
                 slug: 'socks',
                 alias_for: null,
                 group_id: groupsMap['clothing'],
             },
             {
-                tag: 'spanking',
+                name: 'spanking',
                 slug: 'spanking',
                 alias_for: null,
             },
             {
-                tag: 'strapon',
+                name: 'strapon',
                 slug: 'strapon',
                 group_id: groupsMap['strap-on-dildo'],
             },
             {
-                tag: 'small boobs',
+                name: 'small boobs',
                 slug: 'small-boobs',
                 alias_for: null,
             },
             {
-                tag: 'small butt',
+                name: 'small butt',
                 slug: 'small-butt',
                 alias_for: null,
             },
             {
-                tag: 'speculum',
+                name: 'speculum',
                 slug: 'speculum',
                 alias_for: null,
             },
             {
-                tag: 'squirting',
+                name: 'squirting',
                 slug: 'squirting',
                 alias_for: null,
             },
             {
-                tag: 'standing doggy style',
+                name: 'standing doggy style',
                 slug: 'standing-doggy-style',
                 alias_for: null,
             },
             {
-                tag: 'stockings',
+                name: 'stockings',
                 slug: 'stockings',
                 alias_for: null,
                 group_id: groupsMap['clothing'],
             },
             {
-                tag: 'strap-on dildo',
+                name: 'strap-on dildo',
                 slug: 'strap-on-dildo',
                 alias_for: null,
             },
             {
-                tag: 'suspension',
+                name: 'suspension',
                 slug: 'suspension',
                 alias_for: null,
             },
             {
-                tag: 'swallowing',
+                name: 'swallowing',
                 slug: 'swallowing',
                 alias_for: null,
             },
             {
-                tag: 'tattoo',
+                name: 'tattoo',
                 slug: 'tattoo',
                 alias_for: null,
                 group_id: groupsMap['body'],
             },
             {
-                tag: 'threesome',
+                name: 'threesome',
                 slug: 'threesome',
                 alias_for: null,
                 group_id: groupsMap['group'],
             },
             {
-                tag: 'teen',
+                name: 'teen',
                 slug: 'teen',
                 alias_for: null,
                 group_id: groupsMap['age'],
             },
             {
-                tag: 'titty fuck',
+                name: 'titty fuck',
                 slug: 'titty-fuck',
                 alias_for: null,
             },
             {
-                tag: 'toys',
+                name: 'toys',
                 slug: 'toys',
                 alias_for: null,
             },
             {
-                tag: 'transsexual',
+                name: 'transsexual',
                 slug: 'transsexual',
                 alias_for: null,
             },
             {
-                tag: 'triple penetration',
+                name: 'triple penetration',
                 slug: 'triple-penetration',
                 alias_for: null,
             },
             {
-                tag: 'trimmed',
+                name: 'trimmed',
                 slug: 'trimmed',
                 alias_for: null,
             },
             {
-                tag: 'uniform',
+                name: 'uniform',
                 slug: 'uniform',
                 alias_for: null,
             },
             {
-                tag: 'vibrator',
+                name: 'vibrator',
                 slug: 'vibrator',
                 alias_for: null,
             },
             {
-                tag: 'voyeur',
+                name: 'voyeur',
                 slug: 'voyeur',
                 alias_for: null,
             },
             {
-                tag: 'wet',
+                name: 'wet',
                 slug: 'wet',
                 alias_for: null,
             },
             {
-                tag: 'white',
+                name: 'white',
                 slug: 'white',
                 alias_for: null,
                 group_id: groupsMap['ethnicity'],
             },
             {
-                tag: 'wife',
+                name: 'wife',
                 slug: 'wife',
                 alias_for: null,
             },
             {
-                tag: 'office',
+                name: 'office',
                 slug: 'office',
                 alias_for: null,
                 group_id: groupsMap['location'],
@@ -783,579 +783,579 @@ exports.seed = knex => Promise.resolve()
         return knex.raw(`${knex('tags').insert([
             // ALIASES
             {
-                tag: '2-on-1',
+                name: '2-on-1',
                 alias_for: tagsMap['mfm'],
             },
             {
-                tag: '3+ on 1',
+                name: '3+ on 1',
                 alias_for: tagsMap['gangbang'],
             },
             {
-                tag: 'anal',
+                name: 'anal',
                 alias_for: tagsMap['anal-sex'],
             },
             {
-                tag: 'anilingus',
+                name: 'anilingus',
                 alias_for: tagsMap['ass-licking'],
             },
             {
-                tag: 'asians',
+                name: 'asians',
                 alias_for: tagsMap['asian'],
             },
             {
-                tag: 'atm',
+                name: 'atm',
                 alias_for: tagsMap['ass-to-mouth'],
             },
             {
-                tag: 'bald pussy',
+                name: 'bald pussy',
                 alias_for: tagsMap['shaved'],
             },
             {
-                tag: 'ball gag',
+                name: 'ball gag',
                 alias_for: tagsMap['gag'],
             },
             {
-                tag: 'mfm',
+                name: 'mfm',
                 alias_for: tagsMap['mfm'],
             },
             {
-                tag: 'fmf',
+                name: 'fmf',
                 alias_for: tagsMap['fmf'],
             },
             {
-                tag: 'bgb',
+                name: 'bgb',
                 alias_for: tagsMap['mfm'],
             },
             {
-                tag: 'big ass',
+                name: 'big ass',
                 alias_for: tagsMap['big-butt'],
             },
             {
-                tag: 'big black cock',
+                name: 'big black cock',
                 alias_for: tagsMap['bbc'],
             },
             {
-                tag: 'big black cocks',
+                name: 'big black cocks',
                 alias_for: tagsMap['bbc'],
             },
             {
-                tag: 'big cocks',
+                name: 'big cocks',
                 alias_for: tagsMap['big-cock'],
             },
             {
-                tag: 'big dick',
+                name: 'big dick',
                 alias_for: tagsMap['big-cock'],
             },
             {
-                tag: 'big butts',
+                name: 'big butts',
                 alias_for: tagsMap['big-butt'],
             },
             {
-                tag: 'big tits',
+                name: 'big tits',
                 alias_for: tagsMap['big-boobs'],
             },
             {
-                tag: 'black',
+                name: 'black',
                 alias_for: tagsMap['ebony'],
             },
             {
-                tag: 'blonde',
+                name: 'blonde',
                 alias_for: tagsMap['blonde-hair'],
             },
             {
-                tag: 'blondes',
+                name: 'blondes',
                 alias_for: tagsMap['blonde-hair'],
             },
             {
-                tag: 'blow job',
+                name: 'blow job',
                 alias_for: tagsMap['blowjob'],
             },
             {
-                tag: 'blowjobs',
+                name: 'blowjobs',
                 alias_for: tagsMap['blowjob'],
             },
             {
-                tag: 'blowjob pov',
+                name: 'blowjob pov',
                 alias_for: tagsMap['blowjob'],
             },
             {
-                tag: 'blowjob (double)',
+                name: 'blowjob (double)',
                 alias_for: tagsMap['double-blowjob'],
             },
             {
-                tag: 'blowjob (pov)',
+                name: 'blowjob (pov)',
                 alias_for: tagsMap['blowjob'],
             },
             {
-                tag: 'boob job',
+                name: 'boob job',
                 alias_for: tagsMap['enhanced-boobs'],
             },
             {
-                tag: 'boobjob',
+                name: 'boobjob',
                 alias_for: tagsMap['enhanced-boobs'],
             },
             {
-                tag: 'brunette',
+                name: 'brunette',
                 alias_for: tagsMap['brown-hair'],
             },
             {
-                tag: 'brunettes',
+                name: 'brunettes',
                 alias_for: tagsMap['brown-hair'],
             },
             {
-                tag: 'buttplug',
+                name: 'buttplug',
                 alias_for: tagsMap['anal-toys'],
             },
             {
-                tag: 'caning',
+                name: 'caning',
                 alias_for: tagsMap['corporal-punishment'],
             },
             {
-                tag: 'cattle prod',
+                name: 'cattle prod',
                 alias_for: tagsMap['electric-shock'],
             },
             {
-                tag: 'cheer leader',
+                name: 'cheer leader',
                 alias_for: tagsMap['cheerleader'],
             },
             {
-                tag: 'clover clamps',
+                name: 'clover clamps',
                 alias_for: tagsMap['nipple-clamps'],
             },
             {
-                tag: 'couples fantasies',
+                name: 'couples fantasies',
                 alias_for: tagsMap['couples'],
             },
             {
-                tag: 'creampies',
+                name: 'creampies',
                 alias_for: tagsMap['creampie'],
             },
             {
-                tag: 'crop', // a type of whip, not [sic] short for corporal
+                name: 'crop', // a type of whip, not [sic] short for corporal
                 alias_for: tagsMap['corporal-punishment'],
             },
             {
-                tag: 'cum cleaning',
+                name: 'cum cleaning',
                 alias_for: tagsMap['cum-licking'],
             },
             {
-                tag: 'cum in mouth',
+                name: 'cum in mouth',
                 alias_for: tagsMap['oral-creampie'],
             },
             {
-                tag: 'cum on ass',
+                name: 'cum on ass',
                 alias_for: tagsMap['cum on-butt'],
             },
             {
-                tag: 'cum on tits',
+                name: 'cum on tits',
                 alias_for: tagsMap['cum on-boobs'],
             },
             {
-                tag: 'cum swallowing',
+                name: 'cum swallowing',
                 alias_for: tagsMap['swallowing'],
             },
             {
-                tag: 'cum shot',
+                name: 'cum shot',
                 alias_for: tagsMap['cumshot'],
             },
             {
-                tag: 'cunnilingus',
+                name: 'cunnilingus',
                 alias_for: tagsMap['pussy-eating'],
             },
             {
-                tag: 'pussy licking',
+                name: 'pussy licking',
                 alias_for: tagsMap['pussy-eating'],
             },
             {
-                tag: 'deep throat',
+                name: 'deep throat',
                 alias_for: tagsMap['deepthroat'],
             },
             {
-                tag: 'deepthroating',
+                name: 'deepthroating',
                 alias_for: tagsMap['deepthroat'],
             },
             {
-                tag: 'dildo',
+                name: 'dildo',
                 alias_for: tagsMap['toys'],
             },
             {
-                tag: 'doggystyle',
+                name: 'doggystyle',
                 alias_for: tagsMap['doggy-style'],
             },
             {
-                tag: 'doggie style',
+                name: 'doggie style',
                 alias_for: tagsMap['doggy-style'],
             },
             {
-                tag: 'doggystyle (standing)',
+                name: 'doggystyle (standing)',
                 alias_for: tagsMap['standing doggy-style'],
             },
             {
-                tag: 'doggystyle - standing',
+                name: 'doggystyle - standing',
                 alias_for: tagsMap['standing doggy-style'],
             },
             {
-                tag: 'dom',
+                name: 'dom',
                 alias_for: tagsMap['bdsm'],
             },
             {
-                tag: 'domination',
+                name: 'domination',
                 alias_for: tagsMap['bdsm'],
             },
             {
-                tag: 'dominatrix',
+                name: 'dominatrix',
                 alias_for: tagsMap['femdom'],
             },
             {
-                tag: 'dp',
+                name: 'dp',
                 alias_for: tagsMap['double-penetration'],
             },
             {
-                tag: 'double penetration (dp)',
+                name: 'double penetration (dp)',
                 alias_for: tagsMap['double-penetration'],
             },
             {
-                tag: 'dap',
+                name: 'dap',
                 alias_for: tagsMap['double-anal'],
             },
             {
-                tag: 'double anal (dap)',
+                name: 'double anal (dap)',
                 alias_for: tagsMap['double-anal'],
             },
             {
-                tag: 'double anal penetration (dap)',
+                name: 'double anal penetration (dap)',
                 alias_for: tagsMap['double-anal'],
             },
             {
-                tag: 'dpp',
+                name: 'dpp',
                 alias_for: tagsMap['double-vaginal'],
             },
             {
-                tag: 'dvp',
+                name: 'dvp',
                 alias_for: tagsMap['double-vaginal'],
             },
             {
-                tag: 'double vaginal (dvp)',
+                name: 'double vaginal (dvp)',
                 alias_for: tagsMap['double-vaginal'],
             },
             {
-                tag: 'double vaginal penetration (dvp)',
+                name: 'double vaginal penetration (dvp)',
                 alias_for: tagsMap['double-vaginal'],
             },
             {
-                tag: 'double vaginal (dpp)',
+                name: 'double vaginal (dpp)',
                 alias_for: tagsMap['double-vaginal'],
             },
             {
-                tag: 'double pussy penetration',
+                name: 'double pussy penetration',
                 alias_for: tagsMap['double-vaginal'],
             },
             {
-                tag: 'double pussy penetration (dpp)',
+                name: 'double pussy penetration (dpp)',
                 alias_for: tagsMap['double-vaginal'],
             },
             {
-                tag: 'drool',
+                name: 'drool',
                 alias_for: tagsMap['saliva'],
             },
             {
-                tag: 'enhanced',
+                name: 'enhanced',
                 alias_for: tagsMap['enhanced-boobs'],
             },
             {
-                tag: 'enhanced tits',
+                name: 'enhanced tits',
                 alias_for: tagsMap['enhanced-boobs'],
             },
             {
-                tag: 'facefucking',
+                name: 'facefucking',
                 alias_for: tagsMap['facefuck'],
             },
             {
-                tag: 'face fuck',
+                name: 'face fuck',
                 alias_for: tagsMap['facefuck'],
             },
             {
-                tag: 'face fucking',
+                name: 'face fucking',
                 alias_for: tagsMap['facefuck'],
             },
             {
-                tag: 'face sitting',
+                name: 'face sitting',
                 alias_for: tagsMap['facesitting'],
             },
             {
-                tag: 'facial cumshot',
+                name: 'facial cumshot',
                 alias_for: tagsMap['facial'],
             },
             {
-                tag: 'facials',
+                name: 'facials',
                 alias_for: tagsMap['facial'],
             },
             {
-                tag: 'fake boobs',
+                name: 'fake boobs',
                 alias_for: tagsMap['enhanced-boobs'],
             },
             {
-                tag: 'fake tits',
+                name: 'fake tits',
                 alias_for: tagsMap['enhanced-boobs'],
             },
             {
-                tag: 'flogging',
+                name: 'flogging',
                 alias_for: tagsMap['corporal-punishment'],
             },
             {
-                tag: 'foot fetish',
+                name: 'foot fetish',
                 alias_for: tagsMap['feet'],
             },
             {
-                tag: 'French kissing',
+                name: 'French kissing',
                 alias_for: tagsMap['kissing'],
             },
             {
-                tag: 'gape',
+                name: 'gape',
                 alias_for: tagsMap['gaping'],
             },
             {
-                tag: 'gapes',
+                name: 'gapes',
                 alias_for: tagsMap['gaping'],
             },
             {
-                tag: 'gapes (gaping asshole)',
+                name: 'gapes (gaping asshole)',
                 alias_for: tagsMap['gaping'],
             },
             {
-                tag: 'group sex',
+                name: 'group sex',
                 alias_for: tagsMap['orgy'],
             },
             {
-                tag: 'flagellation',
+                name: 'flagellation',
                 alias_for: tagsMap['corporal-punishment'],
             },
             {
-                tag: 'huge tits',
+                name: 'huge tits',
                 alias_for: tagsMap['big-boobs'],
             },
             {
-                tag: 'huge toys',
+                name: 'huge toys',
                 alias_for: tagsMap['toys'],
             },
             {
-                tag: 'innie',
+                name: 'innie',
                 alias_for: tagsMap['innie-pussy'],
             },
             {
-                tag: 'lashing',
+                name: 'lashing',
                 alias_for: tagsMap['corporal-punishment'],
             },
             {
-                tag: 'lezdom',
+                name: 'lezdom',
                 alias_for: tagsMap['lesbian'],
             },
             {
-                tag: 'mini-skirt',
+                name: 'mini-skirt',
                 alias_for: tagsMap['miniskirt'],
             },
             {
-                tag: 'mmf',
+                name: 'mmf',
                 alias_for: tagsMap['mfm'],
             },
             {
-                tag: 'mff',
+                name: 'mff',
                 alias_for: tagsMap['fmf'],
             },
             {
-                tag: 'mature & milf',
+                name: 'mature & milf',
                 alias_for: tagsMap['milf'],
             },
             {
-                tag: 'natural',
+                name: 'natural',
                 alias_for: tagsMap['natural-boobs'],
             },
             {
-                tag: 'natural tits',
+                name: 'natural tits',
                 alias_for: tagsMap['natural-boobs'],
             },
             {
-                tag: 'oral',
+                name: 'oral',
                 alias_for: tagsMap['blowjob'],
             },
             {
-                tag: 'outie',
+                name: 'outie',
                 alias_for: tagsMap['outie-pussy'],
             },
             {
-                tag: 'piercing',
+                name: 'piercing',
                 alias_for: tagsMap['piercings'],
             },
             {
-                tag: 'pierced',
+                name: 'pierced',
                 alias_for: tagsMap['piercings'],
             },
             {
-                tag: 'prolapse',
+                name: 'prolapse',
                 alias_for: tagsMap['anal-prolapse'],
             },
             {
-                tag: 'prolapsing',
+                name: 'prolapsing',
                 alias_for: tagsMap['anal-prolapse'],
             },
             {
-                tag: 'raven',
+                name: 'raven',
                 alias_for: tagsMap['black-hair'],
             },
             {
-                tag: 'raven hair',
+                name: 'raven hair',
                 alias_for: tagsMap['black-hair'],
             },
             {
-                tag: 'redhead',
+                name: 'redhead',
                 alias_for: tagsMap['red-hair'],
             },
             {
-                tag: 'red head',
+                name: 'red head',
                 alias_for: tagsMap['red-hair'],
             },
             {
-                tag: 'rimming',
+                name: 'rimming',
                 alias_for: tagsMap['ass-licking'],
             },
             {
-                tag: 'rimjob',
+                name: 'rimjob',
                 alias_for: tagsMap['ass-licking'],
             },
             {
-                tag: 'role play',
+                name: 'role play',
                 alias_for: tagsMap['roleplay'],
             },
             {
-                tag: 'rope bondage',
+                name: 'rope bondage',
                 alias_for: tagsMap['bondage'],
             },
             {
-                tag: 'rough sex',
+                name: 'rough sex',
                 alias_for: tagsMap['rough'],
             },
             {
-                tag: 'school girl',
+                name: 'school girl',
                 alias_for: tagsMap['schoolgirl'],
             },
             {
-                tag: 'sadomasochism',
+                name: 'sadomasochism',
                 alias_for: tagsMap['bdsm'],
             },
             {
-                tag: 'sadism',
+                name: 'sadism',
                 alias_for: tagsMap['bdsm'],
             },
             {
-                tag: 'scissoring',
+                name: 'scissoring',
                 alias_for: tagsMap['lesbian'],
             },
             {
-                tag: 'sex toys',
+                name: 'sex toys',
                 alias_for: tagsMap['toys'],
             },
             {
-                tag: 'shaved pussy',
+                name: 'shaved pussy',
                 alias_for: tagsMap['shaved'],
             },
             {
-                tag: 'shoes',
+                name: 'shoes',
                 alias_for: tagsMap['shoes-on'],
             },
             {
-                tag: 'slave',
+                name: 'slave',
                 alias_for: tagsMap['bdsm'],
             },
             {
-                tag: 'small ass',
+                name: 'small ass',
                 alias_for: tagsMap['small-butt'],
             },
             {
-                tag: 'small tits',
+                name: 'small tits',
                 alias_for: tagsMap['small-boobs'],
             },
             {
-                tag: 'spit',
+                name: 'spit',
                 alias_for: tagsMap['saliva'],
             },
             {
-                tag: 'spitroast',
+                name: 'spitroast',
                 alias_for: tagsMap['mfm'],
             },
             {
-                tag: 'standing doggystyle',
+                name: 'standing doggystyle',
                 alias_for: tagsMap['standing doggy-style'],
             },
             {
-                tag: 'swallow',
+                name: 'swallow',
                 alias_for: tagsMap['swallowing'],
             },
             {
-                tag: 'strap-on',
+                name: 'strap-on',
                 alias_for: tagsMap['strap-on-dildo'],
             },
             {
-                tag: 'strap on',
+                name: 'strap on',
                 alias_for: tagsMap['strap-on-dildo'],
             },
             {
-                tag: 'strap on dildo',
+                name: 'strap on dildo',
                 alias_for: tagsMap['strap-on-dildo'],
             },
             {
-                tag: 'sub',
+                name: 'sub',
                 alias_for: tagsMap['bdsm'],
             },
             {
-                tag: 'submission',
+                name: 'submission',
                 alias_for: tagsMap['bdsm'],
             },
             {
-                tag: 'tattoos',
+                name: 'tattoos',
                 alias_for: tagsMap['tattoo'],
             },
             {
-                tag: 'teens',
+                name: 'teens',
                 alias_for: tagsMap['teen'],
             },
             {
-                tag: 'tiny boobs',
+                name: 'tiny boobs',
                 alias_for: tagsMap['small-boobs'],
             },
             {
-                tag: 'tiny tits',
+                name: 'tiny tits',
                 alias_for: tagsMap['small-boobs'],
             },
             {
-                tag: 'tittyfuck',
+                name: 'tittyfuck',
                 alias_for: tagsMap['titty-fuck'],
             },
             {
-                tag: 'trans',
+                name: 'trans',
                 alias_for: tagsMap['transsexual'],
             },
             {
-                tag: 'trimmed pussy',
+                name: 'trimmed pussy',
                 alias_for: tagsMap['trimmed'],
             },
             {
-                tag: 'tp',
+                name: 'tp',
                 alias_for: tagsMap['triple-penetration'],
             },
             {
-                tag: 'whipping',
+                name: 'whipping',
                 alias_for: tagsMap['corporal-punishment'],
             },
             {
-                tag: 'work',
+                name: 'work',
                 alias_for: tagsMap['office'],
             },
             {
-                tag: 'workplace',
+                name: 'workplace',
                 alias_for: tagsMap['office'],
             },
             {
-                tag: 'zapper',
+                name: 'zapper',
                 alias_for: tagsMap['electric-shock'],
             },
         ]).toString()} ON CONFLICT DO NOTHING`);
diff --git a/src/fetch-releases.js b/src/fetch-releases.js
index 0b8b238f..b41c04d7 100644
--- a/src/fetch-releases.js
+++ b/src/fetch-releases.js
@@ -104,8 +104,8 @@ async function storeActors(release, releaseEntry) {
 }
 
 async function storeTags(release, releaseEntry) {
-    return knex('tags_associated').insert(release.tags.map(tag => ({
-        tag_id: tag,
+    return knex('tags_associated').insert(release.tags.map(tagId => ({
+        tag_id: tagId,
         release_id: releaseEntry.id,
     })));
 }
@@ -264,6 +264,11 @@ async function fetchNewReleases(scraper, site, afterDate, accReleases = [], page
 async function fetchReleases() {
     const sites = await accumulateIncludedSites();
 
+    if (sites.length === 0) {
+        console.error('None of the specified sites are in the database');
+        return [];
+    }
+
     const scenesPerSite = await Promise.map(sites, async (site) => {
         const scraper = scrapers[site.slug] || scrapers[site.network.slug];
 
diff --git a/src/releases.js b/src/releases.js
index 21f8d6d0..ca9f6135 100644
--- a/src/releases.js
+++ b/src/releases.js
@@ -9,7 +9,7 @@ async function curateRelease(release) {
             .where({ release_id: release.id })
             .leftJoin('actors', 'actors.id', 'actors_associated.actor_id'),
         knex('tags_associated')
-            .select('tags.tag', 'tags.slug')
+            .select('tags.name', 'tags.slug')
             .where({ release_id: release.id })
             .leftJoin('tags', 'tags.id', 'tags_associated.tag_id'),
         knex('media')
diff --git a/src/tags.js b/src/tags.js
index 37630ca9..ead15b52 100644
--- a/src/tags.js
+++ b/src/tags.js
@@ -3,9 +3,22 @@
 const knex = require('./knex');
 
 async function matchTags(rawTags) {
-    const tagEntries = await knex('tags').whereIn('tags.tag', rawTags.map(tag => tag.toLowerCase()));
+    const tagEntries = await knex('tags')
+        .pluck('aliases.id')
+        .whereIn('tags.name', rawTags.map(tag => tag.toLowerCase()))
+        .where(function where() {
+            this
+                .whereNull('tags.alias_for')
+                .orWhereNull('aliases.alias_for');
+        })
+        .join('tags as aliases', function join() {
+            this
+                .on('tags.alias_for', 'aliases.id')
+                .orOn('tags.id', 'aliases.id');
+        })
+        .groupBy('aliases.id');
 
-    return Array.from(new Set(tagEntries.map((tag => tag.alias_for || tag.id)).sort())); // reduce to tag name and filter duplicates
+    return tagEntries;
 }
 
 module.exports = { matchTags };