Merge branch 'master' into moveSnippetImages

2026-03-22 11:08:10 +00:00 · 2026-02-22 10:36:16 -06:00
parent 371ba0a93f 8edf517b7a
commit 3d11ed92d4
13 changed files with 2956 additions and 618 deletions
--- a/client/components/combobox.jsx
+++ b/client/components/combobox.jsx
@@ -16,6 +16,7 @@ const Combobox = createReactClass({
 				suggestMethod           : 'includes',
 				filterOn                : []  // should allow as array to filter on multiple attributes, or even custom filter
 			},
+			valuePatterns: /.+/
 		};
 	},
 	getInitialState : function() {
@@ -74,6 +75,7 @@ const Combobox = createReactClass({
 					type='text'
 					onChange={(e)=>this.handleInput(e)}
 					value={this.state.value || ''}
+					pattern={this.props.valuePatterns}
 					placeholder={this.props.placeholder}
 					onBlur={(e)=>{
 						if(!e.target.checkValidity()){
@@ -82,6 +84,12 @@ const Combobox = createReactClass({
 							});
 						}
 					}}
+					onKeyDown={(e)=>{
+						if (e.key === "Enter") {
+							e.preventDefault();
+							this.props.onEntry(e);
+						}
+					}}
 				/>
 				<i className='fas fa-caret-down'/>
 			</div>
--- a/client/homebrew/brewRenderer/brewRenderer.less
+++ b/client/homebrew/brewRenderer/brewRenderer.less
@@ -59,6 +59,12 @@
 		}
 		&-corner { visibility : hidden; }
 	}
+
+	@supports (break-after:always) {
+		.columnSplit {
+			margin-bottom: 100vh;
+		}
+	}
 }

 .pane { position : relative; }
@@ -81,4 +87,5 @@
 		}
 	}
 	.headerNav { visibility : hidden; }
+
 }
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -10,8 +10,6 @@ import TagInput from '../tagInput/tagInput.jsx';
 import Themes from 'themes/themes.json';
 import validations from './validations.js';

