From 50f8d1eb7fe6accbb79ef988a5123855cbf93a4d Mon Sep 17 00:00:00 2001 From: "Mr. Stallion" Date: Tue, 20 Oct 2020 18:19:43 -0500 Subject: [PATCH] Improved species matching --- CHANGELOG.md | 1 + chat/CharacterSearch.vue | 26 ++++- chat/ChatView.vue | 3 + chat/conversations.ts | 14 +++ chat/interfaces.ts | 7 +- components/FilterableSelect.vue | 1 + learn/matcher-types.ts | 176 ++++++++++++++++++-------------- 7 files changed, 146 insertions(+), 82 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2872e21..fa3f679 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.3.0 * Improved species search and matching +* Toggle ad buttons show up in channels list, if the channel has ads set up ## 1.2.0 diff --git a/chat/CharacterSearch.vue b/chat/CharacterSearch.vue index 94f8150..27c709e 100644 --- a/chat/CharacterSearch.vue +++ b/chat/CharacterSearch.vue @@ -11,7 +11,7 @@ v-model="data[item]" :placeholder="l('filter')" :title="l('characterSearch.' + item)" :options="options[item]" :key="item"> - @@ -61,7 +61,7 @@ import {EventBus} from './preview/event-bus'; import CharacterSearchHistory from './CharacterSearchHistory.vue'; import { Matcher } from '../learn/matcher'; - import { Species, speciesMapping, speciesNames } from '../learn/matcher-types'; + import { nonAnthroSpecies, Species, speciesMapping, speciesNames } from '../learn/matcher-types'; type Options = { kinks: SearchKink[], @@ -241,13 +241,21 @@ return true; } + const isSearchingForAnthro = (!!_.find(this.data.species, (s) => s.id === Species.Anthro)); + const isSearchingForHuman = (!!_.find(this.data.species, (s) => s.id === Species.Human)); + const species = Matcher.species(knownCharacter.character.character); if (!species) { - return false; + // returns TRUE if we're only searching for humans -- we suck at identifying humans + return ((isSearchingForHuman) && (this.data.species.length === 1)); } - return !!_.find(this.data.species, (s: SearchSpecies) => (s.id === species)); + return ((isSearchingForAnthro) && (_.indexOf(nonAnthroSpecies, species) < 0)) + // || ((isSearchingForMammal) && (_.indexOf(mammalSpecies, s.id) >= 0)) + || !!_.find(this.data.species, (s: SearchSpecies) => ( + (s.id === species) + )); } getSpeciesOptions(): SearchSpecies[] { @@ -255,7 +263,8 @@ speciesMapping, (keywords: string[], speciesIdStr: Species): SearchSpecies => { // const speciesId: number = Species[speciesName]; - const details = `${keywords.join(', ').substr(0, 24)}...`; + const keywordsStr = `${keywords.join(', ')}`; + const details = `${keywordsStr.substr(0, 24)}...`; const speciesId = parseInt(speciesIdStr as any, 10); if (speciesId in speciesNames) { @@ -263,6 +272,7 @@ return { details, + keywords: `${name}: ${keywordsStr}`, name: `${name} (species)`, shortName: name, id: speciesId @@ -273,6 +283,7 @@ return { details, + keywords: `${speciesName}s: ${keywordsStr}`, name: `${speciesName}s (species)`, shortName: `${speciesName}s`, id: speciesId @@ -300,6 +311,11 @@ return filter.test(kink.name); } + + filterSpecies(filter: RegExp, species: SearchSpecies): boolean { + return filter.test(species.keywords); + } + get showAvatars(): boolean { return core.state.settings.showAvatars; } diff --git a/chat/ChatView.vue b/chat/ChatView.vue index a9673f0..5034ee1 100644 --- a/chat/ChatView.vue +++ b/chat/ChatView.vue @@ -57,6 +57,9 @@ @click.middle.prevent="conversation.close()"> {{conversation.name}} + diff --git a/chat/conversations.ts b/chat/conversations.ts index c0c96ef..d46d9e8 100644 --- a/chat/conversations.ts +++ b/chat/conversations.ts @@ -145,6 +145,20 @@ abstract class Conversation implements Interfaces.Conversation { await Bluebird.delay(Conversation.POST_DELAY - lastPostDelta); } } + + isSendingAutomatedAds(): boolean { + return this.adManager.isActive(); + } + + + toggleAutomatedAds(): void { + this.adManager.isActive() ? this.adManager.stop() : this.adManager.start(); + } + + + hasAutomatedAds(): boolean { + return (this.adManager.getAds().length > 0); + } } diff --git a/chat/interfaces.ts b/chat/interfaces.ts index e852a83..241b4b4 100644 --- a/chat/interfaces.ts +++ b/chat/interfaces.ts @@ -65,6 +65,11 @@ export namespace Conversation { mode: Channel.Mode readonly nextAd: number isSendingAds: boolean + + isSendingAutomatedAds(): boolean + toggleAutomatedAds(): void + hasAutomatedAds(): boolean + sendAd(text: string): Promise } @@ -144,7 +149,7 @@ export interface Logs { } export type SearchKink = {id: number, name: string, description: string}; -export type SearchSpecies = {id: number, name: string, shortName: string, details: string}; +export type SearchSpecies = {id: number, name: string, shortName: string, details: string, keywords: string}; export interface SearchData { kinks: SearchKink[] diff --git a/components/FilterableSelect.vue b/components/FilterableSelect.vue index a522d05..9d07d8f 100644 --- a/components/FilterableSelect.vue +++ b/components/FilterableSelect.vue @@ -68,6 +68,7 @@ } get filtered(): object[] { + // tslint:disable-next-line:no-unsafe-any return this.options.filter((x) => this.filterFunc(this.filterRegex, x)); } diff --git a/learn/matcher-types.ts b/learn/matcher-types.ts index 39ce8c9..887de09 100644 --- a/learn/matcher-types.ts +++ b/learn/matcher-types.ts @@ -163,22 +163,26 @@ export enum Species { Hippopotamidae = 21212121, Hub = 22222222, Pinniped = 23232323, - Hybrid = 24242424 + Hybrid = 24242424, + Xenarthra = 25252525 } export const nonAnthroSpecies = [ - Species.Human, Species.Elf, Species.Orc, Species.Humanoid, - Species.Demon, Species.Divinity, Species.Alien, Species.Robot, - Species.Fae, Species.Vampire, Species.Monster, Species.Pokemon, + Species.Human, Species.Humanoid, Species.Demon, Species.Divinity, + Species.Elf, Species.Orc, Species.Robot, + Species.Alien, Species.Pokemon, Species.Fae, Species.Vampire, Species.Monster, Species.Hub ]; -export const mammalSpecies = [Species.Equine, Species.Feline, Species.Canine, Species.Vulpine, Species.Cervine, Species.Lapine, - Species.Musteline, Species.Procyon, Species.Rodent, Species.Ursine, Species.MarineMammal, Species.Primate, - Species.Anthro, Species.Bovine, Species.Caprinae, Species.Marsupial, Species.Hyaenidae, Species.Minotaur, - Species.Bat, Species.Mephitidae, Species.Taur, Species.Giraffe, Species.Rhinoceros, Species.Suidae, - Species.Herpestidae, Species.Were, Species.Erinaceidae, Species.Elephantidae, Species.Camielidae, Species.Hippopotamidae, - Species.Pinniped, Species.Hybrid]; +export const mammalSpecies = [ + Species.Bovine, Species.Equine, Species.Feline, Species.Canine, Species.Caprinae, + Species.Vulpine, Species.Cervine, Species.Lapine, Species.Musteline, Species.Procyon, + Species.Rodent, Species.Ursine, Species.MarineMammal, Species.Primate, + Species.Marsupial, Species.Anthro, Species.Hyaenidae, Species.Mephitidae, Species.Bat, + Species.Taur, Species.Minotaur, Species.Giraffe, Species.Rhinoceros, Species.Suidae, + Species.Herpestidae, Species.Were, Species.Erinaceidae, Species.Elephantidae, Species.Camielidae, + Species.Hippopotamidae, Species.Pinniped, Species.Hybrid, Species.Xenarthra +]; export interface SpeciesMap { [key: number]: string[]; @@ -202,76 +206,80 @@ export const likelyHuman: SpeciesMap = { [Species.Human]: ['bimbo', 'witch', 'wizard', 'gyaru', 'milf', '.*slut', 'black', 'azarathian', 'kryptonian', 'mensch', 'thot', 'sister', 'brother', 'mother', 'father', 'fuckpig', 'hero', 'she-stud', 'college', 'cutie', 'bimboi', 'homo', 'streamer', '.*human', 'femboy', 'nord', 'norse', 'norseman', 'man', 'whitebo[yi]', '.*bo[yi].*', '.*girl.*', - 'french', 'whore', 'slutty', 'adult', 'otaku', 'cumdump', 'thug', 'magus', - 'sapien[s]?', - 'paladin', 'knight', + 'french', 'whore', 'slutty', 'adult', 'otaku', 'cumdump', 'thug', 'magus', 'goth', 'servant', '.*caucasian', 'cosplayer', + 'sapien[s]?', 'american', 'korean', 'chinese', 'english', 'british', 'irish', 'brat', 'guy', + 'paladin', 'knight', 'psychic', 'male', 'female', 'shemale', - 'aasimar', 'astartes', 'saiyan', 'echani', 'cathar', 'shikaisen', 'cosplayer' + 'aasimar', 'astartes', 'saiyan', 'echani', 'cathar', 'shikaisen', 'hyur', 'mid[ -]?lander', 'high[ -]?lander', 'arkanian', + 'exalted', 'leftherian' ] }; -// armadillo -// anteater // red panda / akai pandamimi // echidna export const speciesMapping: SpeciesMap = { - [Species.Anthro]: ['anthro', 'anthropomorphic', 'kemono', 'kemomimi', 'kemonomimi', 'furry'], - [Species.Human]: ['human.*', 'homo[ -]?sapien', '๐–ง๐—Ž๐—†๐–บ๐—‡', 'woman', 'dothraki', 'amazon', 'african[ -]?american', - 'homo[ -]?sapian', 'hooman', 'hoomin', 'hooomin', 'humaine?', 'amazonian', 'latina', 'latino', + [Species.Anthro]: ['anthro', 'anthropomorphic', 'kemono', 'kemomimi', 'kemonomimi', 'furry', 'erune', 'vastaya[n]?', 'rakshasa'], + [Species.Human]: ['human', 'homo sapiens', 'human.*', 'homo[ -]?sapiens?', '๐–ง๐—Ž๐—†๐–บ๐—‡', 'woman', 'dothraki', 'amazon', 'african[ -]?american', + 'homo[ -]?sapians?', 'h[o]+man', 'h[o]+min', 'humaine?', 'amazonian', 'latina', 'latino', + '๐ป๐“Š๐“‚๐’ถ๐“ƒ', '๐‘ฏ๐’–๐’Ž๐’‚๐’.?', '๐•™๐•ฆ๐•ž๐•’๐•Ÿ', '๐‡๐”๐Œ๐€๐', '๐™ท๐šž๐š–๐šŠ๐š—', 'nephilim', 'angel', 'nephalem', 'archangel' ], - [Species.Elf]: ['drow', 'draenei', 'dunmer', 'blutelf', 'draenai', 'elf.*', 'drow.*', 'e l f', 'e-l-f', 'sin\'?dorei', 'kal\'?dorei', - 'elves', 'แด‡สŸา“', 'elven', 'elfe', 'nachtelfe?', 'elvish', 'ren\'?dorei', 'quel\'?dorei', 'hal[bf][ -]elf', '.*elf', 'waldelfe', - 'shal\'?dorei', 'san\'?layn' + [Species.Elf]: ['drow', 'draenei', 'dunmer', 'blutelf[e]?', 'draenai', 'elf.*', 'drow.*', 'e l f', 'e-l-f', 'sin\'?dorei', + 'kal\'?dorei', 'elves', 'แด‡สŸา“', 'elven', 'elfe', 'nachtelfe?', 'elvish', 'ren\'?dorei', 'quel\'?dorei', 'hal[bf][ -]elf', + '.*elf', 'waldelfe', 'shal\'?dorei', 'san\'?layn', 's[yi]lvan' ], [Species.Canine]: ['dog', 'dingo', 'coyote', 'jackal', 'husky', 'canine', 'wolf.*', 'doberman[n]?', 'hound', 'akita', 'pit ?bull', 'terrier', 'bull[ -]?terrier', 'australian[ -]?shepherd', 'australian[ -]?shep[h]?ard', 'german[ -]?shep[h]?erd', - 'german[ -]?shep[h]?ard', 'malinois', 'woof', 'labrador', 'collie', 'canis', 'canid', 'chihuahua', 'poodle', 'chinchilla', - 'chow[ -]?chow', 'corgi', 'anubis', 'beagle', 'german[ -]?shep', '.*wolf', 'direwolf', 'pointer', + 'german[ -]?shep[h]?ard', 'malinois', 'woof', 'labrador', 'collie', 'canis', 'lupus', 'canid', 'chihuahua', 'poodle', 'chinchilla', + 'chow[ -]?chow', 'corgi', 'anubis', 'beagle', 'german[ -]?shep', '.*wolf', 'direwolf', 'pointer', 'dhole', 'anubian', 'dalmatian', 'dalmation', 'inumimi', 'lupine', 'malamute', 'mastiff', 'mutt', 'rottweill?er', 'shih[ -]?tzu', 'worgen', 'vallhund', 'puppy', 'okami', 'great[ -]?dane', 'golden[ -]?(retriever|lab|labrador)', 'cocker[ -]?spaniel', 'samoyed', 'awoo', - 'borzoi', 'spaniel', 'ookamimimi', 'jakkarumimi', 'chinchiramimi', 'woffo', 'wuff', 'wolfdog', 'setter', + 'borzoi', 'spaniel', 'ookamimimi', 'jakkarumimi', 'chinchiramimi', 'woffo', 'wuff', 'wolfdog', 'setter', 'papillon', '๐Ÿถ', '๐Ÿบ', '๐Ÿ•', '๐Ÿฉ', 'aussie[ -]?doodle', 'shiba', 'inu', 'veil[ -]?hound', 'timber[ -]?wolf', 'hell[ -]?hound', 'hound', + 'kangal', 'behemoth', 'wolfess', 'latrans', 'dog[ -]?(girl|bo[yi][e]?)', 'wolf[ -]?(girl|bo[yi][e]?)', 'doggie', 'doggy', 'canis', 'fenrir', 'v[aรก]na[r]?gand[r]?', - 'doggo', 'barghest', 'barguest', 'crux', 'แดกแดสŸา“', '๐—ช๐—ผ๐—น๐—ณ', '๐™ณ๐š˜๐š', 'dire[ -]?hound'], + 'doggo', 'barghest', 'barguest', 'crux', 'แดกแดสŸา“', '๐—ช๐—ผ๐—น๐—ณ.?', '๐™ณ๐š˜๐š', 'dire[ -]?hound'], [Species.Equine]: ['horse', 'zebra', 'pony', 'donkey', 'stallion', 'mare', 'filly', 'equine', 'shire', 'mule', 'zeeb', 'pon[yi][ -]?bo[yi]', 'unicorn', 'clydesdale', 'shire', 'appaloosa', 'friesian', 'draft', 'draught', 'alicorn', 'horsie', 'hoss', 'pegasus', 'colt', 'filly', 'neigh', 'dullahan', 'tikbalang', 'gypsy[ -]?vanner', 'ardenne[r]?', 'ardennais[e]?', 'pony[ -]?(girl|bo[yi][e]?)', 'cream[ -]?draft', 'belgian[ -]?draft', 'saddle[ -]?bred', 'warm[ -]?blood', 'marsh tacky', 'fox[ -]?trotter', 'morab', - 'saddle[ -]?horse', 'walkaloosa', 'welara', 'tiger[ -]?horse', 'horsekin', 'pone', + 'saddle[ -]?horse', 'walkaloosa', 'welara', 'tiger[ -]?horse', 'horsekin', 'pone', 'tinker[ -]?hengste?', 'horse[ -]?(girl|bo[yi][e]?)', 'umamimi', 'shimaumamimi', 'thestral', 'pegusus', - 'mustang', 'horse.*', '.*horse', 'equus', 'kelpie', 'kuranta', 'zonkey', + 'mustang', 'horse.*', '.*horse', '.*pony', 'equus', 'kelpie', 'kuranta', 'zonkey', '๐Ÿด', '๐Ÿฆ“', '๐ŸŽ'], - [Species.Feline]: ['cat', 'tiger.*', 'puma', 'lion.*', 'kitten', 'cat[ -]?(girl|bo[yi][e]?)', 'neko', 'neko[ -]?mimi', 'lioness', 'panther', - 'panthress', 'tigress', 'feline', 'jaguar', 'cheetah', 'lynx', 'leopard', 'cougar', 'kitty', 'migo\'?te', 'miqo\'?te', 'ocelot', - 'saber[ -]?tooth', 'tabby', 'serval', 'russian[ -]?blue', 'thunderian', 'meow', 'lombax', 'domestic[ -]?shorthair', - 'british[ -]?shorthair', 'oriental[ -]?shorthair', 'american[ -]?shorthair', 'burmese', 'maine[ -]?coon', 'korat', 'ragdoll', - 'ocicat', 'chartreux', 'german[ -]?rex', 'turkish[ -]?van', 'ragamuffin', 'norwegian[ -]?forest[ -]?(cat)?', - 'exotic[ -]?shorthair', 'khajiit', 'catamount', 'cat[ -]?person', 'tetton', 'tigre', 'calico', 'caracal', 'tabaxi', 'housecat', - 'kodkod', 'karotanta', 'siamese', 'felis', 'catus', 'nekomata', 'nekomimi', 'trianii', 'caitian', 'catto', '.*cat', 'toramimi', - 'shishimimi', 'pansamimi', 'hyoumimi', 'mytharii', 'felinid', 'kitteh', 'cat[ -]folk', 'chat', 'lionkin', 'tigerkin', - 'liger', 'tigon', + [Species.Feline]: ['cat', 'jaguar', 'cheetah', 'lynx', 'tiger.*', 'puma', 'lion.*', 'kitten', 'cat[ -]?(girl|bo[yi][e]?)', 'neko', + 'neko[ -]?mimi', 'lioness', 'panther', 'panthress', 'tigress', 'feline', 'leopard', 'cougar', 'kitty', 'migo\'?te', + 'miqo\'?te', 'ocelot', 'saber[ -]?tooth', 'tabby', 'serval', 'russian[ -]?blue', 'thunderian', 'meow', 'lombax', + '(exotic|domestic|british|oriental|american|shaded|chinchilla)[ -]?shorthair', 'burmese', 'maine[ -]?coon', 'korat', 'ragdoll', + 'ocicat', 'chartreux', 'german[ -]?rex', 'turkish[ -]?van', 'ragamuffin', 'norwegian[ -]?forest[ -]?(cat)?', 'burmilla', + 'khajiit', 'catamount', 'cat[ -]?person', 'tetton', 'tigre', 'calico', 'caracal', 'tabaxi', 'housecat', + 'kodkod', 'karotanta', 'siamese', 'felis', 'catus', 'nekomata', 'nekomimi', 'trianii', 'caitian', 'catt[o|e]', '.*cat', 'toramimi', + 'shishimimi', 'pansamimi', 'hyoumimi', 'mytharii', 'felinid', 'kitteh', 'cat[ -]folk', 'chat(te)?', 'lionkin', 'tigerkin', + 'nyah', 'charr', 'kater', 'kat', 'jinko', 'katze?', + 'liger', 'tigon', 'sab(re|er)[ -]?tooth', '๐Ÿ…', '๐Ÿ†', '๐Ÿฏ', '๐Ÿฆ', '๐Ÿˆ'], [Species.Vulpine]: ['fox', 'fennec', 'vixen', 'vulpine', 'fox.*', 'fennec', 'kitsune.*', 'kistune', 'gumiho', 'kumiho', 'nogitsune', 'yako', '๐ŸฆŠ', 'fox[ -]?(girl|bo[yi][e]?)', 'vulpes', 'silver[ -]?fox', 'arctic[ -]?fox', 'fennec[ -]?fox', 'red[ -]?fox', 'cape[ -]?fox', 'ninetails', 'ninetales', 'vulpo', 'vulpera', 'kitsunemimi', 'foxkin', 'fire[ -]?fox'], - [Species.Dragon]: ['dragon.*', 'drake', 'wyvern', 'felkin', 'night[ -]?fury', 'draconian', 'dragonn?ess', 'draconic', 'dragovian', - '๐Ÿ‰', 'sea[ -]?dragon', 'doragonmimi', 'doragon', 'half[ -]dragon', 'dragonkin' + [Species.Dragon]: ['dragon', '๐Ÿ‰', 'wyvern', 'felkin', 'dragon.*', '.*drake', '.*wyvern', '.*felkin', + 'night[ -]?fury', 'draconian', 'dragonn?ess', 'draconic', 'dragovian', + 'sea[ -]?dragon', 'doragonmimi', 'doragon', 'half[ -]dragon', 'dragonkin', 'wyverian', 'glavenus', + 'anjanath', 'ragon' ], [Species.Reptile]: ['lizard', 'snake', 'crocodile', 'alligator', 'chameleon', 'anole', 'aligator', 'snake.*', 'lizard', 'gator', 'gecko', 'reptile', 'reptilian', 'scaly', 'scale[ -]?born', 'argonian', 'saxhleel', 'skink', 'cobra', 'turtle', 'tortoise', - 'nope[ -]rope', 'anaconda', 'python', 'lizardkin', 'lizard[ -]?folk', 'yuan[ -]?ti', - '๐Ÿ'], + 'nope[ -]rope', 'anaconda', 'python', 'lizardkin', 'lizard[ -]?folk', 'yuan[ -]?ti', 'crocodilian', 'serp[ea]a?nt(ine)?', + 'ludroth', 'zvarr', '๐Ÿ'], [Species.Pokemon]: ['charizard', 'charmander', 'pikachu', 'digimon', 'renamon', 'eevee', 'gardev(oi|io)r', 'absol', 'aggron', 'jolteon', 'lopunny', 'raichu', 'scyther', 'blaziken', 'lucario', 'gengar', 'mudsdale', 'mewtwo', 'glaceon', 'pokemon', @@ -280,63 +288,74 @@ export const speciesMapping: SpeciesMap = { 'gothitelle', 'kecleon', 'quagsire', 'garchomp', 'mismagius', 'zigzagoon', 'sceptile', 'joltik', 'cinderace', 'hypnomade', 'furfrou', 'flareon', 'zeraora', 'mudkip', 'nidoking', 'zorua', 'salamence', 'lycanrock?', 'dewott', 'delcatty', 'braixen', 'zacian', 'fennekin', 'kirlia', 'cinccino', 'growlithe', 'shaymin', 'salazzle', - 'vaporeon', 'reshiram', 'quilava', 'decidueye', 'marshadow', 'weavile', + 'vaporeon', 'reshiram', 'quilava', 'decidueye', 'marshadow', 'weavile', 'zubat', 'buizel', 'latias', 'nidorina', + 'chandelur(e|ia)', 'sneasel', 'rockruff', 'lugia', 'komala', 'meowstic', 'leafeon', 'purrloin', 'pokemorph', + 'houndour', 'zoroark', 'mightyena', 'mew', 'nidoqueen', // digimon - 'gatomon' + 'gatomon', 'impmon', 'guilmon' ], [Species.Amphibian]: ['salamander', 'frog', 'toad', 'newt', 'amphibian', 'axolotl'], - [Species.Avian]: ['bird', 'gryphon', 'raven', 'cardinal', 'griffon', 'phoenix', 'roc', 'chimera', 'avian', 'albatross', 'cockatiel', + [Species.Avian]: ['bird', 'gryphon', 'raven', 'cardinal', 'cockatiel', 'ph(oe|eo)nix', 'roc', 'chimera', 'avian', 'albatross', 'dove', 'eagle', 'owl', 'penguin', 'cockatoo', 'shoebill', 'rito', 'crow', 'meadow[ -]?lark', 'torimimi', - 'peacock', 'chocobo', 'emu', 'ostrich', 'flamingo', 'duck', 'swallow', 'nightingale', 'toucan', + 'peacock', 'chocobo', 'emu', 'ostrich', 'flamingo', 'duck', 'swallow', 'nightingale', 'toucan', 'secretary[ -?]bird', + '(pink|blue)[ -]?jay', 'jaybird', 'chicken', 'rooster', 'blauhรคher', 'gryphon', 'gr[iy]ff[io]n', + 'parrot', 'avarr?ian', + 'maran', '๐Ÿฆš', '๐Ÿฆƒ', '๐Ÿฆข', '๐Ÿฆ†', '๐Ÿฆ…', '๐Ÿฆ‰', '๐Ÿฆœ', '๐Ÿฆฉ'], [Species.Bat]: ['bat', 'nimbat', 'foxbat', 'pteropus', 'komorimimi', '๐Ÿฆ‡'], [Species.Bovine]: ['cow', 'bison', 'bovine', 'antelope', 'gazelle', 'oryx', 'buffalo', 'bison', 'black[ -]?angus', 'bull', 'ox', 'ushimimi', 'holstaur', 'moo', 'แดแดแด', 'cattle', 'hucow', 'caprin[a]?e', 'goat-antelope', 'muskox', 'urial', 'mouflon', - '๐Ÿƒ', '๐Ÿ‚', '๐Ÿ„'], + 'taurine', 'aurochs', 'bos', 'bos taurus', 'taurus', + '๐Ÿƒ', '๐Ÿ‚', '๐Ÿ„', '๐Ÿ'], [Species.Caprinae]: ['sheep', 'goat', 'ibex', 'takin', 'bharal', 'goral', 'serow', 'lamb', 'faun', 'ram', 'faunus', 'goat.*', - 'yagimimi', 'hitsujimimi'], + 'yagimimi', 'hitsujimimi', 'sheepie'], [Species.Camielidae]: ['camel', 'llama', 'alpaca', 'guanaco', 'dromedary', 'dromedar', '๐Ÿฆ™', '๐Ÿช', '๐Ÿซ'], [Species.Cervine]: ['deer', 'elk', 'moose', 'caribou', 'reindeer', 'doe', 'cervid', 'cervine', 'stag', 'shikamimi'], - [Species.Dinosaur]: ['raptor', 't-rex', 'death[ -]?claw', 'pterodactyl', '[\\w-]*saurus', 'dinosaur', 'trex', 'tyrannosaurus', - 'saurian', '[\\w-]*raptor', 'deinonychus', 'dino', + [Species.Dinosaur]: ['raptor', 't-rex', 'pterodactyl', 'deinonychus', 'death[ -]?claw', '[\\w-]*saurus', 'dinosaur', + 'trex', 'tyrannosaurus', 'saurian', '[\\w-]*raptor', 'dino', '๐Ÿฆ–', '๐Ÿฆ•'], [Species.Erinaceidae]: ['hedgehog', 'gymnure', 'moonrat'], [Species.Elephantidae]: ['elephant', 'mammoth', 'mastodon', 'pachyderm', 'tusker'], [Species.Fish]: ['shark', 'great white', 'sergal', 'fish', 'aquatic', 'melanopterus', 'carcharhinus', '.*fish', '.*shark'], - [Species.Giraffe]: ['giraffe', '๐Ÿฆ’', 'kirinmimi'], + [Species.Giraffe]: ['giraffe', '๐Ÿฆ’', 'kirinmimi', 'okapi', '[gk]ira(ff|hv)[ei]?'], + [Species.Herpestidae]: ['mongoose', 'meerkat', 'kusimanse', 'suricate'], [Species.Hippopotamidae]: ['hippo', 'hippopotamus', '๐Ÿฆ›'], [Species.Hyaenidae]: ['hyena', 'aardwolf', 'hyaena', 'yeen'], - [Species.Hybrid]: ['hybrid', 'cabbit', 'fabbit', 'laquine', 'folf', 'myox', 'wolger', 'silkie', 'yumar', - 'foxcoon', 'drazelle', 'vulpkanin', 'poochyena', 'batpon', 'delphox'], + [Species.Hybrid]: ['hybrid', 'cabbit', 'fabbit', 'laquine', 'folf', 'tolf', 'myox', 'wolger', 'silkie', 'yumar', + 'foxcoon', 'drazelle', 'vulpkanin', 'poochyena', 'batpon', 'delphox', 'unifox', 'rooram', 'catbat', 'bunfox'], [Species.Insect]: ['bug', 'bee', 'wasp', 'ant', 'spider', 'arachnid', 'scorpion', 'insect', 'buggo', 'hornet', 'vespidae', - 'mantis', 'beefolk', 'ladybug', 'hachimimi', 'moth', 'bumblebee'], + 'mantis', 'beefolk', 'ladybug', 'hachimimi', 'moth', 'bumblebee', 'tolype'], - [Species.Lapine]: ['bunny', 'rabbit', 'hare', 'lapine', 'viera', 'wabbit', 'lagomorph', 'bunny[ -]?(girl|bo[yi][e])', 'usagimimi', - 'bun', '.*bunny', 'cabbit', 'fabbit', 'hรคschen', 'bunbun', 'cottontail', 'jack[ -]?rabbit', 'lapine?', 'jackalope', '๐Ÿ‡'], + [Species.Lapine]: ['bunny', 'rabbit', 'hare', 'lapine', 'viera', 'wabbit', 'lagomo(rp|pr)h', 'bunny[ -]?(girl|bo[yi][e])', 'usagimimi', + 'bun', '.*bunny', 'cabbit', 'fabbit', 'hรคschen', 'bunbun', 'cottontail', 'rabbet', 'jack[ -]?rabbit', 'lapine?', 'jackalope', + 'leporids?', 'leporidae', 'broodal', 'ส€แด€ส™ส™ษชแด›', 'สŸแด€แด˜ษชษดแด‡', '๐Ÿ‡'], + + [Species.MarineMammal]: ['whale', 'dolphin', 'orca', '๐Ÿฌ', 'killer[ -]?whale'], - [Species.MarineMammal]: ['whale', 'killer[ -]?whale', 'dolphin', 'orca', '๐Ÿฌ'], [Species.Marsupial]: ['kangaroo', 'opossum', 'koala', 'wombat', 'possum', 'roo', 'bandicoot', 'bilby', 'numbat', 'wallaby', 'thylacine', 'marsupial[ -]?wolf', 'tasmanian[ -]?tiger', 'quokka', 'glider', 'cuscus', 'marsupial', 'tasmanian[ -]?devil', 'musky[ -]?rat', 'bettong', 'Kรคnguru', '๐Ÿฆ˜', '๐Ÿจ'], - [Species.Mephitidae]: ['skunk', 'stink[ -]?badger', '๐Ÿฆจ'], - [Species.Herpestidae]: ['mongoose', 'meerkat', 'kusimanse', 'suricate'], + + [Species.Mephitidae]: ['skunk', '๐Ÿฆจ', 'stink[ -]?badger'], [Species.Musteline]: ['otter', 'ferret', 'mink', 'weasel', 'stoat', 'wolverine', 'marten', 'musteline', 'badger', 'otterkin', - 'kawausomimi', 'itachimimi', 'ferettomimi', '๐Ÿฆก', '๐Ÿฆฆ'], + 'kawausomimi', 'itachimimi', 'ferettomimi', 'ottsel', '๐Ÿฆก', '๐Ÿฆฆ'], [Species.Pinniped]: ['seal', 'walrus', 'fur seal', 'sea[ -]?lion'], - [Species.Primate]: ['gorilla', 'monkey', 'ape', 'chimp', 'lemur', 'bonobo', 'chimpanzee', 'silverback', 'sarumimi', '๐Ÿ’', '๐Ÿฆ', '๐Ÿฆง'], + + [Species.Primate]: ['gorilla', 'monkey', 'ape', 'chimp', 'lemur', 'bonobo', 'chimpanzee', 'silverback', 'sarumimi', 'primate', + '๐Ÿ’', '๐Ÿฆ', '๐Ÿฆง'], [Species.Procyon]: ['raccoon', 'coatimund', 'longtail', 'procyon', 'tanuki', 'tanukimimi', '๐Ÿฆ', 'racoon', 'rakunmimi', 'ring[ -]?tail(ed)?'], @@ -344,7 +363,8 @@ export const speciesMapping: SpeciesMap = { [Species.Rhinoceros]: ['rhino', 'rhinoceros', '๐Ÿฆ', '.*rhino'], [Species.Rodent]: ['rat', 'mouse', 'chipmunk', 'squirrel', 'hamster', 'rodent', 'maus', 'gerbil', 'mousie', 'muskrat', 'ratsin', - 'skaven', 'roedor', 'risumimi', 'nezumimi', 'jerboa', 'burmecian', '๐Ÿ€', '๐Ÿ', '๐Ÿฟ'], + 'skaven', 'roedor', 'risumimi', 'nezumimi', 'jerboa', 'burmecian', 'rat[ -]?(boy|girl|folk)', 'mouse[ -]?(boy|girl|folk)', + '๐Ÿ€', '๐Ÿ', '๐Ÿฟ'], [Species.Suidae]: ['pig', 'boar', 'warthog', 'bushpig', 'babirusa', 'sow', 'swine', 'suid', 'suine', 'piglet', 'hog', 'piggie', 'piggy', 'quilboar', 'porcine', 'porcid', 'butamimi', '๐Ÿ—', '๐Ÿ–'], @@ -352,35 +372,39 @@ export const speciesMapping: SpeciesMap = { [Species.Ursine]: ['bear', 'panda', 'grizzly', 'black[ -]?bear', 'brown[ -]?bear', 'polar[ -]?bear', 'ursine', 'pandaren', 'ursus', 'pandamimi', 'kumamimi'], - [Species.Demon]: ['demon', 'devil', 'succubus', 'incubus', 'daemon', 'deamon', 'demoness', 'demonkin', 'baphomet', 'eredar', - 'tengu', 'devilkin', 'd[a]?emonette', 'cambion', 'amanojaku', 'tanar[\']?ri', 'balor', 'marilith', 'lilith'], + [Species.Xenarthra]: ['armadillo', 'anteater', 'sloth', 'glyptodont', 'a(rm|mr)ad[iy]ll?o', 'sloth', 'ant[ -]?eater'], - [Species.Divinity]: ['god', 'goddess', 'demi[ -]?god', 'demi[ -]?goddess'], + [Species.Demon]: ['demon', 'devil', 'succubus', 'incubus', 'daemon', 'deamon', 'demoness', 'demonkin', 'baphomet', 'eredar', + 'tengu', 'devilkin', 'd[a]?emonette', 'cambion', 'amanojaku', 'tanar[\']?ri', 'balor', 'marilith', 'lilith', '.*demon', + 'd[รคa]mon[ie]n.*', 'ifrit', 'efree?t', 'afa?rit', 'demonic'], + + [Species.Divinity]: ['god', 'goddess', 'divinity', 'demi[ -]?god', 'demi[ -]?goddess'], [Species.Fae]: ['fairy', 'fae', 'imp', 'elemental', 'fey', 'pixie', 'nymph', 'faerie'], - [Species.Humanoid]: ['satyr', 'gnome', 'dwarf', 'halfling', 't[h]?(ie|ei)fling', 'dwarves', 'humanoid', 'yordle', 'hylian', 'lalafell', - 'zwerg'], + [Species.Humanoid]: ['satyr', 'gnome', 'dwarf', 'halfling', 'havlin', 't[h]?(ie|ei)fling', 'dwarves', 'humanoid', 'yordle', 'hylian', 'lalafell', + 'zwerg', 'draph', 'dryad'], - [Species.Minotaur]: ['minotaur', 'tauren'], + [Species.Minotaur]: ['minotaur', 'tauren', 'minotaurus', 'm[iy]n[ao]t(uo|ou|o|u)ru?s?'], [Species.Monster]: ['gnoll', 'goblin', 'kobold', 'monster', 'troll', 'illithid', 'golem', 'basilisk', 'oni', 'kaiju', 'mimic', 'hippogriff', 'hippogryph', 'manticore', 'harpy', 'gargoyle', 'ghost', 'eldritch', 'tentacle', 'youkai', 'ogre', 'skeleton', - 'ghoul', 'vrykolakas', 'godzilla', 'bugbear', 'gnobold', 'undead', 'lich', - 'gryphon', 'griffin', 'y[oล]kai', 'shinigami', 'bunyip'], + 'ghoul', 'vrykolakas', 'godzilla', 'bugbear', 'gnobold', 'undead', 'lich', 'siren', 'mermaid', 'slime', 'goo', + 'y[oล]kai', 'shinigami', 'bunyip', 'giant', 'giantess', 'bokoblin', 'kirin', 'qilin'], [Species.Naga]: ['naga', 'lamia'], - [Species.Taur]: ['centaur', 'chakat', 'equitaur', 'felitaur', 'weretaur', 'humantaur', 'taur'], - [Species.Orc]: ['orc', 'uruk-hai', 'snaga', 'uruk[ -]?hai', 'ork'], - [Species.Vampire]: ['vampire', 'd[h]?amp[h]?ir', 'daywalker', 'vampyre', 'vampiric', 'vampir', 'nosferatu'], + [Species.Taur]: ['centaur', 'chakat', 'equitaur', 'felitaur', 'weretaur', 'humantaur', 'cowtaur', '.*taur', 'cervitaur'], + [Species.Orc]: ['orc', 'uruk-hai', 'snaga', 'uruk[ -]?hai', 'ork', 'orcess'], + [Species.Vampire]: ['vampire', 'nosferatu', 'daywalker', 'd[h]?amp[h]?ir', 'vampyre', 'vampiric', 'vampir'], [Species.Were]: ['werewolf', 'lycan', 'werelion', 'weretiger', 'werebear', 'werecoyote', 'werehog', 'were[ -]?wolf', 'were[ -]?lion', - 'were[ -]?bear', 'were[ -]?coyote', 'were[ -]?hog', 'lycant[h]?rop[h]?e', 'loup[ -]?garou[sx]?', - 'were[ -]?squirrel', 'were[ -]?donkey'], + 'were[ -]?bear', 'were[ -]?coyote', 'were[ -]?hog', 'lycant[h]?rop[h]?[ey]?', 'loup[ -]?garou[sx]?', + 'were[ -]?squirrel', 'were[ -]?donkey', 'were[ -]?rat'], [Species.Alien]: ['krogan', 'xenomorph', 'quarian', 'turian', 'asari', 'togruta', 'otolla', 'gungan', 'chiss', 'alien', 'puazi', - 'hutt', 'klyntar', 'twi\'?lek', 'sangheili', 'salarian', 't[\']?vaoan'], + 'hutt', 'klyntar', 'twi\'?lek', 'sangheili', 'salarian', 't[\']?vaoan', 'yautja'], - [Species.Robot]: ['android', 'cyborg', 'gynoid', 'automaton', 'robot', 'transformer', 'cybertronian', 'reploid', 'synth', 'ai'], + [Species.Robot]: ['android', 'cyborg', 'gynoid', 'automaton', 'robot', 'transformer', 'cybertronian', 'reploid', 'synth', 'ai', + 'realian', 'replicant'], [Species.Hub]: ['hub', 'varies', 'various', 'variable', 'many', 'flexible', 'any', 'partner preference'] };