From 827566d57d4c0a3c89734d4248ed3762c941e324 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Tue, 21 Jul 2026 04:31:12 +0200
Subject: [PATCH] Integrated e-mail alerts, added dialog option for release
 alerts.

---
 components/alerts/create.vue    |  68 ++++++-
 components/emails/alert.vue     | 339 +++++++++++++++-----------------
 components/stashes/heart.vue    |   7 +-
 components/user/preferences.vue |  35 +++-
 pages/users/@username/+Page.vue |   4 +-
 pages/users/@username/+route.js |   2 +-
 src/alerts.js                   | 276 +++++++++++++++++---------
 src/app.js                      |   2 +
 src/stashes.js                  |  26 +--
 src/users.js                    |  11 +-
 tools/notify.js                 |  25 +++
 11 files changed, 487 insertions(+), 308 deletions(-)
 create mode 100644 tools/notify.js

diff --git a/components/alerts/create.vue b/components/alerts/create.vue
index 3e7b9ef..22f0f54 100644
--- a/components/alerts/create.vue
+++ b/components/alerts/create.vue
@@ -1,4 +1,5 @@
 <script setup>
+import { format } from 'date-fns';
 import { inject, ref, useId } from 'vue';
 
 import Dialog from '#/components/dialog/dialog.vue';
@@ -20,6 +21,10 @@ const props = defineProps({
 		type: Array,
 		default: () => [],
 	},
+	presetScenes: {
+		type: Array,
+		default: () => [],
+	},
 });
 
 const emit = defineEmits(['alert', 'close']);
@@ -45,6 +50,8 @@ const tagResults = ref([]);
 const tagInput = ref(null);
 const tagQuery = ref('');
 
+const scenes = ref(props.presetScenes);
+
 const matches = ref([]);
 const matchProperty = ref('title');
 const matchExpression = ref('');
@@ -61,8 +68,8 @@ const addEntityDropdownId = useId();
 const addMatchDropdownId = useId();
 const addStashDropdownId = useId();
 
-const notify = ref(true);
-const email = ref(false);
+const notify = ref(JSON.parse(localStorage.getItem('alert_notify')) ?? true);
+const email = ref(JSON.parse(localStorage.getItem('alert_email')) ?? false);
 
 const stashes = ref([]);
 