-const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder'];
-
 import homebreweryThumbnail from '../../thumbnail.png';

 const callIfExists = (val, fn, ...args)=>{
@@ -33,7 +31,6 @@ const MetadataEditor = createReactClass({
 				tags        : [],
 				published   : false,
 				authors     : [],
-				systems     : [],
 				renderer    : 'legacy',
 				theme       : '5ePHB',
 				lang        : 'en'
@@ -91,15 +88,6 @@ const MetadataEditor = createReactClass({
 		}
 	},

-	handleSystem : function(system, e){
-		if(e.target.checked){
-			this.props.metadata.systems.push(system);
-		} else {
-			this.props.metadata.systems = _.without(this.props.metadata.systems, system);
-		}
-		this.props.onChange(this.props.metadata);
-	},
-
 	handleRenderer : function(renderer, e){
 		if(e.target.checked){
 			this.props.metadata.renderer = renderer;
@@ -155,18 +143,6 @@ const MetadataEditor = createReactClass({
 			});
 	},

-	renderSystems : function(){
-		return _.map(SYSTEMS, (val)=>{
-			return <label key={val}>
-				<input
-					type='checkbox'
-					checked={_.includes(this.props.metadata.systems, val)}
-					onChange={(e)=>this.handleSystem(val, e)} />
-				{val}
-			</label>;
-		});
-	},
-
 	renderPublish : function(){
 		if(this.props.metadata.published){
 			return <button className='unpublish' onClick={()=>this.handlePublish(false)}>
@@ -304,7 +280,7 @@ const MetadataEditor = createReactClass({
 	},

 	renderRenderOptions : function(){
-		return <div className='field systems'>
+		return <div className='field renderers'>
 			<label>Renderer</label>
 			<div className='value'>
 				<label key='legacy'>
@@ -363,19 +339,15 @@ const MetadataEditor = createReactClass({
 				{this.renderThumbnail()}
 			</div>

-			<TagInput label='tags' valuePatterns={[/^(?:(?:group|meta|system|type):)?[A-Za-z0-9][A-Za-z0-9 \/.\-]{0,40}$/]}
+			<TagInput
+				label='tags'
+				valuePatterns={/^\s*(?:(?:group|meta|system|type)\s*:\s*)?[A-Za-z0-9][A-Za-z0-9 \/\\.&_\-]{0,40}\s*$/}
 				placeholder='add tag' unique={true}
 				values={this.props.metadata.tags}
+				smallText='You may start tags with "type", "system", "group" or "meta" followed by a colon ":", these will be colored in your userpage.'
 				onChange={(e)=>this.handleFieldChange('tags', e)}
 			/>

-			<div className='field systems'>
-				<label>systems</label>
-				<div className='value'>
-					{this.renderSystems()}
-				</div>
-			</div>
-
 			{this.renderLanguageDropdown()}

 			{this.renderThemeDropdown()}
@@ -386,11 +358,13 @@ const MetadataEditor = createReactClass({

 			{this.renderAuthors()}

-			<TagInput label='invited authors' valuePatterns={[/.+/]}
+			<TagInput
+				label='invited authors'
+				valuePatterns={/.+/}
 				validators={[(v)=>!this.props.metadata.authors?.includes(v)]}
 				placeholder='invite author' unique={true}
 				values={this.props.metadata.invitedAuthors}
-				notes={['Invited author usernames are case sensitive.', 'After adding an invited author, send them the edit link. There, they can choose to accept or decline the invitation.']}
+				smallText='Invited author usernames are case sensitive. After adding an invited author, send them the edit link. There, they can choose to accept or decline the invitation.'
 				onChange={(e)=>this.handleFieldChange('invitedAuthors', e)}
 			/>

--- a/client/homebrew/editor/metadataEditor/metadataEditor.less
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.less
@@ -114,6 +114,11 @@
 			z-index   : 200;
 			max-width : 150px;
 		}
+
+		&.tags .tagInput-dropdown {
+			z-index   : 201;
+			max-width : 200px;
+		}
 	}


@@ -129,7 +134,7 @@
 		background-color : #AAAAAA;
 	}

-	.systems.field .value {
+	.renderers.field .value {
 		label {
 			display        : inline-flex;
 			align-items    : center;
--- a/client/homebrew/editor/tagInput/curatedTagSuggestionList.js
+++ b/client/homebrew/editor/tagInput/curatedTagSuggestionList.js
@@ -0,0 +1,210 @@
+export default [
+	// ############################## Systems
+	// D&D
+	"system:D&D Original",
+	"system:D&D Basic",
+	"system:AD&D 1e",
+	"system:AD&D 2e",
+	"system:D&D 3e",
+	"system:D&D 3.5e",
+	"system:D&D 4e",
+	"system:D&D 5e",
+	"system:D&D 5e 2024",
+	"system:BD&D (B/X)",
+	"system:D&D Essentials",
+
+	// Other Famous RPGs
+	"system:Pathfinder 1e",
+	"system:Pathfinder 2e",
+	"system:Vampire: The Masquerade",
+	"system:Werewolf: The Apocalypse",
+	"system:Mage: The Ascension",
+	"system:Call of Cthulhu",
+	"system:Shadowrun",
+	"system:Star Wars RPG (D6/D20/Edge of the Empire)",
+	"system:Warhammer Fantasy Roleplay",
+	"system:Cyberpunk 2020",
+	"system:Blades in the Dark",
+	"system:Daggerheart",
+	"system:Draw Steel",
+	"system:Mutants and Masterminds",
+
+	// Meta
+	"meta:V3",
+	"meta:Legacy",
+	"meta:Template",
+	"meta:Theme",
+	"meta:free",
+	"meta:Character Sheet",
+	"meta:Documentation",
+	"meta:NPC",
+	"meta:Guide",
+	"meta:Resource",
+	"meta:Notes",
+	"meta:Example",
+
+	// Book type
+	"type:Campaign",
+	"type:Campaign Setting",
+	"type:Adventure",
+	"type:One-Shot",
+	"type:Setting",
+	"type:World",
+	"type:Lore",
+	"type:History",
+	"type:Dungeon Master",
+	"type:Encounter Pack",
+	"type:Encounter",
+	"type:Session Notes",
+	"type:reference",
+	"type:Handbook",
+	"type:Manual",
+	"type:Manuals",
+	"type:Compendium",
+	"type:Bestiary",
+
+	// ###################################### RPG Keywords
+
+	// Classes / Subclasses / Archetypes
+	"Class",
+	"Subclass",
+	"Archetype",
+	"Martial",
+	"Half-Caster",
+	"Full Caster",
+	"Artificer",
+	"Barbarian",
+	"Bard",
+	"Cleric",
+	"Druid",
+	"Fighter",
+	"Monk",
+	"Paladin",
+	"Rogue",
+	"Sorcerer",
+	"Warlock",
+	"Wizard",
+
+	// Races / Species / Lineages
+	"Race",
+	"Ancestry",
+	"Lineage",
+	"Aasimar",
+	"Beastfolk",
+	"Dragonborn",
+	"Dwarf",
+	"Elf",
+	"Goblin",
+	"Half-Elf",
+	"Half-Orc",
+	"Human",
+	"Kobold",
+	"Lizardfolk",
+	"Lycan",
+	"Orc",
+	"Tiefling",
+	"Vampire",
+	"Yuan-Ti",
+
+	// Magic / Spells / Items
+	"Magic",
+	"Magic Item",
+	"Magic Items",
+	"Wondrous Item",
+	"Magic Weapon",
+	"Artifact",
+	"Spell",
+	"Spells",
+	"Cantrip",
+	"Cantrips",
+	"Eldritch",
+	"Eldritch Invocation",
+	"Invocation",
+	"Invocations",
+	"Pact boon",
+	"Pact Boon",
+	"Spellcaster",
+	"Spellblade",
+	"Magical Tattoos",
+	"Enchantment",
+	"Enchanted",
+	"Attunement",
+	"Requires Attunement",
+	"Rune",
+	"Runes",
+	"Wand",
+	"Rod",
+	"Scroll",
+	"Potion",
+	"Potions",
+	"Item",
+	"Items",
+	"Bag of Holding",
+
+	// Monsters / Creatures / Enemies
+	"Monster",
+	"Creatures",
+	"Creature",
+	"Beast",
+	"Beasts",
+	"Humanoid",
+	"Undead",
+	"Fiend",
+	"Aberration",
+	"Ooze",
+	"Giant",
+	"Dragon",
+	"Monstrosity",
+	"Demon",
+	"Devil",
+	"Elemental",
+	"Construct",
+	"Constructs",
+	"Boss",
+	"BBEG",
+
+	// ############################# Media / Pop Culture
+	"One Piece",
+	"Dragon Ball",
+	"Dragon Ball Z",
+	"Naruto",
+	"Jujutsu Kaisen",
+	"Fairy Tail",
+	"Final Fantasy",
+	"Kingdom Hearts",
+	"Elder Scrolls",
+	"Skyrim",
+	"WoW",
+	"World of Warcraft",
+	"Marvel Comics",
+	"DC Comics",
+	"Pokemon",
+	"League of Legends",
+	"Runeterra",
+	"Arcane",
+	"Yu-Gi-Oh",
+	"Minecraft",
+	"Don't Starve",
+	"Witcher",
+	"Witcher 3",
+	"Cyberpunk",
+	"Cyberpunk 2077",
+	"Fallout",
+	"Divinity Original Sin 2",
+	"Fullmetal Alchemist",
+	"Fullmetal Alchemist Brotherhood",
+	"Lobotomy Corporation",
+	"Bloodborne",
+	"Dragonlance",
+	"Shackled City Adventure Path",
+	"Baldurs Gate 3",
+	"Library of Ruina",
+	"Radiant Citadel",
+	"Ravenloft",
+	"Forgotten Realms",
+	"Exandria",
+	"Critical Role",
+	"Star Wars",
+	"SW5e",
+	"Star Wars 5e",
+];
--- a/client/homebrew/editor/tagInput/tagInput.jsx
+++ b/client/homebrew/editor/tagInput/tagInput.jsx
@@ -1,101 +1,210 @@
 import './tagInput.less';
 import React, { useState, useEffect } from 'react';
-import _ from 'lodash';
+import Combobox from '../../../components/combobox.jsx';

-const TagInput = ({ unique = true, values = [], ...props })=>{
-	const [tempInputText, setTempInputText] = useState('');
-	const [tagList, setTagList] = useState(values.map((value)=>({ value, editing: false })));
+import tagSuggestionList from './curatedTagSuggestionList.js';
+
+const TagInput = ({ label, valuePatterns, values = [], unique = true, placeholder = '', smallText = '', onChange })=>{
+	const [tagList, setTagList] = useState(
+		values.map((value)=>({
+			value,
+			editing : false,
+			draft   : '',
+		})),
+	);

 	useEffect(()=>{
-		handleChange(tagList.map((context)=>context.value));
+		const incoming = values || [];
+		const current = tagList.map((t)=>t.value);
+
+		const changed = incoming.length !== current.length || incoming.some((v, i)=>v !== current[i]);
+
+		if(changed) {
+			setTagList(
+				incoming.map((value)=>({
+					value,
+					editing : false,
+				})),
+			);
+		}
+	}, [values]);
+
+	useEffect(()=>{
+		onChange?.({
+			target : { value: tagList.map((t)=>t.value) },
+		});
 	}, [tagList]);

-	const handleChange = (value)=>{
-		props.onChange({
-			target : { value }
+	// substrings to be normalized to the first value on the array
+	const duplicateGroups = [
+		['5e 2024', '5.5e', '5e\'24', '5.24', '5e24', '5.5'],
+		['5e', '5th Edition'],
+		['Dungeons & Dragons', 'Dungeons and Dragons', 'Dungeons n dragons'],
+		['D&D', 'DnD', 'dnd', 'Dnd', 'dnD', 'd&d', 'd&D', 'D&d'],
+		['P2e', 'p2e', 'P2E', 'Pathfinder 2e'],
+	];
+
+	const normalizeValue = (input)=>{
+		const lowerInput = input.toLowerCase();
+		let normalizedTag = input;
+
+		for (const group of duplicateGroups) {
+			for (const tag of group) {
+				if(!tag) continue;
+
+				const index = lowerInput.indexOf(tag.toLowerCase());
+				if(index !== -1) {
+					normalizedTag = input.slice(0, index) + group[0] + input.slice(index + tag.length);
+					break;
+				}
+			}
+		}
+
+		if(normalizedTag.includes(':')) {
+			const [rawType, rawValue = ''] = normalizedTag.split(':');
+			const tagType = rawType.trim().toLowerCase();
+			const tagValue = rawValue.trim();
+
+			if(tagValue.length > 0) {
+				normalizedTag = `${tagType}:${tagValue[0].toUpperCase()}${tagValue.slice(1)}`;
+			}
+			//trims spaces around colon and capitalizes the first word after the colon
+			//this is preferred to users not understanding they can't put spaces in
+		}
+
+		return normalizedTag;
+	};
+
+	const submitTag = (newValue, index = null)=>{
+		const trimmed = newValue?.trim();
+		if(!trimmed) return;
+		if(!valuePatterns.test(trimmed)) return;
+
+		const normalizedTag = normalizeValue(trimmed);
+
+		setTagList((prev)=>{
+			const existsIndex = prev.findIndex((t)=>t.value.toLowerCase() === normalizedTag.toLowerCase());
+			if(unique && existsIndex !== -1) return prev;
+			if(index !== null) {
+				return prev.map((t, i)=>(i === index ? { ...t, value: normalizedTag, editing: false } : t));
+			}
+
+			return [...prev, { value: normalizedTag, editing: false }];
 		});
 	};

-	const handleInputKeyDown = ({ evt, value, index, options = {} })=>{
-		if(_.includes(['Enter', ','], evt.key)) {
-			evt.preventDefault();
-			submitTag(evt.target.value, value, index);
-			if(options.clear) {
-				setTempInputText('');
-			}
-		}
-	};
-
-	const submitTag = (newValue, originalValue, index)=>{
-		setTagList((prevContext)=>{
-			// remove existing tag
-			if(newValue === null){
-				return [...prevContext].filter((context, i)=>i !== index);
-			}
-			// add new tag
-			if(originalValue === null){
-				return [...prevContext, { value: newValue, editing: false }];
-			}
-			// update existing tag
-			return prevContext.map((context, i)=>{
-				if(i === index) {
-					return { ...context, value: newValue, editing: false };
-				}
-				return context;
-			});
-		});
+	const removeTag = (index)=>{
+		setTagList((prev)=>prev.filter((_, i)=>i !== index));
 	};

 	const editTag = (index)=>{
-		setTagList((prevContext)=>{
-			return prevContext.map((context, i)=>{
-				if(i === index) {
-					return { ...context, editing: true };
+		setTagList((prev)=>prev.map((t, i)=>(i === index ? { ...t, editing: true, draft: t.value } : t)));
+	};
+
+	const stopEditing = (index)=>{
+		setTagList((prev)=>prev.map((t, i)=>(i === index ? { ...t, editing: false, draft: '' } : t)));
+	};
+
+	const suggestionOptions = tagSuggestionList.map((tag)=>{
+		const tagType = tag.split(':');
+
+		let classes = 'item';
+		switch (tagType[0]) {
+		case 'type':
+			classes = 'item type';
+			break;
+		case 'group':
+			classes = 'item group';
+			break;
+		case 'meta':
+			classes = 'item meta';
+			break;
+		case 'system':
+			classes = 'item system';
+			break;
+		default:
+			classes = 'item';
+			break;
 		}
-				return { ...context, editing: false };
-			});
-		});
-	};

-	const renderReadTag = (context, index)=>{
 		return (
-			<li key={index}
-				data-value={context.value}
-				className='tag'
-				onClick={()=>editTag(index)}>
-				{context.value}
-				<button onClick={(evt)=>{evt.stopPropagation(); submitTag(null, context.value, index);}}><i className='fa fa-times fa-fw'/></button>
-			</li>
+			<div className={classes} key={`tag-${tag}`} value={tag} data={tag} title={tag}>
+				{tag}
+			</div>
 		);
-	};
-
-	const renderWriteTag = (context, index)=>{
-		return (
-			<input type='text'
-				key={index}
-				defaultValue={context.value}
-				onKeyDown={(evt)=>handleInputKeyDown({ evt, value: context.value, index: index })}
-				autoFocus
-			/>
-		);
-	};
+	});

 	return (
-		<div className='field'>
-			<label>{props.label}</label>
+		<div className='field tags'>
+			{label && <label>{label}</label>}
+
 			<div className='value'>
 				<ul className='list'>
-					{tagList.map((context, index)=>{ return context.editing ? renderWriteTag(context, index) : renderReadTag(context, index); })}
+					{tagList.map((t, i)=>t.editing ? (
+						<input
+							key={i}
+							type='text'
+							value={t.draft} // always use draft
+							pattern={valuePatterns.source}
+							onChange={(e)=>setTagList((prev)=>prev.map((tag, idx)=>(idx === i ? { ...tag, draft: e.target.value } : tag)),
+							)
+							}
+							onKeyDown={(e)=>{
+								if(e.key === 'Enter') {
+									e.preventDefault();
+									submitTag(t.draft, i); // submit draft
+									setTagList((prev)=>prev.map((tag, idx)=>(idx === i ? { ...tag, draft: '' } : tag)),
+									);
+								}
+								if(e.key === 'Escape') {
+									stopEditing(i);
+									e.target.blur();
+								}
+							}}
+							autoFocus
+						/>
+					) : (
+						<li key={i} className='tag' onClick={()=>editTag(i)}>
+							{t.value}
+							<button
+								type='button'
+								onClick={(e)=>{
+									e.stopPropagation();
+									removeTag(i);
+								}}>
+								<i className='fa fa-times fa-fw' />
+							</button>
+						</li>
+					),
+					)}
 				</ul>

-				<input
-					type='text'
-					className='value'
-					placeholder={props.placeholder}
-					value={tempInputText}
-					onChange={(e)=>setTempInputText(e.target.value)}
-					onKeyDown={(evt)=>handleInputKeyDown({ evt, value: null, options: { clear: true } })}
+				<Combobox
+					trigger='click'
+					className='tagInput-dropdown'
+					default=''
+					placeholder={placeholder}
+					options={label === 'tags' ? suggestionOptions : []}
+					autoSuggest={
+						label === 'tags'
+							? {
+								suggestMethod           : 'startsWith',
+								clearAutoSuggestOnClick : true,
+								filterOn                : ['value', 'title'],
+							}
+							: { suggestMethod: 'includes', clearAutoSuggestOnClick: true, filterOn: [] }
+					}
+					valuePatterns={valuePatterns.source}
+					onSelect={(value)=>submitTag(value)}
+					onEntry={(e)=>{
+						if(e.key === 'Enter') {
+							console.log('submit');
+							e.preventDefault();
+							submitTag(e.target.value);
+						}
+					}}
 				/>
+				{smallText.length !== 0 && <small>{smallText}</small>}
 			</div>
 		</div>
 	);
--- a/client/homebrew/editor/tagInput/tagInput.less
+++ b/client/homebrew/editor/tagInput/tagInput.less
@@ -0,0 +1,22 @@
+.list input {
+	border-radius: 5px;
+}
+
+.tagInput-dropdown {
+	.dropdown-options {
+		.item {
+			&.type {
+				background-color: #00800035;
+			}
+			&.group {
+				background-color: #50505035;
+			}
+			&.meta {
+				background-color: #00008035;
+			}
+			&.system {
+				background-color: #80000035;
+			}
+		}
+	}
+}
--- a/client/homebrew/editor/tagInput/tagSuggestionList.js
+++ b/client/homebrew/editor/tagInput/tagSuggestionList.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -61,10 +61,11 @@
      "server"
    ],
    "transformIgnorePatterns": [
-      "node_modules/(?!(nanoid|@exodus/bytes|parse5)/)"
+      "node_modules/(?!(nanoid|@exodus/bytes|parse5|@asamuzakjp|@csstools)/)"
    ],
    "transform": {
-      "^.+\\.js$": "babel-jest"
+      "^.+\\.[jt]s$": "babel-jest",
+      "^.+\\.mjs$": "babel-jest"
    },
    "coveragePathIgnorePatterns": [
      "build/*"
@@ -88,13 +89,13 @@
    ]
  },
  "dependencies": {
-    "@babel/core": "^7.28.4",
-    "@babel/plugin-transform-runtime": "^7.28.3",
-    "@babel/preset-env": "^7.28.3",
+    "@babel/core": "^7.29.0",
+    "@babel/plugin-transform-runtime": "^7.29.0",
+    "@babel/preset-env": "^7.29.0",
    "@babel/preset-react": "^7.28.5",
    "@babel/runtime": "^7.28.4",
    "@dmsnell/diff-match-patch": "^1.1.0",
-    "@googleapis/drive": "^19.2.0",
+    "@googleapis/drive": "^20.1.0",
    "@sanity/diff-match-patch": "^3.2.0",
    "body-parser": "^2.2.0",
    "classnames": "^2.5.1",
@@ -109,7 +110,7 @@
    "express-async-handler": "^1.2.0",
    "express-static-gzip": "3.0.0",
    "fflate": "^0.8.2",
-    "fs-extra": "11.3.2",
+    "fs-extra": "^11.3.3",
    "hash-wasm": "^4.12.0",
    "idb-keyval": "^6.2.2",
    "js-yaml": "^4.1.1",
@@ -125,10 +126,10 @@
    "marked-nonbreaking-spaces": "^1.0.1",
    "marked-smartypants-lite": "^1.0.3",
    "marked-subsuper-text": "^1.0.4",
-    "marked-variables": "^1.0.4",
+    "marked-variables": "^1.0.5",
    "markedLegacy": "npm:marked@^0.3.19",
    "moment": "^2.30.1",
-    "mongoose": "^8.20.0",
+    "mongoose": "^9.2.1",
    "nanoid": "5.1.6",
    "nconf": "^0.13.0",
    "react": "^18.3.1",
@@ -151,7 +152,7 @@
    "globals": "^16.4.0",
    "jest": "^30.2.0",
    "jest-expect-message": "^1.1.3",
-    "jsdom": "^27.4.0",
+    "jsdom": "^28.1.0",
    "jsdom-global": "^3.0.2",
    "postcss-less": "^6.0.0",
    "stylelint": "^16.25.0",
--- a/server/admin.api.spec.js
+++ b/server/admin.api.spec.js
@@ -1,4 +1,5 @@
 /*eslint max-lines: ["warn", {"max": 1000, "skipBlankLines": true, "skipComments": true}]*/
+import mongoose from 'mongoose';
 import supertest from 'supertest';
 import HBApp     from './app.js';
 import { model as NotificationModel } from './notifications.model.js';
@@ -8,8 +9,19 @@ import { model as HomebrewModel } from './homebrew.model.js';
 // Mimic https responses to avoid being redirected all the time
 const app = supertest.agent(HBApp).set('X-Forwarded-Proto', 'https');

+let dbState;
+
 describe('Tests for admin api', ()=>{
+	beforeEach(()=>{
+		// Mock DB ready (for dbCheck middleware)
+		dbState = mongoose.connection.readyState;
+		mongoose.connection.readyState = 1;
+	});
+
 	afterEach(()=>{
+		// Restore DB ready state
+		mongoose.connection.readyState = dbState;
+
 		jest.resetAllMocks();
 	});

--- a/themes/V3/Blank/snippets.js
+++ b/themes/V3/Blank/snippets.js
@@ -588,6 +588,21 @@ export default [

 			},

+			{
+				name        : 'True 20',
+				subsnippets : [
+					{
+						name : 'OGL 1.0 Section 15',
+						gen	 : LicenseGen.grTrue20Sec15,
+					},
+					{
+						name : 'True20 Logo',
+						gen  : LicenseGen.grTrue20CompatLogo,
+					}
+
+				]
+			},
+
 			{
 				name        : 'Wizards of the Coast',
 				icon        : 'fab fa-wizards-of-the-coast',
--- a/themes/V3/Blank/snippets/license.gen.js
+++ b/themes/V3/Blank/snippets/license.gen.js