@@ -72,6 +79,7 @@ async function createAlert() {
 		...tags.value.map((tag) => tag.name),
 		...entities.value.map((entity) => entity.name),
 		...matches.value.map((match) => match.expression),
+		...scenes.value.map((scene) => scene.title),
 	].filter(Boolean).join(', ');
 
 	const newAlert = await post('/alerts', {
@@ -81,6 +89,7 @@ async function createAlert() {
 		allMatches: matchAnd.value,
 		actors: actors.value.map((actor) => actor.id),
 		tagIds: tags.value.map((tag) => tag.id),
+		sceneIds: scenes.value.map((scene) => scene.id),
 		matches: matches.value,
 		entityIds: entities.value.map((entity) => entity.id),
 		notify: notify.value,
@@ -162,6 +171,10 @@ function selectStash(selectedStash) {
 		stashes.value.push(selectedStash);
 	}
 }
+
+function rememberThen(domain, checked) {
+	localStorage.setItem(`alert_${domain}`, checked);
+}
 </script>
 
 <template>
@@ -173,7 +186,33 @@ function selectStash(selectedStash) {
 			class="dialog-body"
 			@submit.prevent="createAlert"
 		>
-			<div class="dialog-section">
+			<div
+				v-if="scenes.length > 0"
+				class="dialog-section"
+			>
+				<div class="section-header">
+					<h3 class="heading">WHEN RELEASED</h3>
+				</div>
+
+				<div
+					v-for="scene in scenes"
+					:key="`alert-scene-${scene.id}`"
+					class="scene"
+				>
+					<span class="scene-title">{{ scene.title }}</span>
+
+					<span class="scene-details">
+						<strong class="scene-date"><time :datetime="scene.date.toISOString()">{{ format(scene.date, 'yyyy-MM-dd') }}</time></strong> on
+
+						<span class="scene-channel">{{ scene.channel?.name || scene.network?.name }}</span>
+					</span>
+				</div>
+			</div>
+
+			<div
+				v-else
+				class="dialog-section"
+			>
 				<div class="section-header">
 					<h3 class="heading">IF</h3>
 				</div>
@@ -462,7 +501,7 @@ function selectStash(selectedStash) {
 					<span>Notify me in traxxx</span>
 					<Checkbox
 						:checked="notify"
-						@change="(checked) => notify = checked"
+						@change="(checked) => { notify = checked; rememberThen('notify', checked); }"
 					/>
 				</label>
 
@@ -474,11 +513,14 @@ function selectStash(selectedStash) {
 
 					<Checkbox
 						:checked="email"
-						@change="(checked) => email = checked"
+						@change="(checked) => { email = checked; rememberThen('email', checked); }"
 					/>
 				</label>
 
-				<div class="stash">
+				<div
+					v-if="scenes.length === 0"
+					class="stash"
+				>
 					<ul class="field-items nolist noselect">
 						<li
 							v-for="stash in stashes"
@@ -577,6 +619,20 @@ function selectStash(selectedStash) {
 	padding: 1rem;
 }
 
+.scene {
+	padding: 0 1rem;
+}
+
+.scene-title {
+	display: block;
+	line-height: 1.5;
+	margin-bottom: .5rem;
+}
+
+.scene-date {
+	color: var(--primary);
+}
+
 .field {
 	display: flex;
 	align-items: stretch;
diff --git a/components/emails/alert.vue b/components/emails/alert.vue
index c3c0714..a0077ab 100644
--- a/components/emails/alert.vue
+++ b/components/emails/alert.vue
@@ -15,9 +15,13 @@ import {
 import { format } from 'date-fns';
 
 defineProps({
-	trigger: {
+	triggers: {
+		type: Array,
+		default: () => mockTriggers,
+	},
+	user: {
 		type: Object,
-		default: () => mockTrigger,
+		default: () => mockUser,
 	},
 	address: {
 		type: String,
@@ -30,167 +34,142 @@ defineProps({
 // defineProps' default factory (above, in <script setup>) references this. It must live in a plain
 // <script> block: Vue's compiler forbids defineProps from referencing variables declared inside
 // <script setup> itself, since that block gets hoisted out of the setup() function.
-const mockTrigger = {
-	userId: 1,
+const mockUser = {
+	id: 1,
 	username: 'DebuggingLibrarian',
-	userEmail: 'debug@alerts.traxxx.me',
-	alerts: [
-		{
-			sceneId: 684061,
-			alert: {
-				id: 565,
-				userId: 1,
-				username: 'DebuggingLibrarian',
-				userEmail: 'debug@alerts.traxxx.me',
-				notify: true,
-				email: true,
-				all: true,
-				allActors: true,
-				allEntities: true,
-				allTags: true,
-				allMatches: true,
-				actors: [],
-				tags: [],
-				entities: [
-					{
-						id: 522,
-						name: 'Jules Jordan',
-					},
-				],
-				matches: [],
-				stashIds: [],
-			},
-			scene: {
-				id: 684061,
-				title: 'Thick & Bootylicious: Vanessa Blake Takes A BBC Up Her Ass',
-				slug: 'thick-bootylicious-vanessa-blake-takes-a-bbc-up',
-				date: '2026-02-17T00:00:00.000Z',
-				description: 'Vanessa Blake’s curves are impossible to ignore—especially her thick, round, bootylicious ass. The scene opens with the camera following Vanessa through the house as she struts confidently in a slow, teasing booty walk, giving viewers a full view of her luscious curves. She pauses at the stairs, turning back to flaunt her massive ass before letting her hands wander over her body. Feeling the heat build, Vanessa begins to pleasure herself, showcasing her insatiable appetite for big black cock. Moving to the couch, she grabs a dildo and slowly works it into her ass, preparing herself for what’s coming next. Sitting back and watching the show is Lexington Steele, enjoying every second as she stretches and teases in anticipation. Lexington finally steps in, and Vanessa eagerly drops to her knees, wrapping her lips around his massive BBC and giving him a deep, hungry blowjob. The action quickly escalates to the couch, where they fuck in multiple intense positions, Vanessa’s thick body bouncing with every thrust. When she’s fully ready, Vanessa has Lex slide his BBC deep into her ass, and the two go at it hard in a variety of explosive anal positions. The scene builds to a powerful climax as Lexington pulls out and finishes with a messy facial, leaving Vanessa satisfied and dripping after an unforgettable session.',
-				actors: [
-					{
-						id: 919,
-						name: 'Vanessa Blake',
-					},
-					{
-						id: 1374,
-						name: 'Lexington Steele',
-					},
-				],
-				actorIds: [
-					919,
-					1374,
-				],
-				tags: [
-					{
-						name: 'MILF',
-						slug: 'milf',
-					},
-					{
-						name: 'facial',
-						slug: 'facial',
-					},
-				],
-				tagIds: [
-					4,
-					12,
-					19,
-					30,
-					29,
-					37,
-					41,
-					68,
-					82,
-					100,
-					112,
-					119,
-					null,
-					130,
-				],
-				entityId: 522,
-				parentEntityId: 47,
-				// posterUrl: 'http://localhost:5100/media/posters/lazy/cd/b5/99375c7998a20acffef2217a8a21c3546924312cec65.jpeg',
-			},
-		},
-		{
-			sceneId: 684060,
-			alert: {
-				id: 565,
-				userId: 1,
-				username: 'DebuggingLibrarian',
-				userEmail: 'debug@alerts.traxxx.me',
-				notify: true,
-				email: true,
-				all: true,
-				allActors: true,
-				allEntities: true,
-				allTags: true,
-				allMatches: true,
-				actors: [],
-				tags: [],
-				entities: [
-					{
-						id: 522,
-						name: 'Jules Jordan',
-					},
-				],
-				matches: [],
-				stashIds: [],
-			},
-			scene: {
-				id: 684060,
-				title: 'Elizabeth Skylar’s Big ASSets Drive The Milfomaniac Manuel Ferrara Wild',
-				slug: 'elizabeth-skylar-s-big-assets-drive-the-manuel',
-				date: '2026-02-21T00:00:00.000Z',
-				description: 'Elizabeth Skylar is ready to indulge her cravings, and there’s only one man she wants—the Milfomaniac, Manuel Ferrara. The scene opens with Elizabeth stepping out onto the balcony in sexy lingerie, confidently showing off her busty curves as the camera captures every seductive angle. She teases the viewer with slow, deliberate poses before heading inside to the kitchen, where she perches on a stool with her ass on full display. Manuel joins her, grabbing and admiring her curves, letting the camera in on just how irresistible she is. The action moves to the living room, where Elizabeth stretches out on the couch and begins to pleasure herself, putting on a sultry show for Manuel. Unable to resist, she drops to her knees, her tits spilling free as she takes him deep into her mouth with an eager, hungry intensity. From there, the two tear into each other on the couch, fucking in multiple positions as Elizabeth moans for more. The scene builds to a explosive finish, ending with Manuel delivering a memorable facial that leaves Elizabeth completely satisfied.',
-				actors: [
-					{
-						id: 44001,
-						name: 'Elizabeth Skylar',
-					},
-					{
-						id: 512,
-						name: 'Manuel Ferrara',
-					},
-				],
-				actorIds: [
-					512,
-					44001,
-				],
-				tags: [
-					{
-						name: 'anal',
-						slug: 'anal',
-					},
-					{
-						name: 'ass to mouth',
-						tag: 'atm',
-					},
-				],
-				tagIds: [
-					4,
-					30,
-					29,
-					31,
-					37,
-					41,
-					68,
-					82,
-					119,
-					125,
-				],
-				entityId: 522,
-				parentEntityId: 47,
-				posterUrl: 'http://localhost:5100/media/posters/lazy/3c/84/f53e772e4710ca71fb74bdb6896af3d180725d17710b.jpeg',
-			},
-		},
-	],
+	email: 'debug@alerts.traxxx.me',
 };
+
+const mockTriggers = [
+	{
+		scene: {
+			id: 684061,
+			title: 'Thick & Bootylicious: Vanessa Blake Takes A BBC Up Her Ass',
+			slug: 'thick-bootylicious-vanessa-blake-takes-a-bbc-up',
+			date: '2026-02-17T00:00:00.000Z',
+			description: 'Vanessa Blake’s curves are impossible to ignore—especially her thick, round, bootylicious ass. The scene opens with the camera following Vanessa through the house as she struts confidently in a slow, teasing booty walk, giving viewers a full view of her luscious curves. She pauses at the stairs, turning back to flaunt her massive ass before letting her hands wander over her body. Feeling the heat build, Vanessa begins to pleasure herself, showcasing her insatiable appetite for big black cock. Moving to the couch, she grabs a dildo and slowly works it into her ass, preparing herself for what’s coming next. Sitting back and watching the show is Lexington Steele, enjoying every second as she stretches and teases in anticipation. Lexington finally steps in, and Vanessa eagerly drops to her knees, wrapping her lips around his massive BBC and giving him a deep, hungry blowjob. The action quickly escalates to the couch, where they fuck in multiple intense positions, Vanessa’s thick body bouncing with every thrust. When she’s fully ready, Vanessa has Lex slide his BBC deep into her ass, and the two go at it hard in a variety of explosive anal positions. The scene builds to a powerful climax as Lexington pulls out and finishes with a messy facial, leaving Vanessa satisfied and dripping after an unforgettable session.',
+			actors: [
+				{
+					id: 919,
+					name: 'Vanessa Blake',
+				},
+				{
+					id: 1374,
+					name: 'Lexington Steele',
+				},
+			],
+			actorIds: [
+				919,
+				1374,
+			],
+			tags: [
+				{
+					name: 'MILF',
+					slug: 'milf',
+				},
+				{
+					name: 'facial',
+					slug: 'facial',
+				},
+			],
+			tagIds: [
+				4,
+				12,
+				19,
+				30,
+				29,
+				37,
+				41,
+				68,
+				82,
+				100,
+				112,
+				119,
+				null,
+				130,
+			],
+			entityId: 522,
+			parentEntityId: 47,
+		},
+		posterUrl: 'http://localhost:5100/media/posters/lazy/cd/b5/99375c7998a20acffef2217a8a21c3546924312cec65.jpeg',
+		alertId: 123,
+		alertActors: [],
+		alertTags: [],
+		alertEntities: [
+			{
+				id: 522,
+				name: 'Jules Jordan',
+			},
+		],
+		alertMatches: [],
+		alertSceneIds: [],
+	},
+	{
+		scene: {
+			id: 684060,
+			title: 'Elizabeth Skylar’s Big ASSets Drive The Milfomaniac Manuel Ferrara Wild',
+			slug: 'elizabeth-skylar-s-big-assets-drive-the-manuel',
+			date: '2026-02-21T00:00:00.000Z',
+			description: 'Elizabeth Skylar is ready to indulge her cravings, and there’s only one man she wants—the Milfomaniac, Manuel Ferrara. The scene opens with Elizabeth stepping out onto the balcony in sexy lingerie, confidently showing off her busty curves as the camera captures every seductive angle. She teases the viewer with slow, deliberate poses before heading inside to the kitchen, where she perches on a stool with her ass on full display. Manuel joins her, grabbing and admiring her curves, letting the camera in on just how irresistible she is. The action moves to the living room, where Elizabeth stretches out on the couch and begins to pleasure herself, putting on a sultry show for Manuel. Unable to resist, she drops to her knees, her tits spilling free as she takes him deep into her mouth with an eager, hungry intensity. From there, the two tear into each other on the couch, fucking in multiple positions as Elizabeth moans for more. The scene builds to a explosive finish, ending with Manuel delivering a memorable facial that leaves Elizabeth completely satisfied.',
+			actors: [
+				{
+					id: 44001,
+					name: 'Elizabeth Skylar',
+				},
+				{
+					id: 512,
+					name: 'Manuel Ferrara',
+				},
+			],
+			actorIds: [
+				512,
+				44001,
+			],
+			tags: [
+				{
+					name: 'anal',
+					slug: 'anal',
+				},
+				{
+					name: 'ass to mouth',
+					tag: 'atm',
+				},
+			],
+			tagIds: [
+				4,
+				30,
+				29,
+				31,
+				37,
+				41,
+				68,
+				82,
+				119,
+				125,
+			],
+			entityId: 522,
+			parentEntityId: 47,
+		},
+		posterUrl: 'http://localhost:5100/media/posters/lazy/3c/84/f53e772e4710ca71fb74bdb6896af3d180725d17710b.jpeg',
+		alertId: 123,
+		alertActors: [],
+		alertTags: [],
+		alertEntities: [
+			{
+				id: 522,
+				name: 'Jules Jordan',
+			},
+		],
+		alertMatches: [],
+		alertSceneIds: [],
+	},
+];
 </script>
 
 <template>
 	<Html>
 		<Body style="font-family: sans-serif;">
-			<Preview>{{ trigger.alerts.length }} new scene{{ trigger.alerts.length === 1 ? '' : 's' }} matching your alerts on traxxx</Preview>
+			<Preview>{{ triggers.length }} new scene{{ triggers.length === 1 ? '' : 's' }} matching your alerts on traxxx</Preview>
 
 			<Container>
 				<Img
@@ -203,44 +182,44 @@ const mockTrigger = {
 				<Heading
 					as="h3"
 					style="color: #f65596; margin: 0 auto 0 auto;"
-				>Hi, {{ trigger.username }}</Heading>
+				>Hi, {{ user.username }}</Heading>
 
 				<Text style="font-size: 16px; margin: 20px 0;">Scenes for which you set e-mail alerts have been added or released:</Text>
 
 				<div
-					v-for="(alert, index) in trigger.alerts"
-					:key="alert.alert.id"
+					v-for="(trigger, index) in triggers"
+					:key="trigger.scene.id"
 					style="margin-bottom: 15px; font-size: 14px;"
 					:style="{
-						'padding-bottom': index < trigger.alerts.length - 1 ? '15px' : 0,
-						'border-bottom': index < trigger.alerts.length - 1 ? 'solid 1px #ddd' : 'none',
+						'padding-bottom': index < triggers.length - 1 ? '15px' : 0,
+						'border-bottom': index < triggers.length - 1 ? 'solid 1px #ddd' : 'none',
 					}"
 				>
 					<Row style="margin-bottom: 8px;">
 						<Column valign="top">
-							{{ format(alert.scene.date, 'yyyy-MM-dd') }} |
-							<span v-if="alert.alert.sceneIds?.length > 0">Scene is released</span>
+							{{ format(trigger.scene.date, 'yyyy-MM-dd') }} |
+							<span v-if="trigger.alertSceneIds.length > 0">Scene is released</span>
 
 							<span v-else>
 								New
 
 								<template
-									v-if="alert.alert.tags.length > 0"
-								>{{ alert.alert.tags.map((tag) => tag.name).join(', ') }}</template>
+									v-if="trigger.alertTags.length > 0"
+								>{{ trigger.alertTags.map((tag) => tag.name).join(', ') }}</template>
 
 								scene
 
 								<template
-									v-if="alert.alert.actors.length > 0"
-								>with {{ alert.alert.actors.map((actor) => actor.name).join(', ') }}&nbsp;</template>
+									v-if="trigger.alertActors.length > 0"
+								>with {{ trigger.alertActors.map((actor) => actor.name).join(', ') }}&nbsp;</template>
 
 								<template
-									v-if="alert.alert.entities.length > 0"
-								>for {{ alert.alert.entities[0].name }}&nbsp;</template>
+									v-if="trigger.alertEntities.length > 0"
+								>for {{ trigger.alertEntities[0].name }}&nbsp;</template>
 
 								<template
-									v-if="alert.alert.matches.length > 0"
-								>matching {{ alert.alert.matches.map((match) => match.expression).join(', ') }}</template>
+									v-if="trigger.alertMatches.length > 0"
+								>matching {{ trigger.alertMatches.map((match) => match.expression).join(', ') }}</template>
 							</span>
 						</Column>
 
@@ -249,7 +228,7 @@ const mockTrigger = {
 							valign="top"
 							style="text-align: right;"
 						>
-							<span style="font-size: 14px; color: #aaa;">#{{ alert.alert.id }}</span>
+							<span style="font-size: 14px; color: #aaa;">#{{ trigger.alertId }}</span>
 						</Column>
 					</Row>
 
@@ -259,12 +238,12 @@ const mockTrigger = {
 								width="175"
 								valign="top"
 							>
-								<Link :href="`${address}/scene/${alert.scene.id}/${alert.scene.slug}`">
+								<Link :href="`${address}/scene/${trigger.scene.id}/${trigger.scene.slug}`">
 									<Img
-										v-if="alert.scene.posterUrl"
-										:src="alert.scene.posterUrl"
+										v-if="trigger.posterUrl"
+										:src="trigger.posterUrl"
 										width="160"
-										:alt="alert.scene.title"
+										:alt="trigger.scene.title"
 										style="margin-top: 2px; border-radius: 8px;"
 									/>
 
@@ -278,17 +257,17 @@ const mockTrigger = {
 							<Column valign="top">
 								<div style="margin-bottom: 5px;">
 									<Link
-										:href="`${address}/scene/${alert.scene.id}/${alert.scene.slug}`"
+										:href="`${address}/scene/${trigger.scene.id}/${trigger.scene.slug}`"
 										style="font-weight: bold; line-height: 1.5; color: inherit;"
-									>{{ alert.scene.title }}</Link>
+									>{{ trigger.scene.title }}</Link>
 								</div>
 
 								<div style="margin-bottom: 8px;">
-									<span style="font-size: 14px;">{{ alert.scene.actors.slice(0, 3).map((actor) => actor.name).join(', ') }}</span>
+									<span style="font-size: 14px;">{{ trigger.scene.actors.slice(0, 3).map((actor) => actor.name).join(', ') }}</span>
 								</div>
 
 								<div style="margin-bottom: 8px;">
-									<span style="font-size: 14px; color: #666;">{{ alert.scene.tags.slice(0, 5).map((tag) => tag.name).join(', ') }}</span>
+									<span style="font-size: 14px; color: #666;">{{ trigger.scene.tags.slice(0, 5).map((tag) => tag.name).join(', ') }}</span>
 								</div>
 							</Column>
 						</Row>
diff --git a/components/stashes/heart.vue b/components/stashes/heart.vue
index 5427f6e..fe3831a 100644
--- a/components/stashes/heart.vue
+++ b/components/stashes/heart.vue
@@ -125,6 +125,9 @@ async function alertItem() {
 			...(props.domain === 'scenes' && { scenes: [props.item.id] }),
 			notify: true,
 			email: false,
+			// probably too confusing and annoying to have quick alerts inherit email preference from dialog
+			// notify: JSON.parse(localStorage.getItem('alert_notify')) ?? true,
+			// email: JSON.parse(localStorage.getItem('alert_email')) ?? false,
 			preset: true,
 		}, {
 			successFeedback: `Alert set for '${alertLabel}'`,
@@ -173,7 +176,7 @@ async function removeAlert() {
 
 function setAlerted(alert) {
 	// only set alerted status if the current item is the only one in the new stash
-	const items = [...alert.actors, ...alert.tags, ...alert.entities, ...alert.matches];
+	const items = [...alert.actors, ...alert.tags, ...alert.entities, ...alert.matches, ...alert.scenes];
 
 	if (items.length === 1 && alert[props.domain][0]?.id === props.item.id) {
 		itemAlerted.value = true;
@@ -219,7 +222,6 @@ async function reloadStashes(newStash) {
 				icon="bell2"
 				class="alert active noselect"
 				@click="removeAlert"
-				@contextmenu.prevent="showAlertDialog = true"
 			/>
 
 			<Icon
@@ -228,7 +230,6 @@ async function reloadStashes(newStash) {
 				icon="bell-plus"
 				class="alert partial noselect"
 				@click="alertItem"
-				@contextmenu.prevent="showAlertDialog = true"
 			/>
 
 			<Icon
diff --git a/components/user/preferences.vue b/components/user/preferences.vue
index a770b99..cc06e97 100644
--- a/components/user/preferences.vue
+++ b/components/user/preferences.vue
@@ -9,6 +9,9 @@ const pageContext = inject('pageContext');
 const { user } = pageContext;
 
 const settings = reactive({
+	alertNotificationsEnabled: true,
+	alertEmailsEnabled: true,
+	alertEmailsFrequency: null,
 	...user.settings,
 });
 
@@ -22,16 +25,32 @@ async function updateSettings() {
 		class="profile-section"
 		@submit.prevent
 	>
+		<h3 class="heading settings-heading">Alerts</h3>
+
 		<div class="setting">
 			<span class="setting-label">
-				<strong class="setting-title">Enable alert e-mails</strong>
-				<span class="setting-description">Whether you receive e-mail alerts</span>
+				<strong class="setting-title">Enable alert notifications</strong>
+				<span class="setting-description">Your alerts can trigger notifications in traxxx</span>
 			</span>
 
 			<span class="setting-value">
 				<Checkbox
-					:checked="settings.alertEmailEnabled"
-					@change="(checked) => { settings.alertEmailEnabled = checked; updateSettings(); }"
+					:checked="settings.alertNotificationsEnabled"
+					@change="(checked) => { settings.alertNotificationsEnabled = checked; updateSettings(); }"
+				/>
+			</span>
+		</div>
+
+		<div class="setting">
+			<span class="setting-label">
+				<strong class="setting-title">Enable alert e-mails</strong>
+				<span class="setting-description">Your alerts can trigger e-mails</span>
+			</span>
+
+			<span class="setting-value">
+				<Checkbox
+					:checked="settings.alertEmailsEnabled"
+					@change="(checked) => { settings.alertEmailsEnabled = checked; updateSettings(); }"
 				/>
 			</span>
 		</div>
@@ -39,12 +58,12 @@ async function updateSettings() {
 		<label class="setting">
 			<span class="setting-label">
 				<strong class="setting-title">Alert e-mail frequency</strong>
-				<span class="setting-description">How often you receive your e-mail alerts</span>
+				<span class="setting-description">Alert e-mails are sent immediately, or accumulated and sent periodically</span>
 			</span>
 
 			<span class="setting-value">
 				<select
-					v-model="settings.alertEmailFrequency"
+					v-model="settings.alertEmailsFrequency"
 					class="input"
 					@change="updateSettings"
 				>
@@ -63,6 +82,10 @@ async function updateSettings() {
 	background: var(--background);
 }
 
+.profile-section .heading {
+	margin: .5rem 1rem 0 1rem;
+}
+
 .setting {
 	width: 100%;
 	display: flex;
diff --git a/pages/users/@username/+Page.vue b/pages/users/@username/+Page.vue
index 4cc9a45..83b19f9 100644
--- a/pages/users/@username/+Page.vue
+++ b/pages/users/@username/+Page.vue
@@ -36,7 +36,7 @@ function scrollHorizontal(event) {
 					class="user nolink"
 				>
 					<Icon
-						v-if="section"
+						v-if="section && profile.id === user?.id"
 						icon="arrow-left3"
 						class="profile-back"
 					/>
@@ -51,7 +51,7 @@ function scrollHorizontal(event) {
 				</a>
 
 				<strong
-					v-if="section"
+					v-if="section && profile.id === user?.id"
 					class="profile-crumb"
 				>
 					<template v-if="domain">{{ domain }}</template>
diff --git a/pages/users/@username/+route.js b/pages/users/@username/+route.js
index f87e65f..eadf5d5 100644
--- a/pages/users/@username/+route.js
+++ b/pages/users/@username/+route.js
@@ -17,7 +17,7 @@ export default (pageContext) => {
 			routeParams: {
 				username: matched.params.username,
 				section: matched.params.section || '',
-				domain: matched.params.domain || 'scenes',
+				domain: matched.params.domain || '',
 			},
 		};
 	}
diff --git a/src/alerts.js b/src/alerts.js
index d29fd36..2ff633f 100755
--- a/src/alerts.js
+++ b/src/alerts.js
@@ -1,5 +1,6 @@
 import config from 'config';
 import { CronJob } from 'cron';
+import { add } from 'date-fns';
 import escapeRegexp from 'escape-string-regexp';
 import markdownIt from 'markdown-it';
 import { Resend } from 'resend';
@@ -374,6 +375,7 @@ export async function fetchNotifications(reqUser, options = {}) {
 			.leftJoin('alerts_matches', 'alerts_matches.alert_id', 'alerts.id')
 			.leftJoin('alerts_scenes', 'alerts_scenes.alert_id', 'alerts.id')
 			.where('notifications.user_id', reqUser.id)
+			.where('notifications.notify', true) // notification table is also used to defer e-mail alerts
 			.limit(options.limit)
 			.groupBy('notifications.id', 'alerts.id')
 			.orderBy('created_at', 'desc'),
@@ -428,68 +430,155 @@ function groupByKey(data, byKey, itemKey) {
 	}, {});
 }
 
-async function sendEmailAlerts(triggers, scenes) {
+const frequencies = {
+	daily: { days: 1 },
+	weekly: { weeks: 1 },
+	monthly: { months: 1 },
+};
+
+async function sendEmailAlerts() {
 	if (!config.email.enabled) {
 		return;
 	}
 
-	const scenesBySceneId = Object.fromEntries(scenes.map((scene) => [scene.id, scene]));
+	const qualifyingUsers = await knex('notifications')
+		.select('users.id as user_id', 'users.settings', knex.raw('max(emailed_at) as last_email'))
+		.where('notifications.email', true)
+		.innerJoin('users', 'users.id', 'notifications.user_id')
+		.groupBy('users.id')
+		.having(knex.raw('bool_or(emailed_at is null)'));
 
-	const triggersByUserId = Object.values(triggers // prevent multiple emails for the same scene
-		.filter((trigger) => trigger.alert.email && trigger.alert.userEmail)
-		.reduce((acc, trigger) => {
-			if (!acc[trigger.alert.userId]) {
-				acc[trigger.alert.userId] = {
-					userId: trigger.alert.userId,
-					username: trigger.alert.username,
-					userEmail: trigger.alert.userEmail,
-					alerts: [],
-				};
+	const dueUserIds = qualifyingUsers
+		.filter(({ settings, last_email }) => {
+			const frequency = frequencies[settings?.alertEmailFrequency];
+
+			if (!frequency || !last_email) {
+				// email setting set to immediate or invalid, or no recent emails sent
+				return true;
 			}
 
-			acc[trigger.alert.userId].alerts.push({
-				...trigger,
-				scene: scenesBySceneId[trigger.sceneId] || null,
+			// is this last e-mail sent before the frequency setting timeframe?
+			return add(last_email, frequency) <= new Date();
+		})
+		.map((row) => row.user_id);
+
+	// immediately mark as e-mailed to prevent double e-mails if cronjob coincides with direct trigger
+	const markedNotifications = await knex('notifications')
+		.where('email', true)
+		.whereNull('emailed_at')
+		.whereIn('user_id', dueUserIds)
+		.update('emailed_at', knex.fn.now())
+		.returning('*');
+
+	const userIds = Array.from(new Set(markedNotifications.map((notification) => notification.user_id)));
+	const sceneIds = Array.from(new Set(markedNotifications.map((notification) => notification.scene_id)));
+	const alertIds = Array.from(new Set(markedNotifications.map((notification) => notification.alert_id)));
+
+	const scenes = await fetchScenesById(sceneIds);
+
+	const [
+		users,
+		alertsActors,
+		alertsTags,
+		alertsEntities,
+		alertsScenes,
+		alertsMatches,
+	] = await Promise.all([
+		knex('users')
+			.select('users.id', 'users.username', 'users.email', 'users.settings')
+			.whereIn('users.id', userIds),
+		knex('alerts_actors')
+			.select('alerts_actors.alert_id', 'actors.id', 'actors.name', 'actors.slug')
+			.whereIn('alerts_actors.alert_id', alertIds)
+			.leftJoin('actors', 'actors.id', 'alerts_actors.actor_id'),
+		knex('alerts_tags')
+			.select('alerts_tags.alert_id', 'tags.id', 'tags.name', 'tags.slug')
+			.whereIn('alerts_tags.alert_id', alertIds)
+			.leftJoin('tags', 'tags.id', 'alerts_tags.tag_id'),
+		knex('alerts_entities')
+			.select('alerts_entities.alert_id', 'entities.id', 'entities.type', 'entities.name', 'entities.slug')
+			.whereIn('alerts_entities.alert_id', alertIds)
+			.leftJoin('entities', 'entities.id', 'alerts_entities.entity_id'),
+		knex('alerts_scenes')
+			.whereIn('alerts_scenes.alert_id', alertIds),
+		knex('alerts_matches')
+			.whereIn('alerts_matches.alert_id', alertIds),
+	]);
+
+	const usersByUserId = Object.fromEntries(users.map((user) => [user.id, user]));
+	const scenesBySceneId = Object.fromEntries(scenes.map((scene) => [scene.id, scene]));
+	const alertActorsByAlertId = groupByKey(alertsActors, 'alert_id');
+	const alertTagsByAlertId = groupByKey(alertsTags, 'alert_id');
+	const alertEntitiesByAlertId = groupByKey(alertsEntities, 'alert_id');
+	const alertMatchesByAlertId = groupByKey(alertsMatches, 'alert_id');
+	const alertSceneIdsByAlertId = groupByKey(alertsScenes, 'alert_id', 'scene_id');
+
+	const triggers = markedNotifications
+		.map((notification) => ({
+			scene: scenesBySceneId[notification.scene_id] || null,
+			posterUrl: getImagePath(scenesBySceneId[notification.scene_id]?.poster),
+			user: usersByUserId[notification.user_id] || null,
+			alertId: notification.alert_id,
+			alertTags: alertTagsByAlertId[notification.alert_id] || [],
+			alertActors: alertActorsByAlertId[notification.alert_id] || [],
+			alertEntities: alertEntitiesByAlertId[notification.alert_id] || [],
+			alertMatches: alertMatchesByAlertId[notification.alert_id] || [],
+			alertSceneIds: alertSceneIdsByAlertId[notification.alert_id] || [],
+		}))
+		.filter((notification) => !!notification.user
+			&& !!notification.scene
+			&& notification.user.settings?.alertEmailsEnabled !== false); // keep the e-mails marked as 'sent', if emails get re-enabled there shouldn't be a barrage of old notifications
+
+	const emails = await Promise.all(Object.values(usersByUserId).map(async (user) => {
+		const userTriggers = Object.values(Object.fromEntries(triggers
+			.filter((trigger) => trigger.user.id === user.id)
+			.map((trigger) => [trigger.scene.id, trigger])))
+			.toSorted((triggerA, triggerB) => triggerA.scene.effectiveDate - triggerB.scene.effectiveDate);
+
+		if (userTriggers.length === 0) {
+			return null;
+		}
+
+		try {
+			const { html, text } = await emailTemplates.render('alert.vue', {
+				props: {
+					user,
+					triggers: userTriggers,
+				},
 			});
 
-			return acc;
-		}, {}));
+			return {
+				from: config.email.from,
+				to: user.email,
+				subject: `Notification for ${userTriggers.length} scenes on traxxx`,
+				html,
+				text,
+			};
+		}
+		catch (error) {
+			return null;
+		}
+	})).then((allEmails) => allEmails.filter(Boolean));
 
-	const emails = await Promise.all(triggersByUserId.map(async (trigger) => {
-		const { html, text } = await emailTemplates.render('alert.vue', {
-			props: {
-				trigger,
-				address: config.web.address,
-			},
-		});
-
-		return {
-			from: config.email.from,
-			to: [trigger.userEmail],
-			subject: `Notification for ${trigger.alerts.length} scenes on traxxx`,
-			html,
-			text,
-		};
-	}));
+	if (emails.length === 0) {
+		logger.info(`No alert e-mails sent`);
+		return;
+	}
 
 	const { data, error } = await resend.batch.send(emails);
 
 	if (error) {
-		logger.error(`Failed to send ${emails.length} alert e-mails: ${error}`);
+		logger.error(`Failed to send ${emails.length} alert e-mails (${error.statusCode} ${error.name}): ${error.message}`);
 	}
 	else {
 		logger.info(`Sent ${data.data.length}/${emails.length} alert e-mails`);
 	}
 }
 
-const genderOrder = ['female', 'transsexual', 'male'];
-
-export async function notify(sceneIds) {
+export async function notify(sceneIds, options = {}) {
 	const scenes = await fetchScenesById(sceneIds);
 
 	const [
-		releasesActors,
-		releasesTags,
 		rawAlerts,
 		alertsActors,
 		alertsTags,
@@ -497,36 +586,19 @@ export async function notify(sceneIds) {
 		alertsMatches,
 		alertsStashes,
 	] = await Promise.all([
-		knex('releases_actors')
-			.select('releases_actors.*', 'actors.name as actor_name', 'actors.gender as actor_gender')
-			.whereIn('release_id', sceneIds)
-			.leftJoin('actors', 'actors.id', 'releases_actors.actor_id'),
-		knex('releases_tags')
-			.select('releases_tags.*', 'tags.name as tag_name', 'tags.slug as tag_slug')
-			.leftJoin('tags', 'tags.id', 'releases_tags.tag_id')
-			.whereIn('release_id', sceneIds)
-			.orderBy('tags.priority', 'desc'),
 		knex('alerts')
-			.select('alerts.*', 'users.username', 'users.email as user_email')
+			.select('alerts.*', 'users.username', 'users.email as user_email', 'users.settings as user_settings')
 			.leftJoin('users', 'users.id', 'alerts.user_id'),
-		knex('alerts_actors')
-			.select('alerts_actors.*', 'actors.name as actor_name', 'actors.slug as actor_slug')
-			.leftJoin('actors', 'actors.id', 'alerts_actors.actor_id'),
-		knex('alerts_tags')
-			.select('alerts_tags.*', 'tags.name as tag_name')
-			.leftJoin('tags', 'tags.id', 'alerts_tags.tag_id'),
-		knex('alerts_entities')
-			.select('alerts_entities.*', 'entities.name as entity_name')
-			.leftJoin('entities', 'entities.id', 'alerts_entities.entity_id'),
+		knex('alerts_actors').select('alert_id', 'actor_id'),
+		knex('alerts_tags').select('alert_id', 'tag_id'),
+		knex('alerts_entities').select('alert_id', 'entity_id'),
 		knex('alerts_matches'),
 		knex('alerts_stashes'),
 	]);
 
-	const actorsByReleaseId = groupByKey(releasesActors, 'release_id', null);
-	const tagsByReleaseId = groupByKey(releasesTags, 'release_id', null);
-	const alertsActorsByAlertId = groupByKey(alertsActors, 'alert_id', null);
-	const alertsTagsByAlertId = groupByKey(alertsTags, 'alert_id', null);
-	const alertsEntitiesByAlertId = groupByKey(alertsEntities, 'alert_id', null);
+	const alertActorIdsByAlertId = groupByKey(alertsActors, 'alert_id', 'actor_id');
+	const alertTagIdsByAlertId = groupByKey(alertsTags, 'alert_id', 'tag_id');
+	const alertEntityIdsByAlertId = groupByKey(alertsEntities, 'alert_id', 'entity_id');
 	const alertsStashesByAlertId = groupByKey(alertsStashes, 'alert_id', 'stash_id');
 
 	const alertsMatchesByAlertId = alertsMatches.reduce((acc, alertMatch) => {
@@ -547,6 +619,7 @@ export async function notify(sceneIds) {
 		userId: alert.user_id,
 		username: alert.username,
 		userEmail: alert.user_email,
+		userSettings: alert.user_settings,
 		notify: alert.notify,
 		email: alert.email,
 		all: alert.all,
@@ -554,54 +627,47 @@ export async function notify(sceneIds) {
 		allEntities: alert.all_entities,
 		allTags: alert.all_tags,
 		allMatches: alert.all_matches,
-		actors: alertsActorsByAlertId[alert.id]
-			?.map((actor) => ({ id: actor.actor_id, name: actor.actor_name, gender: actor.actor_gender }))
-			.toSorted((actorA, actorB) => genderOrder.indexOf(actorA.gender) - genderOrder.indexOf(actorB.gender)) || [],
-		tags: alertsTagsByAlertId[alert.id]?.map((tag) => ({ id: tag.tag_id, name: tag.tag_name })) || [],
-		entities: alertsEntitiesByAlertId[alert.id]?.map((entity) => ({ id: entity.entity_id, name: entity.entity_name })) || [],
+		actorIds: alertActorIdsByAlertId[alert.id] || [],
+		tagIds: alertTagIdsByAlertId[alert.id] || [],
+		entityIds: alertEntityIdsByAlertId[alert.id] || [],
 		matches: alertsMatchesByAlertId[alert.id] || [],
 		stashIds: alertsStashesByAlertId[alert.id] || [],
 	}));
 
 	const curatedScenes = scenes
-		.filter((scene) => scene.isNew)
+		.filter((scene) => scene.isNew || options.spoofNew)
 		.toSorted((sceneA, sceneB) => sceneB.date - sceneA.date)
 		.map((scene) => ({
 			id: scene.id,
 			title: scene.title,
-			slug: scene.slug,
-			date: scene.date,
 			description: scene.description,
-			actors: (actorsByReleaseId[scene.id] || []).filter((actor) => !!actor.actor_name).map((actor) => ({ id: actor.actor_id, name: actor.actor_name, slug: actor.slug })),
-			actorIds: (actorsByReleaseId[scene.id] || []).map((actor) => actor.actor_id),
-			tagIds: (tagsByReleaseId[scene.id] || []).map((tag) => tag.id),
-			tags: (tagsByReleaseId[scene.id] || []).filter((tag) => !!tag.tag_name).map((tag) => ({ slug: tag.tag_slug, name: tag.tag_name })),
+			actorIds: scene.actors.map((actor) => actor.id),
+			tagIds: scene.tags.map((tag) => tag.id),
 			entityId: scene.channel?.id || scene.network?.id || null,
 			parentEntityId: scene.network?.id,
-			posterUrl: getImagePath(scene.poster),
 		}));
 
 	const triggers = alerts.flatMap((alert) => {
 		const alertScenes = curatedScenes.filter((scene) => {
 			if (alert.all) {
-				if (alert.actors.length === 0
-					&& alert.tags.length === 0
-					&& alert.entities.length === 0
+				if (alert.actorIds.length === 0
+					&& alert.tagIds.length === 0
+					&& alert.entityIds.length === 0
 					&& alert.matches.length === 0) {
 					// we must match on *something*, this is likely a release date alert handled separately
 					return false;
 				}
 
-				if (alert.actors.length > 0 && !alert.actors[alert.allActors ? 'every' : 'some']((actor) => scene.actorIds.includes(actor.id))) {
+				if (alert.actorIds.length > 0 && !alert.actorIds[alert.allActors ? 'every' : 'some']((actorId) => scene.actorIds.includes(actorId))) {
 					return false;
 				}
 
-				if (alert.tags.length > 0 && !alert.tags[alert.allTags ? 'every' : 'some']((tag) => scene.tagIds.includes(tag.id))) {
+				if (alert.tagIds.length > 0 && !alert.tagIds[alert.allTags ? 'every' : 'some']((tagId) => scene.tagIds.includes(tagId))) {
 					return false;
 				}
 
 				// multiple entities can only be matched in OR mode
-				if (alert.entities.length > 0 && !alert.entities.some((alertEntity) => alertEntity.id === scene.entityId || alertEntity.id === scene.parentEntityId)) {
+				if (alert.entityIds.length > 0 && !alert.entityIds.some((entityId) => entityId === scene.entityId || entityId === scene.parentEntityId)) {
 					return false;
 				}
 
@@ -612,16 +678,16 @@ export async function notify(sceneIds) {
 				return true;
 			}
 
-			if (alert.matches.length > 0 && alert.actors[alert.allActors ? 'every' : 'some']((actorId) => scene.actorIds.includes(actorId))) {
+			if (alert.matches.length > 0 && alert.actorIds[alert.allActors ? 'every' : 'some']((actorId) => scene.actorIds.includes(actorId))) {
 				return true;
 			}
 
-			if (alert.tags.length > 0 && alert.tags[alert.allTags ? 'every' : 'some']((tagId) => scene.tagIds.includes(tagId))) {
+			if (alert.tagIds.length > 0 && alert.tagIds[alert.allTags ? 'every' : 'some']((tagId) => scene.tagIds.includes(tagId))) {
 				return true;
 			}
 
 			// multiple entities can only be matched in OR mode
-			if (alert.entities.length > 0 && alert.entities.some((alertEntityId) => alertEntityId === scene.entityId || alertEntityId === scene.parentEntityId)) {
+			if (alert.entityIds.length > 0 && alert.entityIds.some((entityId) => entityId === scene.entityId || entityId === scene.parentEntityId)) {
 				return true;
 			}
 
@@ -638,15 +704,39 @@ export async function notify(sceneIds) {
 		}));
 	});
 
-	const notifications = Object.values(Object.fromEntries(triggers // prevent multiple notifications for the same scene
-		.filter((trigger) => trigger.alert.notify)
-		.map((trigger) => [`${trigger.alert.userId}:${trigger.sceneId}`, trigger])))
+	// e-mails are stored as notifications to facilitate the e-mail frequency buffer
+	const notifications = Object.values(triggers // prevent multiple notifications for the same scene
+		.map((trigger) => ({
+			...trigger,
+			notify: trigger.alert.notify && trigger.alert.userSettings?.alertNotificationsEnabled !== false,
+			email: trigger.alert.email && trigger.alert.userEmail && trigger.alert.userSettings?.alertEmailsEnabled !== false,
+		}))
+		.filter((trigger) => trigger.notify || trigger.email)
+		.reduce((acc, trigger) => {
+			const key = `${trigger.alert.userId}:${trigger.sceneId}`;
+
+			acc[key] = {
+				...trigger,
+				notify: acc[key]?.notify || trigger.notify,
+				email: acc[key]?.email || trigger.email,
+			};
+
+			return acc;
+		}, {}))
 		.map((trigger) => ({
 			user_id: trigger.alert.userId,
 			alert_id: trigger.alert.id,
 			scene_id: trigger.sceneId,
+			// we assign the alert outputs to this specific notification, instead of joining them from the alerts table
+			// this ensures changing the alert outputs later doesn't trigger a barrage of e-mails from old notifications
+			notify: trigger.notify,
+			email: trigger.email,
 		}));
 
+	if (notifications.length === 0) {
+		logger.verbose(`No alert notifications triggered`);
+	}
+
 	const uniqueStashes = Object.values(Object.fromEntries(triggers.flatMap((trigger) => trigger.alert.stashIds.map((stashId) => ({
 		stashId,
 		sceneId: trigger.sceneId,
@@ -696,7 +786,7 @@ export async function notify(sceneIds) {
 		}
 	}
 
-	await sendEmailAlerts(triggers, curatedScenes);
+	await sendEmailAlerts();
 
 	return triggers;
 }
@@ -704,8 +794,7 @@ export async function notify(sceneIds) {
 async function alertSceneReleases() {
 	const alerts = await knex('alerts_scenes')
 		.select(
-			'alerts.id',
-			'alerts.user_id',
+			'alerts.*',
 			'releases.id as scene_id',
 			'releases.title as scene_title',
 			'releases.slug as scene_slug',
@@ -728,6 +817,8 @@ async function alertSceneReleases() {
 				user_id: alert.user_id,
 				scene_id: alert.scene_id,
 				alert_id: alert.id,
+				notify: alert.notify,
+				email: alert.email,
 			})));
 
 		await trx('alerts')
@@ -778,6 +869,9 @@ export function initAlertCron() {
 				alertSceneReleases(),
 				purgeExpiredAlerts(),
 			]);
+
+			// allow release alerts to set e-mail notifications
+			await sendEmailAlerts();
 		},
 		start: config.alerts.enabled,
 		runOnInit: true,
diff --git a/src/app.js b/src/app.js
index 7e5672e..15cfe0d 100644
--- a/src/app.js
+++ b/src/app.js
@@ -1,5 +1,6 @@
 import { initAlertCron } from './alerts.js';
 import { initCaches } from './cache.js';
+import { initStashViewsCron } from './stashes.js';
 import { initSyncCron } from './sync.js';
 import initServer from './web/server.js';
 
@@ -9,6 +10,7 @@ async function init() {
 	initServer();
 	initSyncCron();
 	initAlertCron();
+	initStashViewsCron();
 }
 
 init();
diff --git a/src/stashes.js b/src/stashes.js
index 09321aa..10445b0 100755
--- a/src/stashes.js
+++ b/src/stashes.js
@@ -602,16 +602,18 @@ export async function unstashMovie(movieId, stashId, sessionUser) {
 	return curateStashed(unstashed);
 }
 
-CronJob.from({
-	cronTime: config.stashes.viewRefreshCrontab,
-	async onTick() {
-		logger.verbose('Updating stash views');
+export function initStashViewsCron() {
+	CronJob.from({
+		cronTime: config.stashes.viewRefreshCrontab,
+		async onTick() {
+			logger.verbose('Updating stash views');
 
-		await refreshView('scenes');
-		await refreshView('actors');
-		await refreshView('movies');
-		await refreshView('stashes');
-	},
-	start: true,
-	runOnInit: true,
-});
+			await refreshView('scenes');
+			await refreshView('actors');
+			await refreshView('movies');
+			await refreshView('stashes');
+		},
+		start: true,
+		runOnInit: true,
+	});
+}
diff --git a/src/users.js b/src/users.js
index f40fe84..e2f9cc7 100755
--- a/src/users.js
+++ b/src/users.js
@@ -138,8 +138,9 @@ export async function createBan(ban, reqUser) {
 }
 
 const validSettingKeys = [
-	'alertEmailEnabled',
-	'alertEmailFrequency',
+	'alertNotificationsEnabled',
+	'alertEmailsEnabled',
+	'alertEmailsFrequency',
 ];
 
 export async function updateSettings(settings, reqUser) {
@@ -147,15 +148,13 @@ export async function updateSettings(settings, reqUser) {
 		throw new HttpError('You need to be authenticated to change your settings', 401);
 	}
 
-	console.log('SETTINGS', settings);
-
 	const invalidKeys = Object.keys(settings).filter((key) => !validSettingKeys.includes(key));
 
 	if (invalidKeys.length > 0) {
 		throw new HttpError(`Invalid settings: ${invalidKeys.join()}`, 400);
 	}
 
-	if (settings.alertEmailFrequency && !['instant', 'daily', 'weekly', 'monthly'].includes(settings.alertEmailFrequency)) {
+	if (settings.alertEmailsFrequency && !['instant', 'daily', 'weekly', 'monthly'].includes(settings.alertEmailsFrequency)) {
 		throw new HttpError('Invalid email frequency setting', 400);
 	}
 
@@ -164,7 +163,5 @@ export async function updateSettings(settings, reqUser) {
 		.update('settings', knex.raw('coalesce(settings, \'{}\'::jsonb) || ?::jsonb', [JSON.stringify(settings)]))
 		.returning('settings');
 
-	console.log('UPDATED SETTINGS', updatedSettings);
-
 	return updatedSettings;
 }
diff --git a/tools/notify.js b/tools/notify.js
new file mode 100644
index 0000000..91988da
--- /dev/null
+++ b/tools/notify.js
@@ -0,0 +1,25 @@
+import process from 'node:process';
+import yargs from 'yargs';
+
+import { notify } from '../src/alerts.js';
+import { knexOwner as knex } from '../src/knex.js';
+import redis from '../src/redis.js';
+
+const { argv } = yargs(process.argv.slice(2))
+	.option('scenes', {
+		type: 'array',
+		alias: ['scene-ids'],
+	});
+
+async function triggerNotify() {
+	if (!argv.scenes.length) {
+		throw new Error('Must specify at least one scene ID');
+	}
+
+	await notify(argv.scenes, { spoofNew: true });
+
+	await knex.destroy();
+	await redis.quit();
+}
+
+triggerNotify();